Skip to content
  • Peter Maydell's avatar
    26edf8cc
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 26edf8cc
    Peter Maydell authored
    
    
    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: default avatarMichael 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: default avatarPeter Maydell <peter.maydell@linaro.org>
    26edf8cc
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
    Peter Maydell authored
    
    
    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: default avatarMichael 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: default avatarPeter Maydell <peter.maydell@linaro.org>
Loading