From: Peter Maydell Date: Tue, 24 Jun 2014 10:14:47 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=27acb9dd2407f41550e453b85aa5ebf1bd618b79;p=people%2Fliuw%2Fqemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging pc,pci,vhost,net fixes, enhancements Don's patches to limit below-4g ram for pc Marcel's pcie hotplug rewrite Gabriel's changes to e1000 auto-negotiation qemu char bugfixes by Stefan misc bugfixes Signed-off-by: Michael S. Tsirkin # gpg: Signature made Mon 23 Jun 2014 16:25:19 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin " # gpg: aka "Michael S. Tsirkin " * remotes/mst/tags/for_upstream: (23 commits) xen-hvm: Handle machine opt max-ram-below-4g pc & q35: Add new machine opt max-ram-below-4g xen-hvm: Fix xen_hvm_init() to adjust pc memory layout pcie: coding style tweak hw/pcie: better hotplug/hotunplug support hw/pcie: implement power controller functionality hw/pcie: correct debug message q35: Use PC_Q35_COMPAT_1_4 on pc-q35-1.4 compat_props virtio-pci: Report an error when msix vectors init fails qemu-char: avoid leaking unused fds in tcp_get_msgfds() qemu-char: fix qemu_chr_fe_get_msgfd() qapi/string-output-visitor: fix human output e1000: factor out checking for auto-negotiation availability e1000: move e1000_autoneg_timer() to after set_ics() e1000: signal guest on successful link auto-negotiation e1000: improve auto-negotiation reporting via mii-tool e1000: emulate auto-negotiation during external link status change qtest: fix vhost-user-test unbalanced mutex locks qtest: fix qtest for vhost-user libqemustub: add more stubs for qemu-char ... Signed-off-by: Peter Maydell --- 27acb9dd2407f41550e453b85aa5ebf1bd618b79