Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

vhost, virtio, pci, pc

Fixes all over the place.
virtio dataplane migration support.
Old q35 machine types removed.

Signed-off-by: Michael 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: Peter Maydell <peter.maydell@linaro.org>

diff --combined include/hw/acpi/bios-linker-loader.h
index 721b7b9,e54b6b4..82f1af6
--- 1/include/hw/acpi/bios-linker-loader.h
--- 2/include/hw/acpi/bios-linker-loader.h
+++ b/include/hw/acpi/bios-linker-loader.h
@@@ -2,6 -2,8 +2,6 @@@
  #define BIOS_LINKER_LOADER_H
  
  #include <glib.h>
 -#include <stdbool.h>
 -#include <inttypes.h>
  
  GArray *bios_linker_loader_init(void);
  
@@@ -11,7 -13,7 +11,7 @@@ void bios_linker_loader_alloc(GArray *l
                                bool alloc_fseg);
  
  void bios_linker_loader_add_checksum(GArray *linker, const char *file,
-                                      void *table,
+                                      GArray *table,
                                       void *start, unsigned size,
                                       uint8_t *checksum);
  

diff --combined include/hw/virtio/vhost-backend.h
index d6b012f,a6e5c97..95fcc96
--- 1/include/hw/virtio/vhost-backend.h
--- 2/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@@ -11,6 -11,7 +11,6 @@@
  #ifndef VHOST_BACKEND_H_
  #define VHOST_BACKEND_H_
  
 -#include <stdbool.h>
  
  typedef enum VhostBackendType {
      VHOST_BACKEND_TYPE_NONE = 0,
@@@ -69,6 -70,9 +69,9 @@@ typedef int (*vhost_set_vring_enable_op
  typedef bool (*vhost_requires_shm_log_op)(struct vhost_dev *dev);
  typedef int (*vhost_migration_done_op)(struct vhost_dev *dev,
                                         char *mac_addr);
+ typedef bool (*vhost_backend_can_merge_op)(struct vhost_dev *dev,
+                                            uint64_t start1, uint64_t size1,
+                                            uint64_t start2, uint64_t size2);
  
  typedef struct VhostOps {
      VhostBackendType backend_type;
@@@ -96,6 -100,7 +99,7 @@@
      vhost_set_vring_enable_op vhost_set_vring_enable;
      vhost_requires_shm_log_op vhost_requires_shm_log;
      vhost_migration_done_op vhost_migration_done;
+     vhost_backend_can_merge_op vhost_backend_can_merge;
  } VhostOps;
  
  extern const VhostOps user_ops;