[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v9 18/18] hw/arm/virt: Allow nvdimm instantiation
From: |
Eric Auger |
Subject: |
[Qemu-arm] [PATCH v9 18/18] hw/arm/virt: Allow nvdimm instantiation |
Date: |
Tue, 26 Feb 2019 21:44:39 +0100 |
If NVDIMM option is enabled at machine level, let's allow
NVDIMM plug.
Signed-off-by: Eric Auger <address@hidden>
---
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
- [Qemu-arm] [PATCH v9 08/18] hw/arm/virt: Implement kvm_type function for 4.0 machine, (continued)
- [Qemu-arm] [PATCH v9 08/18] hw/arm/virt: Implement kvm_type function for 4.0 machine, Eric Auger, 2019/02/26
- [Qemu-arm] [PATCH v9 09/18] hw/arm/virt: Check the VCPU PA range in TCG mode, Eric Auger, 2019/02/26
- [Qemu-arm] [PATCH v9 10/18] hw/arm/virt: Bump the 255GB initial RAM limit, Eric Auger, 2019/02/26
- [Qemu-arm] [PATCH v9 11/18] hw/arm/virt: Add memory hotplug framework, Eric Auger, 2019/02/26
- [Qemu-arm] [PATCH v9 12/18] hw/arm/boot: Expose the PC-DIMM nodes in the DT, Eric Auger, 2019/02/26
- [Qemu-arm] [PATCH v9 13/18] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT, Eric Auger, 2019/02/26
- [Qemu-arm] [PATCH v9 15/18] machine: Move acpi_nvdimm_state into struct MachineState, Eric Auger, 2019/02/26
- [Qemu-arm] [PATCH v9 14/18] nvdimm: Use configurable ACPI IO base and size, Eric Auger, 2019/02/26
- [Qemu-arm] [PATCH v9 16/18] hw/arm/virt: Add nvdimm hot-plug infrastructure, Eric Auger, 2019/02/26
- [Qemu-arm] [PATCH v9 17/18] hw/arm/boot: Expose the pmem nodes in the DT, Eric Auger, 2019/02/26
- [Qemu-arm] [PATCH v9 18/18] hw/arm/virt: Allow nvdimm instantiation,
Eric Auger <=