Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c95c8953 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: vsie: cleanup mcck reinjection 



The machine check information is part of the vsie_page.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170830160603.5452-4-david@redhat.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 3dbf0205

arch/s390/kvm/vsie.c

+1 −5
Original line number Diff line number Diff line
@@ -809,8 +809,6 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
{

	struct kvm_s390_sie_block *scb_s = &vsie_page->scb_s;

	struct kvm_s390_sie_block *scb_o = vsie_page->scb_o;

	struct mcck_volatile_info *mcck_info;

	struct sie_page *sie_page;

	int rc;



	handle_last_fault(vcpu, vsie_page);
@@ -834,9 +832,7 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 


	if (rc == -EINTR) {

		VCPU_EVENT(vcpu, 3, "%s", "machine check");

		sie_page = container_of(scb_s, struct sie_page, sie_block);

		mcck_info = &sie_page->mcck_info;

		kvm_s390_reinject_machine_check(vcpu, mcck_info);

		kvm_s390_reinject_machine_check(vcpu, &vsie_page->mcck_info);

		return 0;

	}