• P
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · df215b59
    Peter Maydell 提交于
    vhost, virtio, pci, pc
    
    Fixes all over the place.
    virtio dataplane migration support.
    Old q35 machine types removed.
    Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Thu 25 Feb 2016 11:16:46 GMT 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: (21 commits)
      q35: No need to check gigabyte_align
      q35: Remove unused q35-acpi-dsdt.aml file
      ich9: Remove enable_tco arguments from init functions
      machine: Remove no_tco field
      q35: Remove old machine versions
      tests/vhost-user-bridge: fix build on 32 bit systems
      vring: remove
      virtio-scsi: do not use vring in dataplane
      virtio-blk: do not use vring in dataplane
      virtio-blk: fix "disabled data plane" mode
      virtio: export vring_notify as virtio_should_notify
      virtio: add AioContext-specific function for host notifiers
      vring: make vring_enable_notification return void
      block-migration: acquire AioContext as necessary
      pci core: function pci_bus_init() cleanup
      pci core: function pci_host_bus_register() cleanup
      balloon: Use only 'pc-dimm' type dimm for ballooning
      virtio-balloon: rewrite get_current_ram_size()
      move get_current_ram_size to virtio-balloon.c
      vhost-user: don't merge regions with different fds
      ...
    Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
    df215b59
bios-linker-loader.h 911 字节