diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-05-13 16:11:23 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-05-13 16:11:23 +0000 |
| commit | 502a53952d574717bdb626b651b16cadacab46f4 (patch) | |
| tree | 100d2c38f587f82fd2d683a4544960ab422f8038 /hw/acpi.c | |
| parent | 4aa4253115255d79fe510ba15a68dad8f4ba4499 (diff) | |
| download | focaccia-qemu-502a53952d574717bdb626b651b16cadacab46f4.tar.gz focaccia-qemu-502a53952d574717bdb626b651b16cadacab46f4.zip | |
Rearrange PCI host emulation code.
Add ARM PCI emulation. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1916 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/acpi.c')
| -rw-r--r-- | hw/acpi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/acpi.c b/hw/acpi.c index 3ffdfdddbf..8fb054428d 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -220,7 +220,7 @@ static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) /* XXX: we still add it to the PIIX3 and we count on the fact that OSes are smart enough to accept this strange configuration */ -void piix4_pm_init(PCIBus *bus) +void piix4_pm_init(PCIBus *bus, int devfn) { PIIX4PMState *s; uint8_t *pci_conf; @@ -228,8 +228,7 @@ void piix4_pm_init(PCIBus *bus) s = (PIIX4PMState *)pci_register_device(bus, "PM", sizeof(PIIX4PMState), - ((PCIDevice *)piix3_state)->devfn + 3, - NULL, NULL); + devfn, NULL, NULL); pci_conf = s->dev.config; pci_conf[0x00] = 0x86; pci_conf[0x01] = 0x80; |