1. 04 6月, 2015 33 次提交
  2. 02 6月, 2015 6 次提交
  3. 01 6月, 2015 1 次提交
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · b821cbe2
      Peter Maydell 提交于
      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: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Mon Jun  1 13:19:48 2015 BST using RSA key ID D28D5469
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
      
      * 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: NPeter Maydell <peter.maydell@linaro.org>
      b821cbe2