diff options
| author | malc <av1474@comtv.ru> | 2011-08-05 10:07:10 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-08-05 10:07:10 +0400 |
| commit | a67a47d2b559a7733c3f89aeb2d81b19d2c027e4 (patch) | |
| tree | 146a7b6eebbee1367453fde501d4462ac6d9f8b4 /hw/gt64xxx.c | |
| parent | 670acc9bf21474b2a4456a3cd13323e48e35820d (diff) | |
| parent | 81e34a2401f7ffd519bb7f093e833cb48734169f (diff) | |
| download | qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.zip qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.gz qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.bz2 | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/gt64xxx.c')
| -rw-r--r-- | hw/gt64xxx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index 8e1f6a0..65e63dd 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c @@ -27,6 +27,7 @@ #include "pci.h" #include "pci_host.h" #include "pc.h" +#include "exec-memory.h" //#define DEBUG @@ -1092,7 +1093,8 @@ PCIBus *gt64120_register(qemu_irq *pic) d = FROM_SYSBUS(GT64120State, s); d->pci.bus = pci_register_bus(&d->busdev.qdev, "pci", gt64120_pci_set_irq, gt64120_pci_map_irq, - pic, PCI_DEVFN(18, 0), 4); + pic, get_system_memory(), + PCI_DEVFN(18, 0), 4); d->ISD_handle = cpu_register_io_memory(gt64120_read, gt64120_write, d, DEVICE_NATIVE_ENDIAN); |