• P
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 0403b0f5
    Peter Maydell 提交于
    pc, virtio enhancements
    
    Memory hot-unplug support for pc, MSI-X
    mapping update speedup for virtio-pci,
    misc refactorings and bugfixes.
    Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Mon May 11 08:23:43 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: (28 commits)
      acpi: update expected files for memory unplug
      virtio-scsi: Move DEFINE_VIRTIO_SCSI_FEATURES to virtio-scsi
      virtio-net: Move DEFINE_VIRTIO_NET_FEATURES to virtio-net
      pci: Merge pci_nic_init() into pci_nic_init_nofail()
      acpi: add a missing backslash to the \_SB scope.
      qmp-event: add event notification for memory hot unplug error
      acpi: add hardware implementation for memory hot unplug
      acpi: fix "Memory device control fields" register
      acpi: extend aml_field() to support UpdateRule
      acpi, mem-hotplug: add unplug cb for memory device
      acpi, mem-hotplug: add unplug request cb for memory device
      acpi, mem-hotplug: add acpi_memory_slot_status() to get MemStatus
      docs: update documentation for memory hot unplug
      virtio: coding style tweak
      pci: remove hard-coded bar size in msix_init_exclusive_bar()
      virtio-pci: speedup MSI-X masking and unmasking
      virtio: introduce vector to virtqueues mapping
      virtio-ccw: using VIRTIO_NO_VECTOR instead of 0 for invalid virtqueue
      monitor: check return value of qemu_find_net_clients_except()
      monitor: replace the magic number 255 with MAX_QUEUE_NUM
      ...
    
    Conflicts:
    	hw/s390x/s390-virtio-bus.c
    
    [PMM: fixed conflict in s390_virtio_scsi_properties and
    s390_virtio_net_properties arrays; since the result of the
    two conflicting patches is to empty the property arrays
    completely, the conflict resolution is to remove them entirely.]
    Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
    0403b0f5
monitor.c 155.5 KB