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/sh_pci.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/sh_pci.c')
| -rw-r--r-- | hw/sh_pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/sh_pci.c b/hw/sh_pci.c index a076cf2..0ef93a0 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c @@ -26,6 +26,7 @@ #include "pci.h" #include "pci_host.h" #include "bswap.h" +#include "exec-memory.h" typedef struct SHPCIState { SysBusDevice busdev; @@ -127,7 +128,8 @@ static int sh_pci_init_device(SysBusDevice *dev) } s->bus = pci_register_bus(&s->busdev.qdev, "pci", sh_pci_set_irq, sh_pci_map_irq, - s->irq, PCI_DEVFN(0, 0), 4); + s->irq, get_system_memory(), + PCI_DEVFN(0, 0), 4); s->memconfig = cpu_register_io_memory(sh_pci_reg.r, sh_pci_reg.w, s, DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_cb(dev, 0x224, sh_pci_map); |