diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 19:33:03 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 19:33:03 -0500 |
commit | 6a245c666d02210b8461952eccc17379fdeedd9f (patch) | |
tree | 82e0ea4a8f65ae90c6cdbc6c0efecf4c3416a677 /hw/pci | |
parent | 6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a (diff) | |
parent | db2d5eba652ecb7420ac4ef79fc747ef391ad0d9 (diff) |
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/pci')
-rw-r--r-- | hw/pci/pci_host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/pci/pci_host.h b/hw/pci/pci_host.h index 1845d4dfd5..236cd0f75c 100644 --- a/hw/pci/pci_host.h +++ b/hw/pci/pci_host.h @@ -40,7 +40,6 @@ struct PCIHostState { MemoryRegion conf_mem; MemoryRegion data_mem; MemoryRegion mmcfg; - MemoryRegion *address_space; uint32_t config_reg; PCIBus *bus; }; |