• P
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · a195fdd0
    Peter Maydell 提交于
    misc fixes and cleanups
    
    A bunch of fixes all over the place, some of the
    bugs fixed are actually regressions.
    Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Wed Mar 11 17:48:30 2015 GMT using RSA key ID D28D5469
    # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
    # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
    #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469
    
    * remotes/mst/tags/for_upstream: (25 commits)
      virtio-scsi: remove empty wrapper for cmd
      virtio-scsi: clean out duplicate cdb field
      virtio-scsi: fix cdb/sense size
      uapi/virtio_scsi: allow overriding CDB/SENSE size
      virtio-scsi: drop duplicate CDB/SENSE SIZE
      exec: don't include hw/boards for linux-user
      acpi: specify format for build_append_namestring
      MAINTAINERS: drop aliguori@amazon.com
      tpm: Move memory subregion function into realize function
      virtio-pci: Convert to realize()
      pci: Convert pci_nic_init() to Error to avoid qdev_init()
      machine: query mem-merge machine property
      machine: query dump-guest-core machine property
      hw/boards: make it safe to include for linux-user
      machine: query phandle-start machine property
      machine: query kvm-shadow-mem machine property
      kvm: add machine state to kvm_arch_init
      machine: query kernel-irqchip property
      machine: allowed/required kernel-irqchip support
      machine: replace qemu opts with iommu property
      ...
    Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
    a195fdd0
kvm.c 50.6 KB