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

pc,pci,virtio,qdev fixes, tests

new tests for SMBIOS
SMBIOS fixes
pc, pci fixes
qdev patches stayed on list for a month with no review,
as I told people on KVM forum I'm merging stuch patches
if they look fine.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* remotes/mst/tags/for_upstream:
  qdev: Add test of qdev_prop_check_global
  qdev: Display warning about unused -global
  tests: add smbios testing
  tests: rename acpi-test to bios-tables-test
  virtio-balloon: return empty data when no stats are available
  pcie_host: Turn pcie_host_init() into an instance_init
  SMBIOS: Fix type 17 field sizes
  SMBIOS: Update Type 0 struct generator for machines >= 2.1
  SMBIOS: Fix endian-ness when populating multi-byte fields
  serial-pci: Set prog interface field of pci config to 16550 compatible

Conflicts:
	include/hw/i386/pc.h
[PMM: fixed trivial conflict in pc.h]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --cc include/hw/i386/pc.h
index 31328a81572de69cfc53c5a66c87953d3b866da3,552fbd8243aa13aab437854600e5282af08aeaf7..fa9d99792a5e1d4eaa753fb4949f9f4285790cf2
--- 1/include/hw/i386/pc.h
--- 2/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@@ -271,10 -271,21 +271,25 @@@ bool e820_get_entry(int, uint32_t, uint
              .driver   = "apic",\
              .property = "version",\
              .value    = stringify(0x11),\
 +        },{\
 +            .driver   = "nec-usb-xhci",\
 +            .property = "superspeed-ports-first",\
 +            .value    = "off",\
+         },\
+         {\
+             .driver   = "pci-serial",\
+             .property = "prog_if",\
+             .value    = stringify(0),\
+         },\
+         {\
+             .driver   = "pci-serial-2x",\
+             .property = "prof_if",\
+             .value    = stringify(0),\
+         },\
+         {\
+             .driver   = "pci-serial-4x",\
+             .property = "prog_if",\
+             .value    = stringify(0),\
          }
  
  #define PC_COMPAT_1_7 \

diff --cc include/hw/qdev-core.h
Simple merge

diff --cc qemu-options.hx
Simple merge

diff --cc tests/Makefile
Simple merge

diff --cc vl.c
Simple merge