diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-08-28 15:28:20 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-09-04 09:37:24 -0500 |
| commit | 85a750ca90ec78b4288b84b716dda2d90643ae7f (patch) | |
| tree | 383712427affa2a2c95124ae26b7bc5f3bbd9599 /hw/pc.c | |
| parent | bd7dce87eacd90ef99b0e625cc4d5f2ab4573a70 (diff) | |
| download | focaccia-qemu-85a750ca90ec78b4288b84b716dda2d90643ae7f.tar.gz focaccia-qemu-85a750ca90ec78b4288b84b716dda2d90643ae7f.zip | |
Fold piix3_init() intto i440fx_init
i440fx_init will now work properly if we don't setup piix3 Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc.c')
| -rw-r--r-- | hw/pc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/pc.c b/hw/pc.c index 6477b41582..e771170f81 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1279,8 +1279,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) { - pci_bus = i440fx_init(&i440fx_state, isa_irq); - piix3_devfn = piix3_init(pci_bus, -1); + pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, isa_irq); } else { pci_bus = NULL; isa_bus_new(NULL); |