diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-01-31 19:17:52 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-02-08 15:57:50 -0200 |
| commit | 3d4b26494fdce89354dac49ef909356ccda77914 (patch) | |
| tree | 50dae556e5fd2b3a18cd29731ee85c599d2b9260 /hw/pc_piix.c | |
| parent | 39d6960aabfd90bf0bf7ba38d69e918962b70b16 (diff) | |
| download | qemu-3d4b26494fdce89354dac49ef909356ccda77914.tar.gz qemu-3d4b26494fdce89354dac49ef909356ccda77914.tar.bz2 qemu-3d4b26494fdce89354dac49ef909356ccda77914.zip | |
kvm: Implement kvm_irqchip_in_kernel like kvm_enabled
To both avoid that kvm_irqchip_in_kernel always has to be paired with
kvm_enabled and that the former ends up in a function call, implement it
like the latter. This means keeping the state in a global variable and
defining kvm_irqchip_in_kernel as a preprocessor macro.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index c06f1b544e..17f8d5d593 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -104,7 +104,7 @@ static void ioapic_init(GSIState *gsi_state) SysBusDevice *d; unsigned int i; - if (kvm_enabled() && kvm_irqchip_in_kernel()) { + if (kvm_irqchip_in_kernel()) { dev = qdev_create(NULL, "kvm-ioapic"); } else { dev = qdev_create(NULL, "ioapic"); @@ -183,7 +183,7 @@ static void pc_init1(MemoryRegion *system_memory, } gsi_state = g_malloc0(sizeof(*gsi_state)); - if (kvm_enabled() && kvm_irqchip_in_kernel()) { + if (kvm_irqchip_in_kernel()) { kvm_piix3_setup_irq_routing(pci_enabled); gsi = qemu_allocate_irqs(kvm_piix3_gsi_handler, gsi_state, GSI_NUM_PINS); @@ -209,7 +209,7 @@ static void pc_init1(MemoryRegion *system_memory, } isa_bus_irqs(isa_bus, gsi); - if (kvm_enabled() && kvm_irqchip_in_kernel()) { + if (kvm_irqchip_in_kernel()) { i8259 = kvm_i8259_init(isa_bus); } else if (xen_enabled()) { i8259 = xen_interrupt_controller_init(); |