Commit 85672346 authored by Paolo Bonzini's avatar Paolo Bonzini

KVM: zero output of KVM_GET_VCPU_EVENTS before filling in the struct

This allows making some fields optional, as will be the case soon
for SMM-related data.
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cf7316d0
...@@ -5057,16 +5057,15 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu, ...@@ -5057,16 +5057,15 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu,
ex->pending && ex->has_payload) ex->pending && ex->has_payload)
kvm_deliver_exception_payload(vcpu, ex); kvm_deliver_exception_payload(vcpu, ex);
memset(events, 0, sizeof(*events));
/* /*
* The API doesn't provide the instruction length for software * The API doesn't provide the instruction length for software
* exceptions, so don't report them. As long as the guest RIP * exceptions, so don't report them. As long as the guest RIP
* isn't advanced, we should expect to encounter the exception * isn't advanced, we should expect to encounter the exception
* again. * again.
*/ */
if (kvm_exception_is_soft(ex->vector)) { if (!kvm_exception_is_soft(ex->vector)) {
events->exception.injected = 0;
events->exception.pending = 0;
} else {
events->exception.injected = ex->injected; events->exception.injected = ex->injected;
events->exception.pending = ex->pending; events->exception.pending = ex->pending;
/* /*
...@@ -5086,15 +5085,13 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu, ...@@ -5086,15 +5085,13 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu,
events->interrupt.injected = events->interrupt.injected =
vcpu->arch.interrupt.injected && !vcpu->arch.interrupt.soft; vcpu->arch.interrupt.injected && !vcpu->arch.interrupt.soft;
events->interrupt.nr = vcpu->arch.interrupt.nr; events->interrupt.nr = vcpu->arch.interrupt.nr;
events->interrupt.soft = 0;
events->interrupt.shadow = static_call(kvm_x86_get_interrupt_shadow)(vcpu); events->interrupt.shadow = static_call(kvm_x86_get_interrupt_shadow)(vcpu);
events->nmi.injected = vcpu->arch.nmi_injected; events->nmi.injected = vcpu->arch.nmi_injected;
events->nmi.pending = vcpu->arch.nmi_pending != 0; events->nmi.pending = vcpu->arch.nmi_pending != 0;
events->nmi.masked = static_call(kvm_x86_get_nmi_mask)(vcpu); events->nmi.masked = static_call(kvm_x86_get_nmi_mask)(vcpu);
events->nmi.pad = 0;
events->sipi_vector = 0; /* never valid when reporting to user space */ /* events->sipi_vector is never valid when reporting to user space */
events->smi.smm = is_smm(vcpu); events->smi.smm = is_smm(vcpu);
events->smi.pending = vcpu->arch.smi_pending; events->smi.pending = vcpu->arch.smi_pending;
...@@ -5111,8 +5108,6 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu, ...@@ -5111,8 +5108,6 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu,
events->triple_fault.pending = kvm_test_request(KVM_REQ_TRIPLE_FAULT, vcpu); events->triple_fault.pending = kvm_test_request(KVM_REQ_TRIPLE_FAULT, vcpu);
events->flags |= KVM_VCPUEVENT_VALID_TRIPLE_FAULT; events->flags |= KVM_VCPUEVENT_VALID_TRIPLE_FAULT;
} }
memset(&events->reserved, 0, sizeof(events->reserved));
} }
static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu, static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment