diff options
| author | Paolo Bonzini | 2012-10-31 10:42:51 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2012-10-31 10:42:51 +0100 |
| commit | f563a5d7a820424756f358e747238f03e866838a (patch) | |
| tree | f78fa474b1933bd395af401a6d745150f4ecd15e /hw/pc_piix.c | |
| parent | raw-win32: implement native asynchronous I/O (diff) | |
| parent | tap-win32: stubs to fix win32 build (diff) | |
| download | qemu-f563a5d7a820424756f358e747238f03e866838a.tar.gz qemu-f563a5d7a820424756f358e747238f03e866838a.tar.xz qemu-f563a5d7a820424756f358e747238f03e866838a.zip | |
Merge remote-tracking branch 'origin/master' into threadpool
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 47ebc1ac04..85529b2cea 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -43,6 +43,7 @@ #include "xen.h" #include "memory.h" #include "exec-memory.h" +#include "cpu.h" #ifdef CONFIG_XEN # include <xen/hvm/hvm_info_table.h> #endif @@ -267,7 +268,7 @@ static void pc_init1(MemoryRegion *system_memory, pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, floppy, idebus[0], idebus[1], rtc_state); - if (pci_enabled && usb_enabled) { + if (pci_enabled && usb_enabled(false)) { pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci"); } @@ -302,6 +303,12 @@ static void pc_init_pci(QEMUMachineInitArgs *args) initrd_filename, cpu_model, 1, 1); } +static void pc_init_pci_1_3(QEMUMachineInitArgs *args) +{ + enable_kvm_pv_eoi(); + pc_init_pci(args); +} + static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args) { ram_addr_t ram_size = args->ram_size; @@ -349,7 +356,7 @@ static QEMUMachine pc_machine_v1_3 = { .name = "pc-1.3", .alias = "pc", .desc = "Standard PC", - .init = pc_init_pci, + .init = pc_init_pci_1_3, .max_cpus = 255, .is_default = 1, }; |