Merge branch 'upstream-merge' into next
* upstream-merge: (389 commits)
Bump version to 1.0-rc0
Revert "virtio: Add PCI memory BAR in addition to PIO BAR"
tcg: Fix whitespace in tcg-op.h.
tcg: Fix regression in tcg_gen_deposit_i64.
pcnet: Add link state support
pcnet-pci: Fix PIO word access to PROM
pcnet: Move BCR defines to header
Sort the help info shown in monitor at runtime
event_notifier: move to top-level directory
Move filedescriptor parsing code from net.c into qemu_parse_fd()
configure: Suppress messages from pkg_config probe for check
virtio: Add PCI memory BAR in addition to PIO BAR
usb-uhci: Use PCI DMA stub functions
usb-ehci: Use PCI DMA stub functions
PCI IDE: Use PCI DMA stub functions
intel-hda: Use PCI DMA stub functions
pcnet-pci: Use PCI DMA stub functions
lsi53c895a: Use PCI DMA stub functions
e1000: Use PCI DMA stub functions
es1370: Use PCI DMA stub functions
...
Signed-off-by: Avi Kivity <avi@redhat.com>