Commit 85f2a432 authored by Aaron Lewis's avatar Aaron Lewis Committed by Paolo Bonzini
Browse files

selftests: kvm: Clear uc so UCALL_NONE is being properly reported 



Ensure the out value 'uc' in get_ucall() is properly reporting
UCALL_NONE if the call fails.  The return value will be correctly
reported, however, the out parameter 'uc' will not be.  Clear the struct
to ensure the correct value is being reported in the out parameter.

Signed-off-by: default avatarAaron Lewis <aaronlewis@google.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Reviewed-by: default avatarAlexander Graf <graf@amazon.com>
Message-Id: <20201012194716.3950330-3-aaronlewis@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent df11f7dd

tools/testing/selftests/kvm/lib/aarch64/ucall.c

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc) 
	struct kvm_run *run = vcpu_state(vm, vcpu_id);

	struct ucall ucall = {};



	if (uc)

		memset(uc, 0, sizeof(*uc));



	if (run->exit_reason == KVM_EXIT_MMIO &&

	    run->mmio.phys_addr == (uint64_t)ucall_exit_mmio_addr) {

		vm_vaddr_t gva;

tools/testing/selftests/kvm/lib/s390x/ucall.c

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc) 
	struct kvm_run *run = vcpu_state(vm, vcpu_id);

	struct ucall ucall = {};



	if (uc)

		memset(uc, 0, sizeof(*uc));



	if (run->exit_reason == KVM_EXIT_S390_SIEIC &&

	    run->s390_sieic.icptcode == 4 &&

	    (run->s390_sieic.ipa >> 8) == 0x83 &&    /* 0x83 means DIAGNOSE */

tools/testing/selftests/kvm/lib/x86_64/ucall.c

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc) 
	struct kvm_run *run = vcpu_state(vm, vcpu_id);

	struct ucall ucall = {};



	if (uc)

		memset(uc, 0, sizeof(*uc));



	if (run->exit_reason == KVM_EXIT_IO && run->io.port == UCALL_PIO_PORT) {

		struct kvm_regs regs;