From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun, 11 Oct 2009 19:06:15 +0000 (+0200)
Subject: mac99: fix segmentation fault on startup
X-Git-Tag: v0.11.1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90d6b807cccbbda317594c3b18f325660b00f61f;p=thirdparty%2Fqemu.git

mac99: fix segmentation fault on startup

Don't assign the same devfn to two different PCI devices.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hw/unin_pci.c b/hw/unin_pci.c
index 0ad0cd39110..ca8d9a5c001 100644
--- a/hw/unin_pci.c
+++ b/hw/unin_pci.c
@@ -234,7 +234,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic)
     cpu_register_physical_memory(0xf0c00000, 0x1000, pci_mem_data);
 
     d = pci_register_device(s->bus, "Uni-north AGP", sizeof(PCIDevice),
-                            11 << 3, NULL, NULL);
+                            12 << 3, NULL, NULL);
     pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_APPLE);
     pci_config_set_device_id(d->config, PCI_DEVICE_ID_APPLE_UNI_N_AGP);
     d->config[0x08] = 0x00; // revision