diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-04-21 14:57:05 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-05-07 11:29:43 +0200 |
| commit | b7cb22317305883d50f930cd6bf2fdb37df930c1 (patch) | |
| tree | 7f84fd0ed95a0f50bb785e20351533ef072fc1e6 | |
| parent | d28bc9dd25ce023270d2e039e7c98d38ecbf7758 (diff) | |
| download | lwn-b7cb22317305883d50f930cd6bf2fdb37df930c1.tar.gz lwn-b7cb22317305883d50f930cd6bf2fdb37df930c1.zip | |
KVM: x86: tweak types of fields in kvm_lapic_irq
Change to u16 if they only contain data in the low 16 bits.
Change the level field to bool, since we assign 1 sometimes, but
just mask icr_low with APIC_INT_ASSERT in apic_send_ipi.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | arch/x86/include/asm/kvm_host.h | 8 | ||||
| -rw-r--r-- | arch/x86/kvm/lapic.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 3a19e30f0be0..dc83b43d0850 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -689,10 +689,10 @@ struct msr_data { struct kvm_lapic_irq { u32 vector; - u32 delivery_mode; - u32 dest_mode; - u32 level; - u32 trig_mode; + u16 delivery_mode; + u16 dest_mode; + bool level; + u16 trig_mode; u32 shorthand; u32 dest_id; }; diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index abf165330881..ba585d0c42c5 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -914,7 +914,7 @@ static void apic_send_ipi(struct kvm_lapic *apic) irq.vector = icr_low & APIC_VECTOR_MASK; irq.delivery_mode = icr_low & APIC_MODE_MASK; irq.dest_mode = icr_low & APIC_DEST_MASK; - irq.level = icr_low & APIC_INT_ASSERT; + irq.level = (icr_low & APIC_INT_ASSERT) != 0; irq.trig_mode = icr_low & APIC_INT_LEVELTRIG; irq.shorthand = icr_low & APIC_SHORT_MASK; if (apic_x2apic_mode(apic)) |