The following changes since commit c8b7e627b4269a3bc3ae41d9f420547a47e6d9b9:
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-05-04' into staging (2018-05-04 14:42:46 +0100) are available in the Git repository at: git://github.com/ehabkost/qemu.git tags/machine-next-pull-request for you to fetch changes up to b40dffdec60c2dbe54806576faa5cb85227586d1: scripts/device-crash-test: Removed fixed CAN entries (2018-05-07 10:00:02 -0300) ---------------------------------------------------------------- Machine queue, 2018-05-07 * pc-dimm: factor out MemoryDevice (virtio-pmem and virtio-mem will make use of the new abstraction later) * scripts/device-crash-test: Removed fixed CAN entries ---------------------------------------------------------------- Queue for Machine Core patches David Hildenbrand (11): pc-dimm: factor out MemoryDevice interface machine: make MemoryHotplugState accessible via the machine pc-dimm: no need to pass the memory region pc-dimm: pass in the machine and to the MemoryHotplugState pc-dimm: factor out address search into MemoryDevice code pc-dimm: factor out capacity and slot checks into MemoryDevice pc-dimm: move actual plug/unplug of a memory region to MemoryDevice machine: rename MemoryHotplugState to DeviceMemoryState pc: rename "hotplug memory" terminology to "device memory" spapr: rename "hotplug memory" terminology to "device memory" vl: allow 'maxmem' without 'slot' Thomas Huth (1): scripts/device-crash-test: Removed fixed CAN entries include/hw/boards.h | 12 ++ include/hw/i386/pc.h | 3 +- include/hw/mem/memory-device.h | 51 +++++ include/hw/mem/pc-dimm.h | 27 +-- include/hw/ppc/spapr.h | 5 +- hw/i386/acpi-build.c | 7 +- hw/i386/pc.c | 65 +++--- hw/mem/memory-device.c | 275 ++++++++++++++++++++++++ hw/mem/pc-dimm.c | 304 +++++++-------------------- hw/ppc/spapr.c | 71 ++++--- hw/ppc/spapr_hcall.c | 7 +- hw/ppc/spapr_rtas_ddw.c | 5 +- numa.c | 3 +- qmp.c | 4 +- stubs/{qmp_pc_dimm.c => qmp_memory_device.c} | 4 +- vl.c | 19 +- hw/mem/Makefile.objs | 1 + scripts/device-crash-test | 3 - stubs/Makefile.objs | 2 +- 19 files changed, 510 insertions(+), 358 deletions(-) create mode 100644 include/hw/mem/memory-device.h create mode 100644 hw/mem/memory-device.c rename stubs/{qmp_pc_dimm.c => qmp_memory_device.c} (61%) -- 2.14.3