From: Peter Maydell Date: Mon, 1 Jun 2015 14:22:46 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3;p=qmiga%2Fqemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging pc, pci, tpm, virtio, vhost enhancements and fixes A bunch of cleanups and fixes all over the place, enhancements in TPM, virtio and vhost. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Mon Jun 1 13:19:48 2015 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin " # gpg: aka "Michael S. Tsirkin " * remotes/mst/tags/for_upstream: (60 commits) vhost-user: add multi queue support virtio: make features 64bit wide qdev: add 64bit properties virtio-mmio: ioeventfd support hw/acpi/aml-build: Fix memory leak acpi: add aml_while() term acpi: add aml_increment() term acpi: add aml_shiftright() term acpi: add aml_shiftleft() term acpi: add aml_index() term acpi: add aml_lless() term acpi: add aml_add() term TPM2 ACPI table support tpm: Probe for connected TPM 1.2 or TPM 2 Extend TPM TIS interface to support TPM 2 Add stream ID to MSI write acpi: Simplify printing to dynamic string i386: drop FDC in pc-q35-2.4+ if neither it nor floppy drives are wanted i386/pc_q35: don't insist on board FDC if there's no default floppy i386/pc: '-drive if=floppy' should imply a board-default FDC ... Signed-off-by: Peter Maydell --- b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3