diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-22 07:07:55 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-22 07:07:55 -0500 |
| commit | 7ee28fd303003d70bb4c142e6ad4b92b7383b5b4 (patch) | |
| tree | 03781532cc1e7b53d5ce4ffd3a49d515dcdf21c3 /hw/pc_piix.c | |
| parent | bcd2491a48787542160d75fb7468907971b04478 (diff) | |
| parent | 01195b7347e341a49fa554959882b26c666a3616 (diff) | |
| download | focaccia-qemu-7ee28fd303003d70bb4c142e6ad4b92b7383b5b4.tar.gz focaccia-qemu-7ee28fd303003d70bb4c142e6ad4b92b7383b5b4.zip | |
Merge remote-tracking branch 'agraf/xen-next' into staging
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 9a22a8afc8..8dbeb0c8ab 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -124,11 +124,7 @@ static void pc_init1(ram_addr_t ram_size, isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24); if (pci_enabled) { - if (!xen_enabled()) { - pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, isa_irq, ram_size); - } else { - pci_bus = i440fx_xen_init(&i440fx_state, &piix3_devfn, isa_irq, ram_size); - } + pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, isa_irq, ram_size); } else { pci_bus = NULL; i440fx_state = NULL; @@ -140,6 +136,10 @@ static void pc_init1(ram_addr_t ram_size, pc_vga_init(pci_enabled? pci_bus: NULL); + if (xen_enabled()) { + pci_create_simple(pci_bus, -1, "xen-platform"); + } + /* init basic PC hardware */ pc_basic_device_init(isa_irq, &rtc_state, xen_enabled()); |