* [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers
@ 2018-05-14 10:00 David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 01/18] memory-device: drop assert related to align and start of address space David Hildenbrand
` (17 more replies)
0 siblings, 18 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
We can have devices that need certain other resources that are e.g.
system resources managed by the machine. We need a clean way to assign
these resources (without violating layers as brought up by Igor).
One example is virtio-mem/virtio-pmem. Both device types need to be
assigned some region in guest physical address space. This device memory
belongs to the machine and is managed by it. However, virito devices are
hotplugged using the hotplug handler their proxy device implements. So we
could trigger e.g. a PCI hotplug handler for virtio-pci or a CSS/CCW
hotplug handler for virtio-ccw. But definetly not the machine.
Now, we can route other devices through the machine hotplug handler, to
properly assign/unassign resources - like a portion in guest physical
address space.
v2 -> v3:
- Added "memory-device: introduce separate config option"
- Dropped "parent_bus" check from hotplug handler lookup functions
- "Handly" -> "Handle" in patch description.
v1 -> v2:
- Use multi stage hotplug handler instead of resource handler
- MemoryDevices only compiled if necessary (CONFIG_MEM_HOTPLUG)
- Prepare PC/SPAPR machines properly for multi stage hotplug handlers
- Route SPAPR unplug code via the hotunplug handler
- Directly include s390x support. But there are no usable memory devices
yet (well, only my virtio-mem prototype)
- Included "memory-device: drop assert related to align and start of address
space"
David Hildenbrand (17):
memory-device: drop assert related to align and start of address space
memory-device: introduce separate config option
pc: prepare for multi stage hotplug handlers
pc: route all memory devices through the machine hotplug handler
spapr: prepare for multi stage hotplug handlers
spapr: route all memory devices through the machine hotplug handler
spapr: handle pc-dimm unplug via hotplug handler chain
spapr: handle cpu core unplug via hotplug handler chain
memory-device: new functions to handle plug/unplug
pc-dimm: implement new memory device functions
memory-device: factor out pre-plug into hotplug handler
memory-device: factor out unplug into hotplug handler
memory-device: factor out plug into hotplug handler
s390x/sclp: make sure ram_size and maxram_size stay in sync
s390x: prepare for multi stage hotplug handlers
s390x: initialize memory region for memory devices
s390x: support memory devices
Igor Mammedov (1):
qdev: let machine hotplug handler to override bus hotplug handler
default-configs/i386-softmmu.mak | 3 +-
default-configs/ppc64-softmmu.mak | 3 +-
default-configs/s390x-softmmu.mak | 1 +
default-configs/x86_64-softmmu.mak | 3 +-
hw/Makefile.objs | 2 +-
hw/core/qdev.c | 6 +-
hw/i386/pc.c | 102 ++++++++++++++++++++++-------
hw/mem/Makefile.objs | 4 +-
hw/mem/memory-device.c | 129 +++++++++++++++++++++++--------------
hw/mem/pc-dimm.c | 48 ++++++--------
hw/mem/trace-events | 4 +-
hw/ppc/spapr.c | 129 +++++++++++++++++++++++++++++++------
hw/s390x/s390-virtio-ccw.c | 98 ++++++++++++++++++++++++++--
hw/s390x/sclp.c | 18 +++++-
include/hw/mem/memory-device.h | 21 ++++--
include/hw/mem/pc-dimm.h | 3 +-
include/hw/qdev-core.h | 11 ++++
qapi/misc.json | 2 +-
18 files changed, 440 insertions(+), 147 deletions(-)
--
2.14.3
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 01/18] memory-device: drop assert related to align and start of address space
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 02/18] memory-device: introduce separate config option David Hildenbrand
` (16 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
The start of the address space does not have to be aligned for the
search. Handle this case explicitly when starting the search for a new
address.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/mem/memory-device.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 3e04f3954e..361d38bfc5 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -116,7 +116,6 @@ uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
address_space_start = ms->device_memory->base;
address_space_end = address_space_start +
memory_region_size(&ms->device_memory->mr);
- g_assert(QEMU_ALIGN_UP(address_space_start, align) == address_space_start);
g_assert(address_space_end >= address_space_start);
memory_device_check_addable(ms, size, errp);
@@ -149,7 +148,7 @@ uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
return 0;
}
} else {
- new_addr = address_space_start;
+ new_addr = QEMU_ALIGN_UP(address_space_start, align);
}
/* find address range that will fit new memory device */
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 02/18] memory-device: introduce separate config option
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 01/18] memory-device: drop assert related to align and start of address space David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-15 0:20 ` [Qemu-devel] [Qemu-ppc] " Murilo Opsfelder Araujo
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 03/18] qdev: let machine hotplug handler to override bus hotplug handler David Hildenbrand
` (15 subsequent siblings)
17 siblings, 1 reply; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
Some architectures might support memory devices, while they don't
support DIMM/NVDIMM. So let's
- Rename CONFIG_MEM_HOTPLUG to CONFIG_MEM_DEVICE
- Intriduce CONFIG_DIMM and use it similarly to CONFIG NVDIMM
CONFIG_DIMM and CONFIG_NVDIMM require CONFIG_MEM_DEVICE.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
default-configs/i386-softmmu.mak | 3 ++-
default-configs/ppc64-softmmu.mak | 3 ++-
default-configs/x86_64-softmmu.mak | 3 ++-
hw/Makefile.objs | 2 +-
hw/mem/Makefile.objs | 4 ++--
qapi/misc.json | 2 +-
6 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 8c7d4a0fa0..4c1637338b 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -50,7 +50,8 @@ CONFIG_PCI_Q35=y
CONFIG_APIC=y
CONFIG_IOAPIC=y
CONFIG_PVPANIC=y
-CONFIG_MEM_HOTPLUG=y
+CONFIG_MEM_DEVICE=y
+CONFIG_DIMM=y
CONFIG_NVDIMM=y
CONFIG_ACPI_NVDIMM=y
CONFIG_PCIE_PORT=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index b94af6c7c6..f550573782 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -16,4 +16,5 @@ CONFIG_VIRTIO_VGA=y
CONFIG_XICS=$(CONFIG_PSERIES)
CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)
CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM))
-CONFIG_MEM_HOTPLUG=y
+CONFIG_MEM_DEVICE=y
+CONFIG_DIMM=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 0390b4303c..7785351414 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -50,7 +50,8 @@ CONFIG_PCI_Q35=y
CONFIG_APIC=y
CONFIG_IOAPIC=y
CONFIG_PVPANIC=y
-CONFIG_MEM_HOTPLUG=y
+CONFIG_MEM_DEVICE=y
+CONFIG_DIMM=y
CONFIG_NVDIMM=y
CONFIG_ACPI_NVDIMM=y
CONFIG_PCIE_PORT=y
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 6a0ffe0afd..127a60eca4 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -33,7 +33,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += vfio/
devices-dirs-$(CONFIG_SOFTMMU) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
devices-dirs-$(CONFIG_SOFTMMU) += xen/
-devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/
+devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
devices-dirs-$(CONFIG_SOFTMMU) += smbios/
devices-dirs-y += core/
common-obj-y += $(devices-dirs-y)
diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs
index 10be4df2a2..3e2f7c5ca2 100644
--- a/hw/mem/Makefile.objs
+++ b/hw/mem/Makefile.objs
@@ -1,3 +1,3 @@
-common-obj-$(CONFIG_MEM_HOTPLUG) += pc-dimm.o
-common-obj-$(CONFIG_MEM_HOTPLUG) += memory-device.o
+common-obj-$(CONFIG_DIMM) += pc-dimm.o
+common-obj-$(CONFIG_MEM_DEVICE) += memory-device.o
common-obj-$(CONFIG_NVDIMM) += nvdimm.o
diff --git a/qapi/misc.json b/qapi/misc.json
index f5988cc0b5..65eae0c8a0 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -2060,7 +2060,7 @@
#
# @plugged-memory: size of memory that can be hot-unplugged. This field
# is omitted if target doesn't support memory hotplug
-# (i.e. CONFIG_MEM_HOTPLUG not defined on build time).
+# (i.e. CONFIG_MEM_DEVICE not defined on build time).
#
# Since: 2.11.0
##
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 03/18] qdev: let machine hotplug handler to override bus hotplug handler
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 01/18] memory-device: drop assert related to align and start of address space David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 02/18] memory-device: introduce separate config option David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-15 0:00 ` [Qemu-devel] [Qemu-ppc] " Murilo Opsfelder Araujo
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 04/18] pc: prepare for multi stage hotplug handlers David Hildenbrand
` (14 subsequent siblings)
17 siblings, 1 reply; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
From: Igor Mammedov <imammedo@redhat.com>
it will allow to return another hotplug handler than the default
one for a specific bus based device type. Which is needed to handle
non trivial plug/unplug sequences that need the access to resources
configured outside of bus where device is attached.
That will allow for returned hotplug handler to orchestrate wiring
in arbitrary order, by chaining other hotplug handlers when
it's needed.
PS:
It could be used for hybrid virtio-mem and virtio-pmem devices
where it will return machine as hotplug handler which will do
necessary wiring at machine level and then pass control down
the chain to bus specific hotplug handler.
Example of top level hotplug handler override and custom plug sequence:
some_machine_get_hotplug_handler(machine){
if (object_dynamic_cast(OBJECT(dev), TYPE_SOME_BUS_DEVICE)) {
return HOTPLUG_HANDLER(machine);
}
return NULL;
}
some_machine_device_plug(hotplug_dev, dev) {
if (object_dynamic_cast(OBJECT(dev), TYPE_SOME_BUS_DEVICE)) {
/* do machine specific initialization */
some_machine_init_special_device(dev)
/* pass control to bus specific handler */
hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev)
}
}
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/core/qdev.c | 6 ++----
include/hw/qdev-core.h | 11 +++++++++++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index f6f92473b8..885286f579 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -261,12 +261,10 @@ HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev)
HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev)
{
- HotplugHandler *hotplug_ctrl;
+ HotplugHandler *hotplug_ctrl = qdev_get_machine_hotplug_handler(dev);
- if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ if (hotplug_ctrl == NULL && dev->parent_bus) {
hotplug_ctrl = dev->parent_bus->hotplug_handler;
- } else {
- hotplug_ctrl = qdev_get_machine_hotplug_handler(dev);
}
return hotplug_ctrl;
}
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 9453588160..e6a8eca558 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -286,6 +286,17 @@ void qdev_init_nofail(DeviceState *dev);
void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
int required_for_version);
HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev);
+/**
+ * qdev_get_hotplug_handler: Get handler responsible for device wiring
+ *
+ * Find HOTPLUG_HANDLER for @dev that provides [pre|un]plug callbacks for it.
+ *
+ * Note: in case @dev has a parent bus, it will be returned as handler unless
+ * machine handler overrides it.
+ *
+ * Returns: pointer to object that implements TYPE_HOTPLUG_HANDLER interface
+ * or NULL if there aren't any.
+ */
HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev);
void qdev_unplug(DeviceState *dev, Error **errp);
void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev,
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 04/18] pc: prepare for multi stage hotplug handlers
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (2 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 03/18] qdev: let machine hotplug handler to override bus hotplug handler David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 05/18] pc: route all memory devices through the machine hotplug handler David Hildenbrand
` (13 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
For multi stage hotplug handlers, we'll have to do some error handling
in some hotplug functions, so let's use a local error variable (except
for unplug requests).
Also, add code to pass control to the final stage hotplug handler at the
parent bus.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/i386/pc.c | 39 +++++++++++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index d768930d02..510076e156 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -2007,19 +2007,32 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
+ Error *local_err = NULL;
+
+ /* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
- pc_cpu_pre_plug(hotplug_dev, dev, errp);
+ pc_cpu_pre_plug(hotplug_dev, dev, &local_err);
+ } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_pre_plug(dev->parent_bus->hotplug_handler, dev,
+ &local_err);
}
+ error_propagate(errp, local_err);
}
static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
+ Error *local_err = NULL;
+
+ /* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
- pc_dimm_plug(hotplug_dev, dev, errp);
+ pc_dimm_plug(hotplug_dev, dev, &local_err);
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
- pc_cpu_plug(hotplug_dev, dev, errp);
+ pc_cpu_plug(hotplug_dev, dev, &local_err);
+ } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev, &local_err);
}
+ error_propagate(errp, local_err);
}
static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
@@ -2029,7 +2042,10 @@ static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
pc_dimm_unplug_request(hotplug_dev, dev, errp);
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
pc_cpu_unplug_request_cb(hotplug_dev, dev, errp);
- } else {
+ } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_unplug_request(dev->parent_bus->hotplug_handler, dev,
+ errp);
+ } else if (!dev->parent_bus) {
error_setg(errp, "acpi: device unplug request for not supported device"
" type: %s", object_get_typename(OBJECT(dev)));
}
@@ -2038,14 +2054,21 @@ static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
+ Error *local_err = NULL;
+
+ /* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
- pc_dimm_unplug(hotplug_dev, dev, errp);
+ pc_dimm_unplug(hotplug_dev, dev, &local_err);
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
- pc_cpu_unplug_cb(hotplug_dev, dev, errp);
- } else {
- error_setg(errp, "acpi: device unplug for not supported device"
+ pc_cpu_unplug_cb(hotplug_dev, dev, &local_err);
+ } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev,
+ &local_err);
+ } else if (!dev->parent_bus) {
+ error_setg(&local_err, "acpi: device unplug for not supported device"
" type: %s", object_get_typename(OBJECT(dev)));
}
+ error_propagate(errp, local_err);
}
static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 05/18] pc: route all memory devices through the machine hotplug handler
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (3 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 04/18] pc: prepare for multi stage hotplug handlers David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 06/18] spapr: prepare for multi stage hotplug handlers David Hildenbrand
` (12 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
Necessary to hotplug them cleanly later. We could drop the PC_DIMM
check, as PC_DIMM are just memory devices, but this approach is cleaner.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/i386/pc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 510076e156..8bc41ef24b 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -74,6 +74,7 @@
#include "hw/nmi.h"
#include "hw/i386/intel_iommu.h"
#include "hw/net/ne2000-isa.h"
+#include "hw/mem/memory-device.h"
/* debug PC/ISA interrupts */
//#define DEBUG_IRQ
@@ -2075,6 +2076,7 @@ static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
DeviceState *dev)
{
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) ||
+ object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE) ||
object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
return HOTPLUG_HANDLER(machine);
}
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 06/18] spapr: prepare for multi stage hotplug handlers
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (4 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 05/18] pc: route all memory devices through the machine hotplug handler David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 07/18] spapr: route all memory devices through the machine hotplug handler David Hildenbrand
` (11 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
For multi stage hotplug handlers, we'll have to do some error handling
in some hotplug functions, so let's use a local error variable (except
for unplug requests).
Also, add code to pass control to the final stage hotplug handler at the
parent bus.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/ppc/spapr.c | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 43 insertions(+), 11 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index ebf30dd60b..b7c5c95f7a 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3571,27 +3571,48 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev,
{
MachineState *ms = MACHINE(hotplug_dev);
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(ms);
+ Error *local_err = NULL;
+ /* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
int node;
if (!smc->dr_lmb_enabled) {
- error_setg(errp, "Memory hotplug not supported for this machine");
- return;
+ error_setg(&local_err,
+ "Memory hotplug not supported for this machine");
+ goto out;
}
- node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP, errp);
- if (*errp) {
- return;
+ node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP,
+ &local_err);
+ if (local_err) {
+ goto out;
}
if (node < 0 || node >= MAX_NODES) {
- error_setg(errp, "Invaild node %d", node);
- return;
+ error_setg(&local_err, "Invaild node %d", node);
+ goto out;
}
- spapr_memory_plug(hotplug_dev, dev, node, errp);
+ spapr_memory_plug(hotplug_dev, dev, node, &local_err);
} else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {
- spapr_core_plug(hotplug_dev, dev, errp);
+ spapr_core_plug(hotplug_dev, dev, &local_err);
+ } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev, &local_err);
+ }
+out:
+ error_propagate(errp, local_err);
+}
+
+static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ Error *local_err = NULL;
+
+ /* final stage hotplug handler */
+ if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev,
+ &local_err);
}
+ error_propagate(errp, local_err);
}
static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_dev,
@@ -3618,17 +3639,27 @@ static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_dev,
return;
}
spapr_core_unplug_request(hotplug_dev, dev, errp);
+ } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_unplug_request(dev->parent_bus->hotplug_handler, dev,
+ errp);
}
}
static void spapr_machine_device_pre_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
+ Error *local_err = NULL;
+
+ /* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
- spapr_memory_pre_plug(hotplug_dev, dev, errp);
+ spapr_memory_pre_plug(hotplug_dev, dev, &local_err);
} else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {
- spapr_core_pre_plug(hotplug_dev, dev, errp);
+ spapr_core_pre_plug(hotplug_dev, dev, &local_err);
+ } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_pre_plug(dev->parent_bus->hotplug_handler, dev,
+ &local_err);
}
+ error_propagate(errp, local_err);
}
static HotplugHandler *spapr_get_hotplug_handler(MachineState *machine,
@@ -3988,6 +4019,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
mc->get_default_cpu_node_id = spapr_get_default_cpu_node_id;
mc->possible_cpu_arch_ids = spapr_possible_cpu_arch_ids;
hc->unplug_request = spapr_machine_device_unplug_request;
+ hc->unplug = spapr_machine_device_unplug;
smc->dr_lmb_enabled = true;
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power8_v2.0");
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 07/18] spapr: route all memory devices through the machine hotplug handler
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (5 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 06/18] spapr: prepare for multi stage hotplug handlers David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 08/18] spapr: handle pc-dimm unplug via hotplug handler chain David Hildenbrand
` (10 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
Necessary to hotplug them cleanly later.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/ppc/spapr.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index b7c5c95f7a..2f315f963b 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3666,6 +3666,7 @@ static HotplugHandler *spapr_get_hotplug_handler(MachineState *machine,
DeviceState *dev)
{
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) ||
+ object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE) ||
object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {
return HOTPLUG_HANDLER(machine);
}
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 08/18] spapr: handle pc-dimm unplug via hotplug handler chain
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (6 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 07/18] spapr: route all memory devices through the machine hotplug handler David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 09/18] spapr: handle cpu core " David Hildenbrand
` (9 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
Let's handle it via hotplug_handler_unplug(). E.g. necessary to hotplug/
unplug memory devices (which a pc-dimm is) later.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/ppc/spapr.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 2f315f963b..286c38c842 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3291,7 +3291,8 @@ static sPAPRDIMMState *spapr_recover_pending_dimm_state(sPAPRMachineState *ms,
/* Callback to be called during DRC release. */
void spapr_lmb_release(DeviceState *dev)
{
- sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_hotplug_handler(dev));
+ HotplugHandler *hotplug_ctrl = qdev_get_hotplug_handler(dev);
+ sPAPRMachineState *spapr = SPAPR_MACHINE(hotplug_ctrl);
sPAPRDIMMState *ds = spapr_pending_dimm_unplugs_find(spapr, PC_DIMM(dev));
/* This information will get lost if a migration occurs
@@ -3309,9 +3310,21 @@ void spapr_lmb_release(DeviceState *dev)
/*
* Now that all the LMBs have been removed by the guest, call the
- * pc-dimm unplug handler to cleanup up the pc-dimm device.
+ * unplug handler chain. This can never fail.
*/
- pc_dimm_memory_unplug(dev, MACHINE(spapr));
+ hotplug_ctrl = qdev_get_hotplug_handler(dev);
+ hotplug_handler_unplug(hotplug_ctrl, dev, &error_abort);
+}
+
+static void spapr_memory_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,
+ Error **errp)
+{
+ sPAPRMachineState *spapr = SPAPR_MACHINE(hotplug_dev);
+ sPAPRDIMMState *ds = spapr_pending_dimm_unplugs_find(spapr, PC_DIMM(dev));
+
+ g_assert(ds);
+ g_assert(!ds->nr_lmbs);
+ pc_dimm_memory_unplug(dev, MACHINE(hotplug_dev));
object_unparent(OBJECT(dev));
spapr_pending_dimm_unplugs_remove(spapr, ds);
}
@@ -3608,7 +3621,9 @@ static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev,
Error *local_err = NULL;
/* final stage hotplug handler */
- if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ spapr_memory_unplug(hotplug_dev, dev, &local_err);
+ } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev,
&local_err);
}
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 09/18] spapr: handle cpu core unplug via hotplug handler chain
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (7 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 08/18] spapr: handle pc-dimm unplug via hotplug handler chain David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 10/18] memory-device: new functions to handle plug/unplug David Hildenbrand
` (8 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
Let's handle it via hotplug_handler_unplug().
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/ppc/spapr.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 286c38c842..13d153b5a6 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3412,7 +3412,16 @@ static void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset,
/* Callback to be called during DRC release. */
void spapr_core_release(DeviceState *dev)
{
- MachineState *ms = MACHINE(qdev_get_hotplug_handler(dev));
+ HotplugHandler *hotplug_ctrl = qdev_get_hotplug_handler(dev);
+
+ /* Call the unplug handler chain. This can never fail. */
+ hotplug_handler_unplug(hotplug_ctrl, dev, &error_abort);
+}
+
+static void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,
+ Error **errp)
+{
+ MachineState *ms = MACHINE(hotplug_dev);
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(ms);
CPUCore *cc = CPU_CORE(dev);
CPUArchId *core_slot = spapr_find_cpu_slot(ms, cc->core_id, NULL);
@@ -3623,6 +3632,8 @@ static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev,
/* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
spapr_memory_unplug(hotplug_dev, dev, &local_err);
+ } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {
+ spapr_core_unplug(hotplug_dev, dev, &local_err);
} else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev,
&local_err);
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 10/18] memory-device: new functions to handle plug/unplug
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (8 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 09/18] spapr: handle cpu core " David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 11/18] pc-dimm: implement new memory device functions David Hildenbrand
` (7 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
We will need a handful of new functions:
- set_addr(): To set the calculated address
- get_memory_region(): To add it to the memory region container
- get_addr(): If the device has any specific alignment requirements
Using these and the existing functions, we can properly plug/unplug
memory devices.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
include/hw/mem/memory-device.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index 2853b084b5..62d906be50 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -29,14 +29,24 @@ typedef struct MemoryDeviceState {
Object parent_obj;
} MemoryDeviceState;
+/*
+ * MemoryDeviceClass functions should only be called on realized
+ * MemoryDevice instances.
+ */
typedef struct MemoryDeviceClass {
InterfaceClass parent_class;
+ /* required functions that have to be implemented */
uint64_t (*get_addr)(const MemoryDeviceState *md);
+ void (*set_addr)(MemoryDeviceState *md, uint64_t addr);
+ MemoryRegion *(*get_memory_region)(MemoryDeviceState *md);
uint64_t (*get_plugged_size)(const MemoryDeviceState *md);
uint64_t (*get_region_size)(const MemoryDeviceState *md);
void (*fill_device_info)(const MemoryDeviceState *md,
MemoryDeviceInfo *info);
+
+ /* optional functions that can be implemented */
+ uint64_t (*get_align)(const MemoryDeviceState *md);
} MemoryDeviceClass;
MemoryDeviceInfoList *qmp_memory_device_list(void);
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 11/18] pc-dimm: implement new memory device functions
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (9 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 10/18] memory-device: new functions to handle plug/unplug David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 12/18] memory-device: factor out pre-plug into hotplug handler David Hildenbrand
` (6 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
Implement the new functions, we don't have to care about alignment for
these DIMMs right now, so leave that function unimplemented.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/mem/pc-dimm.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 12da89d562..5e2e3263ab 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -244,6 +244,21 @@ static uint64_t pc_dimm_md_get_addr(const MemoryDeviceState *md)
return dimm->addr;
}
+static void pc_dimm_md_set_addr(MemoryDeviceState *md, uint64_t addr)
+{
+ PCDIMMDevice *dimm = PC_DIMM(md);
+
+ dimm->addr = addr;
+}
+
+static MemoryRegion *pc_dimm_md_get_memory_region(MemoryDeviceState *md)
+{
+ const PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(md);
+ PCDIMMDevice *dimm = PC_DIMM(md);
+
+ return ddc->get_memory_region(dimm, &error_abort);
+}
+
static uint64_t pc_dimm_md_get_region_size(const MemoryDeviceState *md)
{
/* dropping const here is fine as we don't touch the memory region */
@@ -304,6 +319,8 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data)
ddc->get_vmstate_memory_region = pc_dimm_get_vmstate_memory_region;
mdc->get_addr = pc_dimm_md_get_addr;
+ mdc->set_addr = pc_dimm_md_set_addr;
+ mdc->get_memory_region = pc_dimm_md_get_memory_region;
/* for a dimm plugged_size == region_size */
mdc->get_plugged_size = pc_dimm_md_get_region_size;
mdc->get_region_size = pc_dimm_md_get_region_size;
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 12/18] memory-device: factor out pre-plug into hotplug handler
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (10 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 11/18] pc-dimm: implement new memory device functions David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 13/18] memory-device: factor out unplug " David Hildenbrand
` (5 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
Let's move all pre-plug checks we can do without the device being
realized into the applicable hotplug handler for pc and spapr.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/i386/pc.c | 11 +++++++
hw/mem/memory-device.c | 72 +++++++++++++++++++-----------------------
hw/ppc/spapr.c | 11 +++++++
include/hw/mem/memory-device.h | 2 ++
4 files changed, 57 insertions(+), 39 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 8bc41ef24b..61f1537e14 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -2010,6 +2010,16 @@ static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
{
Error *local_err = NULL;
+ /* first stage hotplug handler */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ memory_device_pre_plug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev),
+ &local_err);
+ }
+
+ if (local_err) {
+ goto out;
+ }
+
/* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
pc_cpu_pre_plug(hotplug_dev, dev, &local_err);
@@ -2017,6 +2027,7 @@ static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
hotplug_handler_pre_plug(dev->parent_bus->hotplug_handler, dev,
&local_err);
}
+out:
error_propagate(errp, local_err);
}
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 361d38bfc5..d22c91993f 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -68,58 +68,26 @@ static int memory_device_used_region_size(Object *obj, void *opaque)
return 0;
}
-static void memory_device_check_addable(MachineState *ms, uint64_t size,
- Error **errp)
-{
- uint64_t used_region_size = 0;
-
- /* we will need a new memory slot for kvm and vhost */
- if (kvm_enabled() && !kvm_has_free_slot(ms)) {
- error_setg(errp, "hypervisor has no free memory slots left");
- return;
- }
- if (!vhost_has_free_slot()) {
- error_setg(errp, "a used vhost backend has no free memory slots left");
- return;
- }
-
- /* will we exceed the total amount of memory specified */
- memory_device_used_region_size(OBJECT(ms), &used_region_size);
- if (used_region_size + size > ms->maxram_size - ms->ram_size) {
- error_setg(errp, "not enough space, currently 0x%" PRIx64
- " in use of total hot pluggable 0x" RAM_ADDR_FMT,
- used_region_size, ms->maxram_size - ms->ram_size);
- return;
- }
-
-}
-
uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
uint64_t align, uint64_t size,
Error **errp)
{
uint64_t address_space_start, address_space_end;
+ uint64_t used_region_size = 0;
GSList *list = NULL, *item;
uint64_t new_addr = 0;
- if (!ms->device_memory) {
- error_setg(errp, "memory devices (e.g. for memory hotplug) are not "
- "supported by the machine");
- return 0;
- }
-
- if (!memory_region_size(&ms->device_memory->mr)) {
- error_setg(errp, "memory devices (e.g. for memory hotplug) are not "
- "enabled, please specify the maxmem option");
- return 0;
- }
address_space_start = ms->device_memory->base;
address_space_end = address_space_start +
memory_region_size(&ms->device_memory->mr);
g_assert(address_space_end >= address_space_start);
- memory_device_check_addable(ms, size, errp);
- if (*errp) {
+ /* will we exceed the total amount of memory specified */
+ memory_device_used_region_size(OBJECT(ms), &used_region_size);
+ if (used_region_size + size > ms->maxram_size - ms->ram_size) {
+ error_setg(errp, "not enough space, currently 0x%" PRIx64
+ " in use of total hot pluggable 0x" RAM_ADDR_FMT,
+ used_region_size, ms->maxram_size - ms->ram_size);
return 0;
}
@@ -242,6 +210,32 @@ uint64_t get_plugged_memory_size(void)
return size;
}
+void memory_device_pre_plug(MachineState *ms, const MemoryDeviceState *md,
+ Error **errp)
+{
+ if (!ms->device_memory) {
+ error_setg(errp, "memory devices (e.g. for memory hotplug) are not "
+ "supported by the machine");
+ return;
+ }
+
+ if (!memory_region_size(&ms->device_memory->mr)) {
+ error_setg(errp, "memory devices (e.g. for memory hotplug) are not "
+ "enabled, please specify the maxmem option");
+ return;
+ }
+
+ /* we will need a new memory slot for kvm and vhost */
+ if (kvm_enabled() && !kvm_has_free_slot(ms)) {
+ error_setg(errp, "hypervisor has no free memory slots left");
+ return;
+ }
+ if (!vhost_has_free_slot()) {
+ error_setg(errp, "a used vhost backend has no free memory slots left");
+ return;
+ }
+}
+
void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
uint64_t addr)
{
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 13d153b5a6..562712def2 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3676,6 +3676,16 @@ static void spapr_machine_device_pre_plug(HotplugHandler *hotplug_dev,
{
Error *local_err = NULL;
+ /* first stage hotplug handler */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ memory_device_pre_plug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev),
+ &local_err);
+ }
+
+ if (local_err) {
+ goto out;
+ }
+
/* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
spapr_memory_pre_plug(hotplug_dev, dev, &local_err);
@@ -3685,6 +3695,7 @@ static void spapr_machine_device_pre_plug(HotplugHandler *hotplug_dev,
hotplug_handler_pre_plug(dev->parent_bus->hotplug_handler, dev,
&local_err);
}
+out:
error_propagate(errp, local_err);
}
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index 62d906be50..3a4e9edc92 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -51,6 +51,8 @@ typedef struct MemoryDeviceClass {
MemoryDeviceInfoList *qmp_memory_device_list(void);
uint64_t get_plugged_memory_size(void);
+void memory_device_pre_plug(MachineState *ms, const MemoryDeviceState *md,
+ Error **errp);
uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
uint64_t align, uint64_t size,
Error **errp);
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 13/18] memory-device: factor out unplug into hotplug handler
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (11 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 12/18] memory-device: factor out pre-plug into hotplug handler David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 14/18] memory-device: factor out plug " David Hildenbrand
` (4 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
Let's move the unplug logic into the applicable hotplug handler for pc and
spapr.
We'll move the plug logic next, then this will look more symmetrical in
the hotplug handlers.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/i386/pc.c | 17 ++++++++++++++++-
hw/mem/memory-device.c | 14 ++++++++++++--
hw/mem/pc-dimm.c | 2 --
hw/mem/trace-events | 2 ++
hw/ppc/spapr.c | 16 +++++++++++++++-
include/hw/mem/memory-device.h | 2 +-
6 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 61f1537e14..426fb534c2 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -2044,6 +2044,12 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
} else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev, &local_err);
}
+
+ if (local_err) {
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ memory_device_unplug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev));
+ }
+ }
error_propagate(errp, local_err);
}
@@ -2080,7 +2086,16 @@ static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
error_setg(&local_err, "acpi: device unplug for not supported device"
" type: %s", object_get_typename(OBJECT(dev)));
}
- error_propagate(errp, local_err);
+
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ /* first stage hotplug handler */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ memory_device_unplug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev));
+ }
}
static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index d22c91993f..8f10d613ea 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -17,6 +17,7 @@
#include "qemu/range.h"
#include "hw/virtio/vhost.h"
#include "sysemu/kvm.h"
+#include "trace.h"
static gint memory_device_addr_sort(gconstpointer a, gconstpointer b)
{
@@ -246,12 +247,21 @@ void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
addr - ms->device_memory->base, mr);
}
-void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr)
+void memory_device_unplug(MachineState *ms, MemoryDeviceState *md)
{
- /* we expect a previous call to memory_device_get_free_addr() */
+ const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
+ MemoryRegion *mr = mdc->get_memory_region(md);
+
+ /* we expect a previous call to memory_device_pre_plug */
g_assert(ms->device_memory);
+ if (!memory_region_is_mapped(mr)) {
+ return;
+ }
+
memory_region_del_subregion(&ms->device_memory->mr, mr);
+ trace_memory_device_unassign_address(mdc->get_addr(md));
+ mdc->set_addr(md, 0);
}
static const TypeInfo memory_device_info = {
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 5e2e3263ab..d487bb513b 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -94,9 +94,7 @@ void pc_dimm_memory_unplug(DeviceState *dev, MachineState *machine)
PCDIMMDevice *dimm = PC_DIMM(dev);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm);
- MemoryRegion *mr = ddc->get_memory_region(dimm, &error_abort);
- memory_device_unplug_region(machine, mr);
vmstate_unregister_ram(vmstate_mr, dev);
}
diff --git a/hw/mem/trace-events b/hw/mem/trace-events
index e150dcc497..a661ee49a3 100644
--- a/hw/mem/trace-events
+++ b/hw/mem/trace-events
@@ -3,3 +3,5 @@
# hw/mem/pc-dimm.c
mhp_pc_dimm_assigned_slot(int slot) "%d"
mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64
+# hw/mem/memory-device.c
+memory_device_unassign_address(uint64_t addr) "0x%"PRIx64
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 562712def2..abdd38a6b5 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3621,6 +3621,11 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev,
hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev, &local_err);
}
out:
+ if (local_err) {
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ memory_device_unplug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev));
+ }
+ }
error_propagate(errp, local_err);
}
@@ -3638,7 +3643,16 @@ static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev,
hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev,
&local_err);
}
- error_propagate(errp, local_err);
+
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ /* first stage hotplug handler */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ memory_device_unplug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev));
+ }
}
static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_dev,
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index 3a4e9edc92..b8365959e7 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -58,6 +58,6 @@ uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
Error **errp);
void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
uint64_t addr);
-void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr);
+void memory_device_unplug(MachineState *ms, MemoryDeviceState *md);
#endif
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 14/18] memory-device: factor out plug into hotplug handler
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (12 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 13/18] memory-device: factor out unplug " David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 15/18] s390x/sclp: make sure ram_size and maxram_size stay in sync David Hildenbrand
` (3 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
Let's move the plug logic into the applicable hotplug handler for pc and
spapr.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/i386/pc.c | 35 ++++++++++++++++++++---------------
hw/mem/memory-device.c | 40 ++++++++++++++++++++++++++++++++++------
hw/mem/pc-dimm.c | 29 +----------------------------
hw/mem/trace-events | 2 +-
hw/ppc/spapr.c | 15 ++++++++++++---
include/hw/mem/memory-device.h | 7 ++-----
include/hw/mem/pc-dimm.h | 3 +--
7 files changed, 71 insertions(+), 60 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 426fb534c2..f022eb042e 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1682,22 +1682,8 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev,
HotplugHandlerClass *hhc;
Error *local_err = NULL;
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
- PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
- PCDIMMDevice *dimm = PC_DIMM(dev);
- PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
- MemoryRegion *mr;
- uint64_t align = TARGET_PAGE_SIZE;
bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
- mr = ddc->get_memory_region(dimm, &local_err);
- if (local_err) {
- goto out;
- }
-
- if (memory_region_get_alignment(mr) && pcmc->enforce_aligned_dimm) {
- align = memory_region_get_alignment(mr);
- }
-
/*
* When -no-acpi is used with Q35 machine type, no ACPI is built,
* but pcms->acpi_dev is still created. Check !acpi_enabled in
@@ -1715,7 +1701,7 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev,
goto out;
}
- pc_dimm_memory_plug(dev, MACHINE(pcms), align, &local_err);
+ pc_dimm_memory_plug(dev, MACHINE(pcms), &local_err);
if (local_err) {
goto out;
}
@@ -2036,6 +2022,25 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
{
Error *local_err = NULL;
+ /* first stage hotplug handler */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ const PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(hotplug_dev);
+ uint64_t align = 0;
+
+ /* compat handling: force to TARGET_PAGE_SIZE */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) &&
+ !pcmc->enforce_aligned_dimm) {
+ align = TARGET_PAGE_SIZE;
+ }
+ memory_device_plug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev),
+ align ? &align : NULL, &local_err);
+ }
+
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
/* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
pc_dimm_plug(hotplug_dev, dev, &local_err);
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 8f10d613ea..04bdb30f22 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -69,9 +69,10 @@ static int memory_device_used_region_size(Object *obj, void *opaque)
return 0;
}
-uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
- uint64_t align, uint64_t size,
- Error **errp)
+static uint64_t memory_device_get_free_addr(MachineState *ms,
+ const uint64_t *hint,
+ uint64_t align, uint64_t size,
+ Error **errp)
{
uint64_t address_space_start, address_space_end;
uint64_t used_region_size = 0;
@@ -237,11 +238,38 @@ void memory_device_pre_plug(MachineState *ms, const MemoryDeviceState *md,
}
}
-void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
- uint64_t addr)
+void memory_device_plug(MachineState *ms, MemoryDeviceState *md,
+ uint64_t *enforced_align, Error **errp)
{
- /* we expect a previous call to memory_device_get_free_addr() */
+ const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
+ const uint64_t size = mdc->get_region_size(md);
+ MemoryRegion *mr = mdc->get_memory_region(md);
+ uint64_t addr = mdc->get_addr(md);
+ uint64_t align;
+
+ /* we expect a previous call to memory_device_pre_plug */
g_assert(ms->device_memory);
+ g_assert(mr && !memory_region_is_mapped(mr));
+
+ /* compat handling, some alignment has to be enforced for DIMMs */
+ if (enforced_align) {
+ align = *enforced_align;
+ } else {
+ align = memory_region_get_alignment(mr);
+ }
+
+ /* our device might have stronger alignment requirements */
+ if (mdc->get_align) {
+ align = MAX(align, mdc->get_align(md));
+ }
+
+ addr = memory_device_get_free_addr(ms, !addr ? NULL : &addr, align,
+ size, errp);
+ if (*errp) {
+ return;
+ }
+ trace_memory_device_assign_address(addr);
+ mdc->set_addr(md, addr);
memory_region_add_subregion(&ms->device_memory->mr,
addr - ms->device_memory->base, mr);
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index d487bb513b..8b1dcb3260 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -32,39 +32,13 @@ typedef struct pc_dimms_capacity {
Error **errp;
} pc_dimms_capacity;
-void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine,
- uint64_t align, Error **errp)
+void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine, Error **errp)
{
int slot;
PCDIMMDevice *dimm = PC_DIMM(dev);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm);
Error *local_err = NULL;
- MemoryRegion *mr;
- uint64_t addr;
-
- mr = ddc->get_memory_region(dimm, &local_err);
- if (local_err) {
- goto out;
- }
-
- addr = object_property_get_uint(OBJECT(dimm),
- PC_DIMM_ADDR_PROP, &local_err);
- if (local_err) {
- goto out;
- }
-
- addr = memory_device_get_free_addr(machine, !addr ? NULL : &addr, align,
- memory_region_size(mr), &local_err);
- if (local_err) {
- goto out;
- }
-
- object_property_set_uint(OBJECT(dev), addr, PC_DIMM_ADDR_PROP, &local_err);
- if (local_err) {
- goto out;
- }
- trace_mhp_pc_dimm_assigned_address(addr);
slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, &local_err);
if (local_err) {
@@ -82,7 +56,6 @@ void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine,
}
trace_mhp_pc_dimm_assigned_slot(slot);
- memory_device_plug_region(machine, mr, addr);
vmstate_register_ram(vmstate_mr, dev);
out:
diff --git a/hw/mem/trace-events b/hw/mem/trace-events
index a661ee49a3..930b6aa6ea 100644
--- a/hw/mem/trace-events
+++ b/hw/mem/trace-events
@@ -2,6 +2,6 @@
# hw/mem/pc-dimm.c
mhp_pc_dimm_assigned_slot(int slot) "%d"
-mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64
# hw/mem/memory-device.c
+memory_device_assign_address(uint64_t addr) "0x%"PRIx64
memory_device_unassign_address(uint64_t addr) "0x%"PRIx64
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index abdd38a6b5..5a4dbbf31e 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3144,16 +3144,15 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
PCDIMMDevice *dimm = PC_DIMM(dev);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
MemoryRegion *mr;
- uint64_t align, size, addr;
+ uint64_t size, addr;
mr = ddc->get_memory_region(dimm, &local_err);
if (local_err) {
goto out;
}
- align = memory_region_get_alignment(mr);
size = memory_region_size(mr);
- pc_dimm_memory_plug(dev, MACHINE(ms), align, &local_err);
+ pc_dimm_memory_plug(dev, MACHINE(ms), &local_err);
if (local_err) {
goto out;
}
@@ -3595,6 +3594,16 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev,
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(ms);
Error *local_err = NULL;
+ /* first stage hotplug handler */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ memory_device_plug(ms, MEMORY_DEVICE(dev), NULL, &local_err);
+ }
+
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
/* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
int node;
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index b8365959e7..a7408597fd 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -53,11 +53,8 @@ MemoryDeviceInfoList *qmp_memory_device_list(void);
uint64_t get_plugged_memory_size(void);
void memory_device_pre_plug(MachineState *ms, const MemoryDeviceState *md,
Error **errp);
-uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
- uint64_t align, uint64_t size,
- Error **errp);
-void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
- uint64_t addr);
+void memory_device_plug(MachineState *ms, MemoryDeviceState *md,
+ uint64_t *enforced_align, Error **errp);
void memory_device_unplug(MachineState *ms, MemoryDeviceState *md);
#endif
diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
index 627c8601d9..006c80fb2e 100644
--- a/include/hw/mem/pc-dimm.h
+++ b/include/hw/mem/pc-dimm.h
@@ -78,7 +78,6 @@ typedef struct PCDIMMDeviceClass {
int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp);
-void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine,
- uint64_t align, Error **errp);
+void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine, Error **errp);
void pc_dimm_memory_unplug(DeviceState *dev, MachineState *machine);
#endif
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 15/18] s390x/sclp: make sure ram_size and maxram_size stay in sync
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (13 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 14/18] memory-device: factor out plug " David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 16/18] s390x: prepare for multi stage hotplug handlers David Hildenbrand
` (2 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
On s390x, we sometimes have to shrink ram_size in order to be able to
correctly indicate the size to the guest.
In case maxmem is not set, ram_size and maxram_size should always be
kept equal. Make sure to also fixup maxram_size if necessary.
In case maxmem is set, we really want to bail out in case we have to
round down, as it basically can screw up the size of the device memory
area later on.
Pleas note that this fixup ususally does not happen with sane values
for the ram size.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/s390x/sclp.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 047d577313..0757914374 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -21,6 +21,8 @@
#include "hw/s390x/event-facility.h"
#include "hw/s390x/s390-pci-bus.h"
#include "hw/s390x/ipl.h"
+#include "qemu/error-report.h"
+
static inline SCLPDevice *get_sclp_device(void)
{
@@ -318,9 +320,19 @@ static void sclp_memory_init(SCLPDevice *sclp)
* down to align with the nearest increment boundary. */
initial_mem = initial_mem >> increment_size << increment_size;
- machine->ram_size = initial_mem;
- /* let's propagate the changed ram size into the global variable. */
- ram_size = initial_mem;
+ /* also shrink maxram_size in case we don't have maxmem configured */
+ if (initial_mem != machine->ram_size) {
+ if (machine->ram_size < machine->maxram_size) {
+ error_report("Ram size ('" RAM_ADDR_FMT "') had to be rounded "
+ "down to ('" RAM_ADDR_FMT "'), maxmem not supported",
+ machine->ram_size, initial_mem);
+ exit(1);
+ }
+ /* propagate the changed ram size into the different places */
+ machine->ram_size = initial_mem;
+ ram_size = initial_mem;
+ machine->maxram_size = initial_mem;
+ }
}
static void sclp_init(Object *obj)
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 16/18] s390x: prepare for multi stage hotplug handlers
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (14 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 15/18] s390x/sclp: make sure ram_size and maxram_size stay in sync David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 17/18] s390x: initialize memory region for memory devices David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 18/18] s390x: support " David Hildenbrand
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
For multi stage hotplug handlers, we'll have to do some error handling
in some hotplug functions, so let's use a local error variable (except
for unplug requests).
Also, add code to pass control to the final stage hotplug handler at the
parent bus.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 41 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 39 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 5796e24bd8..af9bf97933 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -394,21 +394,56 @@ static void s390_machine_reset(void)
s390_cpu_set_state(S390_CPU_STATE_OPERATING, ipl_cpu);
}
+static void s390_machine_device_pre_plug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ Error *local_err = NULL;
+
+ /* final stage hotplug handler */
+ if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_pre_plug(dev->parent_bus->hotplug_handler, dev,
+ &local_err);
+ }
+ error_propagate(errp, local_err);
+}
+
static void s390_machine_device_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
+ Error *local_err = NULL;
+
+ /* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
- s390_cpu_plug(hotplug_dev, dev, errp);
+ s390_cpu_plug(hotplug_dev, dev, &local_err);
+ } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev, &local_err);
}
+ error_propagate(errp, local_err);
}
static void s390_machine_device_unplug_request(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
+ /* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
error_setg(errp, "CPU hot unplug not supported on this machine");
- return;
+ } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_unplug_request(dev->parent_bus->hotplug_handler, dev,
+ errp);
+ }
+}
+
+static void s390_machine_device_unplug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ Error *local_err = NULL;
+
+ /* final stage hotplug handler */
+ if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
+ hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev,
+ &local_err);
}
+ error_propagate(errp, local_err);
}
static CpuInstanceProperties s390_cpu_index_to_props(MachineState *ms,
@@ -497,8 +532,10 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)
mc->possible_cpu_arch_ids = s390_possible_cpu_arch_ids;
/* it is overridden with 'host' cpu *in kvm_arch_init* */
mc->default_cpu_type = S390_CPU_TYPE_NAME("qemu");
+ hc->pre_plug = s390_machine_device_pre_plug;
hc->plug = s390_machine_device_plug;
hc->unplug_request = s390_machine_device_unplug_request;
+ hc->unplug = s390_machine_device_unplug;
nc->nmi_monitor_handler = s390_nmi;
}
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 17/18] s390x: initialize memory region for memory devices
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (15 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 16/18] s390x: prepare for multi stage hotplug handlers David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 18/18] s390x: support " David Hildenbrand
17 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
While s390x has no real interface for communicating devices mapped into
the physical address space of the guest, paravirtualized devices can
easily expose the applicable address range themselves.
So let's use the difference between maxram_size and ram_size as the size
for our hotplug memory area (just as on other architectures).
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index af9bf97933..7700658400 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -157,9 +157,11 @@ static void virtio_ccw_register_hcalls(void)
#define KVM_MEM_MAX_NR_PAGES ((1ULL << 31) - 1)
#define SEG_MSK (~0xfffffULL)
#define KVM_SLOT_MAX_BYTES ((KVM_MEM_MAX_NR_PAGES * TARGET_PAGE_SIZE) & SEG_MSK)
-static void s390_memory_init(ram_addr_t mem_size)
+static void s390_memory_init(MachineState *machine)
{
+ S390CcwMachineState *ms = S390_CCW_MACHINE(machine);
MemoryRegion *sysmem = get_system_memory();
+ ram_addr_t mem_size = machine->ram_size;
ram_addr_t chunk, offset = 0;
unsigned int number = 0;
gchar *name;
@@ -181,6 +183,28 @@ static void s390_memory_init(ram_addr_t mem_size)
}
g_free(name);
+ /* always allocate the device memory information */
+ machine->device_memory = g_malloc0(sizeof(*machine->device_memory));
+
+ /* initialize device memory address space */
+ if (machine->ram_size < machine->maxram_size) {
+ ram_addr_t device_mem_size = machine->maxram_size - machine->ram_size;
+
+ if (QEMU_ALIGN_UP(machine->maxram_size, TARGET_PAGE_SIZE) !=
+ machine->maxram_size) {
+ error_report("maximum memory size must be aligned to multiple of "
+ "%d bytes", TARGET_PAGE_SIZE);
+ exit(EXIT_FAILURE);
+ }
+
+ machine->device_memory->base = machine->ram_size;
+ memory_region_init(&machine->device_memory->mr, OBJECT(ms),
+ "device-memory", device_mem_size);
+ memory_region_add_subregion(sysmem, machine->device_memory->base,
+ &machine->device_memory->mr);
+
+ }
+
/* Initialize storage key device */
s390_skeys_init();
/* Initialize storage attributes device */
@@ -304,7 +328,7 @@ static void ccw_init(MachineState *machine)
DeviceState *dev;
s390_sclp_init();
- s390_memory_init(machine->ram_size);
+ s390_memory_init(machine);
/* init CPUs (incl. CPU model) early so s390_has_feature() works */
s390_init_cpus(machine);
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Qemu-devel] [PATCH v3 18/18] s390x: support memory devices
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
` (16 preceding siblings ...)
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 17/18] s390x: initialize memory region for memory devices David Hildenbrand
@ 2018-05-14 10:00 ` David Hildenbrand
2018-05-14 10:38 ` David Hildenbrand
17 siblings, 1 reply; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:00 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino,
David Hildenbrand
Let's route all memory devices we can hotplug through the machine hotplug
handler, just like on pc and spapr.
As CONFIG_DIMM is not enabled, we won't ever try to plug DIMMs.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
default-configs/s390x-softmmu.mak | 1 +
hw/s390x/s390-virtio-ccw.c | 31 ++++++++++++++++++++++++++++++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index 2f4bfe73b4..c0628c0123 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -9,3 +9,4 @@ CONFIG_S390_FLIC=y
CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)
CONFIG_VFIO_CCW=$(CONFIG_LINUX)
CONFIG_WDT_DIAG288=y
+CONFIG_MEM_DEVICE=y
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 7700658400..54c620baf2 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -35,6 +35,7 @@
#include "migration/register.h"
#include "cpu_models.h"
#include "hw/nmi.h"
+#include "hw/mem/memory-device.h"
S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
{
@@ -436,12 +437,29 @@ static void s390_machine_device_plug(HotplugHandler *hotplug_dev,
{
Error *local_err = NULL;
+ /* first stage hotplug handler */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ memory_device_plug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev), NULL,
+ &local_err);
+ }
+
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
/* final stage hotplug handler */
if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
s390_cpu_plug(hotplug_dev, dev, &local_err);
} else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev, &local_err);
}
+
+ if (local_err) {
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ memory_device_unplug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev));
+ }
+ }
error_propagate(errp, local_err);
}
@@ -468,6 +486,16 @@ static void s390_machine_device_unplug(HotplugHandler *hotplug_dev,
&local_err);
}
error_propagate(errp, local_err);
+
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ /* first stage hotplug handler */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
+ memory_device_unplug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev));
+ }
}
static CpuInstanceProperties s390_cpu_index_to_props(MachineState *ms,
@@ -506,7 +534,8 @@ static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms)
static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,
DeviceState *dev)
{
- if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) ||
+ object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
return HOTPLUG_HANDLER(machine);
}
return NULL;
--
2.14.3
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [Qemu-devel] [PATCH v3 18/18] s390x: support memory devices
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 18/18] s390x: support " David Hildenbrand
@ 2018-05-14 10:38 ` David Hildenbrand
0 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-14 10:38 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Michael S . Tsirkin, Igor Mammedov, Marcel Apfelbaum,
Paolo Bonzini, Richard Henderson, Eduardo Habkost, David Gibson,
Markus Armbruster, qemu-ppc, Pankaj Gupta, Alexander Graf,
Cornelia Huck, Christian Borntraeger, Luiz Capitulino
On 14.05.2018 12:00, David Hildenbrand wrote:
> Let's route all memory devices we can hotplug through the machine hotplug
> handler, just like on pc and spapr.
>
> As CONFIG_DIMM is not enabled, we won't ever try to plug DIMMs.
>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
> default-configs/s390x-softmmu.mak | 1 +
> hw/s390x/s390-virtio-ccw.c | 31 ++++++++++++++++++++++++++++++-
> 2 files changed, 31 insertions(+), 1 deletion(-)
>
> diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
> index 2f4bfe73b4..c0628c0123 100644
> --- a/default-configs/s390x-softmmu.mak
> +++ b/default-configs/s390x-softmmu.mak
> @@ -9,3 +9,4 @@ CONFIG_S390_FLIC=y
> CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)
> CONFIG_VFIO_CCW=$(CONFIG_LINUX)
> CONFIG_WDT_DIAG288=y
> +CONFIG_MEM_DEVICE=y
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 7700658400..54c620baf2 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -35,6 +35,7 @@
> #include "migration/register.h"
> #include "cpu_models.h"
> #include "hw/nmi.h"
> +#include "hw/mem/memory-device.h"
>
> S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
> {
> @@ -436,12 +437,29 @@ static void s390_machine_device_plug(HotplugHandler *hotplug_dev,
> {
> Error *local_err = NULL;
>
> + /* first stage hotplug handler */
> + if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
> + memory_device_plug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev), NULL,
> + &local_err);
> + }
> +
> + if (local_err) {
> + error_propagate(errp, local_err);
> + return;
> + }
> +
> /* final stage hotplug handler */
> if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
> s390_cpu_plug(hotplug_dev, dev, &local_err);
> } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
> hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev, &local_err);
> }
> +
> + if (local_err) {
> + if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
> + memory_device_unplug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev));
> + }
> + }
> error_propagate(errp, local_err);
> }
>
> @@ -468,6 +486,16 @@ static void s390_machine_device_unplug(HotplugHandler *hotplug_dev,
> &local_err);
> }
> error_propagate(errp, local_err);
> +
> + if (local_err) {
> + error_propagate(errp, local_err);
> + return;
> + }
> +
> + /* first stage hotplug handler */
> + if (object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
> + memory_device_unplug(MACHINE(hotplug_dev), MEMORY_DEVICE(dev));
> + }
> }
>
> static CpuInstanceProperties s390_cpu_index_to_props(MachineState *ms,
> @@ -506,7 +534,8 @@ static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms)
> static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,
> DeviceState *dev)
> {
> - if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
> + if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) ||
> + object_dynamic_cast(OBJECT(dev), TYPE_MEMORY_DEVICE)) {
> return HOTPLUG_HANDLER(machine);
> }
> return NULL;
>
Just noticed that this patch misses the pre plug handler here. I will
wait for some feedback before I resend (and the !s390x patches can be
picked up independently).
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH v3 03/18] qdev: let machine hotplug handler to override bus hotplug handler
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 03/18] qdev: let machine hotplug handler to override bus hotplug handler David Hildenbrand
@ 2018-05-15 0:00 ` Murilo Opsfelder Araujo
2018-05-15 8:07 ` David Hildenbrand
0 siblings, 1 reply; 25+ messages in thread
From: Murilo Opsfelder Araujo @ 2018-05-15 0:00 UTC (permalink / raw)
To: David Hildenbrand
Cc: qemu-devel, Pankaj Gupta, Eduardo Habkost, Michael S . Tsirkin,
Cornelia Huck, Markus Armbruster, Christian Borntraeger,
qemu-s390x, qemu-ppc, Paolo Bonzini, Marcel Apfelbaum,
Igor Mammedov, Luiz Capitulino, David Gibson, Richard Henderson
On Mon, May 14, 2018 at 12:00:08PM +0200, David Hildenbrand wrote:
> From: Igor Mammedov <imammedo@redhat.com>
>
> it will allow to return another hotplug handler than the default
> one for a specific bus based device type. Which is needed to handle
> non trivial plug/unplug sequences that need the access to resources
> configured outside of bus where device is attached.
>
> That will allow for returned hotplug handler to orchestrate wiring
> in arbitrary order, by chaining other hotplug handlers when
> it's needed.
>
> PS:
> It could be used for hybrid virtio-mem and virtio-pmem devices
> where it will return machine as hotplug handler which will do
> necessary wiring at machine level and then pass control down
> the chain to bus specific hotplug handler.
>
> Example of top level hotplug handler override and custom plug sequence:
>
> some_machine_get_hotplug_handler(machine){
> if (object_dynamic_cast(OBJECT(dev), TYPE_SOME_BUS_DEVICE)) {
> return HOTPLUG_HANDLER(machine);
> }
> return NULL;
> }
>
> some_machine_device_plug(hotplug_dev, dev) {
> if (object_dynamic_cast(OBJECT(dev), TYPE_SOME_BUS_DEVICE)) {
> /* do machine specific initialization */
> some_machine_init_special_device(dev)
>
> /* pass control to bus specific handler */
> hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev)
> }
> }
Hi, David.
I might be misreading, but isn't it more like the following?
some_machine_device_plug(hotplug_dev, dev) {
if (object_dynamic_cast(OBJECT(dev), TYPE_SOME_BUS_DEVICE)) {
/* do machine specific initialization */
some_machine_init_special_device(dev)
} else {
/* pass control to bus specific handler */
hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev)
}
}
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
> hw/core/qdev.c | 6 ++----
> include/hw/qdev-core.h | 11 +++++++++++
> 2 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index f6f92473b8..885286f579 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -261,12 +261,10 @@ HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev)
>
> HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev)
> {
> - HotplugHandler *hotplug_ctrl;
> + HotplugHandler *hotplug_ctrl = qdev_get_machine_hotplug_handler(dev);
>
> - if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
> + if (hotplug_ctrl == NULL && dev->parent_bus) {
> hotplug_ctrl = dev->parent_bus->hotplug_handler;
> - } else {
> - hotplug_ctrl = qdev_get_machine_hotplug_handler(dev);
> }
> return hotplug_ctrl;
> }
> diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
> index 9453588160..e6a8eca558 100644
> --- a/include/hw/qdev-core.h
> +++ b/include/hw/qdev-core.h
> @@ -286,6 +286,17 @@ void qdev_init_nofail(DeviceState *dev);
> void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
> int required_for_version);
> HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev);
> +/**
> + * qdev_get_hotplug_handler: Get handler responsible for device wiring
> + *
> + * Find HOTPLUG_HANDLER for @dev that provides [pre|un]plug callbacks for it.
> + *
> + * Note: in case @dev has a parent bus, it will be returned as handler unless
> + * machine handler overrides it.
> + *
> + * Returns: pointer to object that implements TYPE_HOTPLUG_HANDLER interface
> + * or NULL if there aren't any.
> + */
> HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev);
> void qdev_unplug(DeviceState *dev, Error **errp);
> void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev,
> --
> 2.14.3
>
>
--
Murilo
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH v3 02/18] memory-device: introduce separate config option
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 02/18] memory-device: introduce separate config option David Hildenbrand
@ 2018-05-15 0:20 ` Murilo Opsfelder Araujo
2018-05-15 15:21 ` Eric Blake
0 siblings, 1 reply; 25+ messages in thread
From: Murilo Opsfelder Araujo @ 2018-05-15 0:20 UTC (permalink / raw)
To: David Hildenbrand
Cc: qemu-devel, Pankaj Gupta, Eduardo Habkost, Michael S . Tsirkin,
Cornelia Huck, Markus Armbruster, Christian Borntraeger,
qemu-s390x, qemu-ppc, Paolo Bonzini, Marcel Apfelbaum,
Igor Mammedov, Luiz Capitulino, David Gibson, Richard Henderson
On Mon, May 14, 2018 at 12:00:07PM +0200, David Hildenbrand wrote:
> Some architectures might support memory devices, while they don't
> support DIMM/NVDIMM. So let's
> - Rename CONFIG_MEM_HOTPLUG to CONFIG_MEM_DEVICE
> - Intriduce CONFIG_DIMM and use it similarly to CONFIG NVDIMM
Since you're resending it:
s/Intriduce/Introduce
>
> CONFIG_DIMM and CONFIG_NVDIMM require CONFIG_MEM_DEVICE.
>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
> default-configs/i386-softmmu.mak | 3 ++-
> default-configs/ppc64-softmmu.mak | 3 ++-
> default-configs/x86_64-softmmu.mak | 3 ++-
> hw/Makefile.objs | 2 +-
> hw/mem/Makefile.objs | 4 ++--
> qapi/misc.json | 2 +-
> 6 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
> index 8c7d4a0fa0..4c1637338b 100644
> --- a/default-configs/i386-softmmu.mak
> +++ b/default-configs/i386-softmmu.mak
> @@ -50,7 +50,8 @@ CONFIG_PCI_Q35=y
> CONFIG_APIC=y
> CONFIG_IOAPIC=y
> CONFIG_PVPANIC=y
> -CONFIG_MEM_HOTPLUG=y
> +CONFIG_MEM_DEVICE=y
> +CONFIG_DIMM=y
> CONFIG_NVDIMM=y
> CONFIG_ACPI_NVDIMM=y
> CONFIG_PCIE_PORT=y
> diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
> index b94af6c7c6..f550573782 100644
> --- a/default-configs/ppc64-softmmu.mak
> +++ b/default-configs/ppc64-softmmu.mak
> @@ -16,4 +16,5 @@ CONFIG_VIRTIO_VGA=y
> CONFIG_XICS=$(CONFIG_PSERIES)
> CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)
> CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM))
> -CONFIG_MEM_HOTPLUG=y
> +CONFIG_MEM_DEVICE=y
> +CONFIG_DIMM=y
> diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
> index 0390b4303c..7785351414 100644
> --- a/default-configs/x86_64-softmmu.mak
> +++ b/default-configs/x86_64-softmmu.mak
> @@ -50,7 +50,8 @@ CONFIG_PCI_Q35=y
> CONFIG_APIC=y
> CONFIG_IOAPIC=y
> CONFIG_PVPANIC=y
> -CONFIG_MEM_HOTPLUG=y
> +CONFIG_MEM_DEVICE=y
> +CONFIG_DIMM=y
> CONFIG_NVDIMM=y
> CONFIG_ACPI_NVDIMM=y
> CONFIG_PCIE_PORT=y
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index 6a0ffe0afd..127a60eca4 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -33,7 +33,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += vfio/
> devices-dirs-$(CONFIG_SOFTMMU) += virtio/
> devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
> devices-dirs-$(CONFIG_SOFTMMU) += xen/
> -devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/
> +devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
> devices-dirs-$(CONFIG_SOFTMMU) += smbios/
> devices-dirs-y += core/
> common-obj-y += $(devices-dirs-y)
> diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs
> index 10be4df2a2..3e2f7c5ca2 100644
> --- a/hw/mem/Makefile.objs
> +++ b/hw/mem/Makefile.objs
> @@ -1,3 +1,3 @@
> -common-obj-$(CONFIG_MEM_HOTPLUG) += pc-dimm.o
> -common-obj-$(CONFIG_MEM_HOTPLUG) += memory-device.o
> +common-obj-$(CONFIG_DIMM) += pc-dimm.o
> +common-obj-$(CONFIG_MEM_DEVICE) += memory-device.o
> common-obj-$(CONFIG_NVDIMM) += nvdimm.o
> diff --git a/qapi/misc.json b/qapi/misc.json
> index f5988cc0b5..65eae0c8a0 100644
> --- a/qapi/misc.json
> +++ b/qapi/misc.json
> @@ -2060,7 +2060,7 @@
> #
> # @plugged-memory: size of memory that can be hot-unplugged. This field
> # is omitted if target doesn't support memory hotplug
> -# (i.e. CONFIG_MEM_HOTPLUG not defined on build time).
> +# (i.e. CONFIG_MEM_DEVICE not defined on build time).
> #
> # Since: 2.11.0
> ##
> --
> 2.14.3
>
>
--
Murilo
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH v3 03/18] qdev: let machine hotplug handler to override bus hotplug handler
2018-05-15 0:00 ` [Qemu-devel] [Qemu-ppc] " Murilo Opsfelder Araujo
@ 2018-05-15 8:07 ` David Hildenbrand
0 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-15 8:07 UTC (permalink / raw)
To: Murilo Opsfelder Araujo
Cc: qemu-devel, Pankaj Gupta, Eduardo Habkost, Michael S . Tsirkin,
Cornelia Huck, Markus Armbruster, Christian Borntraeger,
qemu-s390x, qemu-ppc, Paolo Bonzini, Marcel Apfelbaum,
Igor Mammedov, Luiz Capitulino, David Gibson, Richard Henderson
On 15.05.2018 02:00, Murilo Opsfelder Araujo wrote:
> On Mon, May 14, 2018 at 12:00:08PM +0200, David Hildenbrand wrote:
>> From: Igor Mammedov <imammedo@redhat.com>
>>
>> it will allow to return another hotplug handler than the default
>> one for a specific bus based device type. Which is needed to handle
>> non trivial plug/unplug sequences that need the access to resources
>> configured outside of bus where device is attached.
>>
>> That will allow for returned hotplug handler to orchestrate wiring
>> in arbitrary order, by chaining other hotplug handlers when
>> it's needed.
>>
>> PS:
>> It could be used for hybrid virtio-mem and virtio-pmem devices
>> where it will return machine as hotplug handler which will do
>> necessary wiring at machine level and then pass control down
>> the chain to bus specific hotplug handler.
>>
>> Example of top level hotplug handler override and custom plug sequence:
>>
>> some_machine_get_hotplug_handler(machine){
>> if (object_dynamic_cast(OBJECT(dev), TYPE_SOME_BUS_DEVICE)) {
>> return HOTPLUG_HANDLER(machine);
>> }
>> return NULL;
>> }
>>
>> some_machine_device_plug(hotplug_dev, dev) {
>> if (object_dynamic_cast(OBJECT(dev), TYPE_SOME_BUS_DEVICE)) {
>> /* do machine specific initialization */
>> some_machine_init_special_device(dev)
>>
>> /* pass control to bus specific handler */
>> hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev)
>> }
>> }
>
> Hi, David.
>
> I might be misreading, but isn't it more like the following?
>
> some_machine_device_plug(hotplug_dev, dev) {
> if (object_dynamic_cast(OBJECT(dev), TYPE_SOME_BUS_DEVICE)) {
> /* do machine specific initialization */
> some_machine_init_special_device(dev)
> } else {
> /* pass control to bus specific handler */
> hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev)
> }
> }
There are various ways how to implement it ,this example if from Igor
and most probably not complete (only showcases how things are passed on
to the next handler).
I decided to implement it slightly different, to make it more flexible.
Best you have a look at the following patches in this series.
Thanks!
>
>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>> Signed-off-by: David Hildenbrand <david@redhat.com>
>> ---
>> hw/core/qdev.c | 6 ++----
>> include/hw/qdev-core.h | 11 +++++++++++
>> 2 files changed, 13 insertions(+), 4 deletions(-)
>>
>> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
>> index f6f92473b8..885286f579 100644
>> --- a/hw/core/qdev.c
>> +++ b/hw/core/qdev.c
>> @@ -261,12 +261,10 @@ HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev)
>>
>> HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev)
>> {
>> - HotplugHandler *hotplug_ctrl;
>> + HotplugHandler *hotplug_ctrl = qdev_get_machine_hotplug_handler(dev);
>>
>> - if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
>> + if (hotplug_ctrl == NULL && dev->parent_bus) {
>> hotplug_ctrl = dev->parent_bus->hotplug_handler;
>> - } else {
>> - hotplug_ctrl = qdev_get_machine_hotplug_handler(dev);
>> }
>> return hotplug_ctrl;
>> }
>> diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
>> index 9453588160..e6a8eca558 100644
>> --- a/include/hw/qdev-core.h
>> +++ b/include/hw/qdev-core.h
>> @@ -286,6 +286,17 @@ void qdev_init_nofail(DeviceState *dev);
>> void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
>> int required_for_version);
>> HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev);
>> +/**
>> + * qdev_get_hotplug_handler: Get handler responsible for device wiring
>> + *
>> + * Find HOTPLUG_HANDLER for @dev that provides [pre|un]plug callbacks for it.
>> + *
>> + * Note: in case @dev has a parent bus, it will be returned as handler unless
>> + * machine handler overrides it.
>> + *
>> + * Returns: pointer to object that implements TYPE_HOTPLUG_HANDLER interface
>> + * or NULL if there aren't any.
>> + */
>> HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev);
>> void qdev_unplug(DeviceState *dev, Error **errp);
>> void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev,
>> --
>> 2.14.3
>>
>>
>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH v3 02/18] memory-device: introduce separate config option
2018-05-15 0:20 ` [Qemu-devel] [Qemu-ppc] " Murilo Opsfelder Araujo
@ 2018-05-15 15:21 ` Eric Blake
2018-05-16 9:31 ` David Hildenbrand
0 siblings, 1 reply; 25+ messages in thread
From: Eric Blake @ 2018-05-15 15:21 UTC (permalink / raw)
To: Murilo Opsfelder Araujo, David Hildenbrand
Cc: Pankaj Gupta, Eduardo Habkost, Michael S . Tsirkin,
Richard Henderson, Cornelia Huck, qemu-devel, Markus Armbruster,
Christian Borntraeger, qemu-s390x, qemu-ppc, Igor Mammedov,
Marcel Apfelbaum, Paolo Bonzini, Luiz Capitulino, David Gibson
On 05/14/2018 07:20 PM, Murilo Opsfelder Araujo wrote:
> On Mon, May 14, 2018 at 12:00:07PM +0200, David Hildenbrand wrote:
>> Some architectures might support memory devices, while they don't
>> support DIMM/NVDIMM. So let's
>> - Rename CONFIG_MEM_HOTPLUG to CONFIG_MEM_DEVICE
>> - Intriduce CONFIG_DIMM and use it similarly to CONFIG NVDIMM
>
> Since you're resending it:
>
> s/Intriduce/Introduce
>
>> +++ b/qapi/misc.json
>> @@ -2060,7 +2060,7 @@
>> #
>> # @plugged-memory: size of memory that can be hot-unplugged. This field
>> # is omitted if target doesn't support memory hotplug
>> -# (i.e. CONFIG_MEM_HOTPLUG not defined on build time).
>> +# (i.e. CONFIG_MEM_DEVICE not defined on build time).
>> #
Also, it sounds better with: s/on/at/
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH v3 02/18] memory-device: introduce separate config option
2018-05-15 15:21 ` Eric Blake
@ 2018-05-16 9:31 ` David Hildenbrand
0 siblings, 0 replies; 25+ messages in thread
From: David Hildenbrand @ 2018-05-16 9:31 UTC (permalink / raw)
To: Eric Blake, Murilo Opsfelder Araujo
Cc: Pankaj Gupta, Eduardo Habkost, Michael S . Tsirkin,
Richard Henderson, Cornelia Huck, qemu-devel, Markus Armbruster,
Christian Borntraeger, qemu-s390x, qemu-ppc, Igor Mammedov,
Marcel Apfelbaum, Paolo Bonzini, Luiz Capitulino, David Gibson
On 15.05.2018 17:21, Eric Blake wrote:
> On 05/14/2018 07:20 PM, Murilo Opsfelder Araujo wrote:
>> On Mon, May 14, 2018 at 12:00:07PM +0200, David Hildenbrand wrote:
>>> Some architectures might support memory devices, while they don't
>>> support DIMM/NVDIMM. So let's
>>> - Rename CONFIG_MEM_HOTPLUG to CONFIG_MEM_DEVICE
>>> - Intriduce CONFIG_DIMM and use it similarly to CONFIG NVDIMM
>>
>> Since you're resending it:
>>
>> s/Intriduce/Introduce
>>
>
>>> +++ b/qapi/misc.json
>>> @@ -2060,7 +2060,7 @@
>>> #
>>> # @plugged-memory: size of memory that can be hot-unplugged. This field
>>> # is omitted if target doesn't support memory hotplug
>>> -# (i.e. CONFIG_MEM_HOTPLUG not defined on build time).
>>> +# (i.e. CONFIG_MEM_DEVICE not defined on build time).
>>> #
>
> Also, it sounds better with: s/on/at/
>
Yes, will include both, thanks!
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2018-05-16 9:31 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-14 10:00 [Qemu-devel] [PATCH v3 00/18] MemoryDevice: use multi stage hotplug handlers David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 01/18] memory-device: drop assert related to align and start of address space David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 02/18] memory-device: introduce separate config option David Hildenbrand
2018-05-15 0:20 ` [Qemu-devel] [Qemu-ppc] " Murilo Opsfelder Araujo
2018-05-15 15:21 ` Eric Blake
2018-05-16 9:31 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 03/18] qdev: let machine hotplug handler to override bus hotplug handler David Hildenbrand
2018-05-15 0:00 ` [Qemu-devel] [Qemu-ppc] " Murilo Opsfelder Araujo
2018-05-15 8:07 ` David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 04/18] pc: prepare for multi stage hotplug handlers David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 05/18] pc: route all memory devices through the machine hotplug handler David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 06/18] spapr: prepare for multi stage hotplug handlers David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 07/18] spapr: route all memory devices through the machine hotplug handler David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 08/18] spapr: handle pc-dimm unplug via hotplug handler chain David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 09/18] spapr: handle cpu core " David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 10/18] memory-device: new functions to handle plug/unplug David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 11/18] pc-dimm: implement new memory device functions David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 12/18] memory-device: factor out pre-plug into hotplug handler David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 13/18] memory-device: factor out unplug " David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 14/18] memory-device: factor out plug " David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 15/18] s390x/sclp: make sure ram_size and maxram_size stay in sync David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 16/18] s390x: prepare for multi stage hotplug handlers David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 17/18] s390x: initialize memory region for memory devices David Hildenbrand
2018-05-14 10:00 ` [Qemu-devel] [PATCH v3 18/18] s390x: support " David Hildenbrand
2018-05-14 10:38 ` David Hildenbrand
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.