If NVDIMM option is enabled at machine level, let's allow NVDIMM plug. Signed-off-by: Eric Auger <eric.au...@redhat.com> --- hw/arm/virt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index af2ccaf152..c0f982de02 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1833,13 +1833,14 @@ static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); + MachineState *ms = MACHINE(hotplug_dev); if (dev->hotplugged) { error_setg(errp, "memory hotplug is not supported"); } - if (is_nvdimm) { - error_setg(errp, "nvdimm is not yet supported"); + if (is_nvdimm && !ms->acpi_nvdimm_state.is_enabled) { + error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'"); return; } -- 2.20.1