summary refs log tree commit diff stats
path: root/hw/piix_pci.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-03-10 19:33:03 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-03-10 19:33:03 -0500
commit6a245c666d02210b8461952eccc17379fdeedd9f (patch)
tree82e0ea4a8f65ae90c6cdbc6c0efecf4c3416a677 /hw/piix_pci.c
parent6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a (diff)
parentdb2d5eba652ecb7420ac4ef79fc747ef391ad0d9 (diff)
downloadfocaccia-qemu-6a245c666d02210b8461952eccc17379fdeedd9f.tar.gz
focaccia-qemu-6a245c666d02210b8461952eccc17379fdeedd9f.zip
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By Lei Li (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  Fix the wrong description in qemu manual
  pci_host: Drop write-only address_space field
  rng-random: Use qemu_open / qemu_close
  configure: Require at least spice-protocol-0.12.3
  osdep: replace setsockopt by qemu_setsockopt
  lm32: remove unused function
  rtc-test: Fix test failures with recent glib
  configure: Create link to icon bitmap for out-of-tree builds
Diffstat (limited to 'hw/piix_pci.c')
-rw-r--r--hw/piix_pci.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 6c77e493e4..9246983c55 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -244,7 +244,6 @@ static PCIBus *i440fx_common_init(const char *device_name,
 
     dev = qdev_create(NULL, "i440FX-pcihost");
     s = PCI_HOST_BRIDGE(dev);
-    s->address_space = address_space_mem;
     b = pci_bus_new(dev, NULL, pci_address_space,
                     address_space_io, 0);
     s->bus = b;