diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-15 18:41:28 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-15 18:41:28 -0600 |
| commit | 6c263e26a5c162a8cd79e32bb82422697db5c57c (patch) | |
| tree | de3955b0d0d026c74e05f1342e7dac75b3c6ab78 /hw/pc_piix.c | |
| parent | cf5cfe0471eb3693401f390bc467413d14dce368 (diff) | |
| parent | a4aecd2819fd31641ab62472e3385073043521fb (diff) | |
| download | focaccia-qemu-6c263e26a5c162a8cd79e32bb82422697db5c57c.tar.gz focaccia-qemu-6c263e26a5c162a8cd79e32bb82422697db5c57c.zip | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master: apic: Fix legacy vmstate loading for KVM kvm: Implement kvm_irqchip_in_kernel like kvm_enabled kvm: Allow to set shadow MMU size
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(); |