diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-15 08:19:53 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-15 08:19:53 -0500 |
| commit | c84995c50b850ab4febc9f21c58a18ee712e7bed (patch) | |
| tree | eeef1d2c3501fac184723fc5ac0f08f8fc5cf142 /hw | |
| parent | c7ba56c4f0f50845068b037430f947e27e92011a (diff) | |
| parent | fed61bbe3235f0a3507bfb688354bc0431743133 (diff) | |
Merge remote branch 'origin/master' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/bonito.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/bonito.c b/hw/bonito.c index 8b810321ad..dcf031134e 100644 --- a/hw/bonito.c +++ b/hw/bonito.c @@ -775,7 +775,6 @@ PCIBus *bonito_init(qemu_irq *pic) pci_bonito_map_irq, pic, 0x28, 32); pcihost->bus = b; qdev_init_nofail(dev); - pci_bus_set_mem_base(pcihost->bus, 0x10000000); d = pci_create_simple(b, PCI_DEVFN(0, 0), "Bonito"); s = DO_UPCAST(PCIBonitoState, dev, d); |