Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-06-09-v2' into staging

QAPI patches for 2017-06-09

# gpg: Signature made Tue 20 Jun 2017 13:31:39 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2017-06-09-v2: (41 commits)
  tests/qdict: check more get_try_int() cases
  console: use get_uint() for "head" property
  i386/cpu: use get_uint() for "min-level"/"min-xlevel" properties
  numa: use get_uint() for "size" property
  pnv-core: use get_uint() for "core-pir" property
  pvpanic: use get_uint() for "ioport" property
  auxbus: use get_uint() for "addr" property
  arm: use get_uint() for "mp-affinity" property
  xen: use get_uint() for "max-ram-below-4g" property
  pc: use get_uint() for "hpet-intcap" property
  pc: use get_uint() for "apic-id" property
  pc: use get_uint() for "iobase" property
  acpi: use get_uint() for "pci-hole*" properties
  acpi: use get_uint() for various acpi properties
  acpi: use get_uint() for "acpi-pcihp-io*" properties
  platform-bus: use get_uint() for "addr" property
  bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base"
  aspeed: use {set, get}_uint() for "ram-size" property
  pcihp: use get_uint() for "bsel" property
  pc-dimm: make "size" property uint64
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --cc block/nfs.c
Simple merge

diff --cc block/qapi.c
Simple merge

diff --cc block/sheepdog.c
Simple merge

diff --cc blockdev.c
Simple merge

diff --cc hw/i386/pc.c
Simple merge

diff --cc hw/pci-host/q35.c
index 28cb97b60fa3a013cfb378c86174747f279558d7,564f6cbb14b774792f1e71f1711801bb74114ae8..0e472f2ed4c9a108a7e952e729157fb2e4f6848a
--- 1/hw/pci-host/q35.c
--- 2/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@@ -129,12 -129,11 +129,11 @@@ static void q35_host_get_mmcfg_size(Obj
                                      void *opaque, Error **errp)
  {
      PCIExpressHost *e = PCIE_HOST_BRIDGE(obj);
-     uint32_t value = e->size;
  
-     visit_type_uint32(v, name, &value, errp);
+     visit_type_uint64(v, name, &e->size, errp);
  }
  
 -static Property mch_props[] = {
 +static Property q35_host_props[] = {
      DEFINE_PROP_UINT64(PCIE_HOST_MCFG_BASE, Q35PCIHost, parent_obj.base_addr,
                          MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT),
      DEFINE_PROP_SIZE(PCI_HOST_PROP_PCI_HOLE64_SIZE, Q35PCIHost,

diff --cc tests/Makefile.include
Simple merge

diff --cc ui/spice-core.c
Simple merge