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

Commit 25f97ff4 authored by Mark Rustad's avatar Mark Rustad Committed by Paolo Bonzini
Browse files

kvm: Resolve missing-field-initializers warnings 



Resolve missing-field-initializers warnings seen in W=2 kernel
builds by having macros generate more elaborated initializers.
That is enough to silence the warnings.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 03916db9

virt/kvm/irq_comm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -323,13 +323,13 @@ int kvm_set_routing_entry(struct kvm_irq_routing_table *rt, 




#define IOAPIC_ROUTING_ENTRY(irq) \

#define IOAPIC_ROUTING_ENTRY(irq) \

	{ .gsi = irq, .type = KVM_IRQ_ROUTING_IRQCHIP,	\

	{ .gsi = irq, .type = KVM_IRQ_ROUTING_IRQCHIP,	\

	  .u.irqchip.irqchip = KVM_IRQCHIP_IOAPIC, .u.irqchip.pin = (irq) }

	  .u.irqchip = { .irqchip = KVM_IRQCHIP_IOAPIC, .pin = (irq) } }

#define ROUTING_ENTRY1(irq) IOAPIC_ROUTING_ENTRY(irq)

#define ROUTING_ENTRY1(irq) IOAPIC_ROUTING_ENTRY(irq)





#ifdef CONFIG_X86

#ifdef CONFIG_X86

#  define PIC_ROUTING_ENTRY(irq) \

#  define PIC_ROUTING_ENTRY(irq) \

	{ .gsi = irq, .type = KVM_IRQ_ROUTING_IRQCHIP,	\

	{ .gsi = irq, .type = KVM_IRQ_ROUTING_IRQCHIP,	\

	  .u.irqchip.irqchip = SELECT_PIC(irq), .u.irqchip.pin = (irq) % 8 }

	  .u.irqchip = { .irqchip = SELECT_PIC(irq), .pin = (irq) % 8 } }

#  define ROUTING_ENTRY2(irq) \

#  define ROUTING_ENTRY2(irq) \

	IOAPIC_ROUTING_ENTRY(irq), PIC_ROUTING_ENTRY(irq)

	IOAPIC_ROUTING_ENTRY(irq), PIC_ROUTING_ENTRY(irq)

#else

#else