Skip to content
  • Peter Maydell's avatar
    0a99aae5
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 0a99aae5
    Peter Maydell authored
    
    
    pc,pci,virtio,hotplug fixes, enhancements
    
    numa work by Hu Tao and others
    memory hotplug by Igor
    vhost-user by Nikolay, Antonios and others
    guest virtio announcements by Jason
    qtest fixes by Sergey
    qdev hotplug fixes by Paolo
    misc other fixes mostly by myself
    
    Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
    
    * remotes/mst/tags/for_upstream: (109 commits)
      numa: use RAM_ADDR_FMT with ram_addr_t
      qapi/string-output-visitor: fix bugs
      tests: simplify code
      qapi: fix input visitor bugs
      acpi: rephrase comment
      qmp: add ACPI_DEVICE_OST event handling
      qmp: add query-acpi-ospm-status command
      acpi: implement ospm_status() method for PIIX4/ICH9_LPC devices
      acpi: introduce TYPE_ACPI_DEVICE_IF interface
      qmp: add query-memory-devices command
      numa: handle mmaped memory allocation failure correctly
      pc: acpi: do not hardcode preprocessor
      qmp: clean out whitespace
      qdev: recursively unrealize devices when unrealizing bus
      qdev: reorganize error reporting in bus_set_realized
      qapi: fix build on glib < 2.28
      qapi: make string output visitor parse int list
      qapi: make string input visitor parse int list
      tests: fix memory leak in test of string input visitor
      hmp: add info memdev
      ...
    
    Conflicts:
    	include/hw/i386/pc.h
    [PMM: fixed minor conflict in pc.h]
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    0a99aae5
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
    Peter Maydell authored
    
    
    pc,pci,virtio,hotplug fixes, enhancements
    
    numa work by Hu Tao and others
    memory hotplug by Igor
    vhost-user by Nikolay, Antonios and others
    guest virtio announcements by Jason
    qtest fixes by Sergey
    qdev hotplug fixes by Paolo
    misc other fixes mostly by myself
    
    Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
    
    * remotes/mst/tags/for_upstream: (109 commits)
      numa: use RAM_ADDR_FMT with ram_addr_t
      qapi/string-output-visitor: fix bugs
      tests: simplify code
      qapi: fix input visitor bugs
      acpi: rephrase comment
      qmp: add ACPI_DEVICE_OST event handling
      qmp: add query-acpi-ospm-status command
      acpi: implement ospm_status() method for PIIX4/ICH9_LPC devices
      acpi: introduce TYPE_ACPI_DEVICE_IF interface
      qmp: add query-memory-devices command
      numa: handle mmaped memory allocation failure correctly
      pc: acpi: do not hardcode preprocessor
      qmp: clean out whitespace
      qdev: recursively unrealize devices when unrealizing bus
      qdev: reorganize error reporting in bus_set_realized
      qapi: fix build on glib < 2.28
      qapi: make string output visitor parse int list
      qapi: make string input visitor parse int list
      tests: fix memory leak in test of string input visitor
      hmp: add info memdev
      ...
    
    Conflicts:
    	include/hw/i386/pc.h
    [PMM: fixed minor conflict in pc.h]
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Loading