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

Commit b7cb2231 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d28bc9dd

arch/x86/include/asm/kvm_host.h

+4 −4
Original line number Diff line number Diff line
@@ -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;

};

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -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))