[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 18/18] hw/arm/virt: Add nvdimm and nvdimm-persist
From: |
Eric Auger |
Subject: |
[Qemu-devel] [PATCH v5 18/18] hw/arm/virt: Add nvdimm and nvdimm-persistence options |
Date: |
Wed, 23 Jan 2019 11:14:58 +0100 |
Machine option nvdimm allows to turn NVDIMM support on.
Signed-off-by: Eric Auger <address@hidden>
---
hw/arm/virt.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 57 insertions(+), 3 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index f21cf32936..8c6dd59c69 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1749,6 +1749,47 @@ static void virt_set_iommu(Object *obj, const char
*value, Error **errp)
}
}
+static bool virt_get_nvdimm(Object *obj, Error **errp)
+{
+ VirtMachineState *vms = VIRT_MACHINE(obj);
+
+ return vms->acpi_nvdimm_state.is_enabled;
+}
+
+static void virt_set_nvdimm(Object *obj, bool value, Error **errp)
+{
+ VirtMachineState *vms = VIRT_MACHINE(obj);
+
+ vms->acpi_nvdimm_state.is_enabled = value;
+}
+
+static char *virt_get_nvdimm_persistence(Object *obj, Error **errp)
+{
+ VirtMachineState *vms = VIRT_MACHINE(obj);
+
+ return g_strdup(vms->acpi_nvdimm_state.persistence_string);
+}
+
+static void virt_set_nvdimm_persistence(Object *obj, const char *value,
+ Error **errp)
+{
+ VirtMachineState *vms = VIRT_MACHINE(obj);
+ AcpiNVDIMMState *nvdimm_state = &vms->acpi_nvdimm_state;
+
+ if (strcmp(value, "cpu") == 0)
+ nvdimm_state->persistence = 3;
+ else if (strcmp(value, "mem-ctrl") == 0)
+ nvdimm_state->persistence = 2;
+ else {
+ error_report("-machine nvdimm-persistence=%s: unsupported option",
+ value);
+ exit(EXIT_FAILURE);
+ }
+
+ g_free(nvdimm_state->persistence_string);
+ nvdimm_state->persistence_string = g_strdup(value);
+}
+
static CpuInstanceProperties
virt_cpu_index_to_props(MachineState *ms, unsigned cpu_index)
{
@@ -1791,13 +1832,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);
+ VirtMachineState *vms = VIRT_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 && !vms->acpi_nvdimm_state.is_enabled) {
+ error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'");
return;
}
@@ -2001,7 +2043,19 @@ static void virt_instance_init(Object *obj)
"Valid values are none and smmuv3",
NULL);
- vms->high_io_base = S_256GiB; /* default RAM top */
+ object_property_add_bool(obj, "nvdimm",
+ virt_get_nvdimm, virt_set_nvdimm, NULL);
+ object_property_set_description(obj, "nvdimm",
+ "Set on/off to enable/disable NVDIMM "
+ "instantiation", NULL);
+
+ object_property_add_str(obj, "nvdimm-persistence",
+ virt_get_nvdimm_persistence,
+ virt_set_nvdimm_persistence, NULL);
+ object_property_set_description(obj, "nvdimm-persistence",
+ "Set NVDIMM persistence"
+ "Valid values are cpu and mem-ctrl", NULL);
+
vms->irqmap = a15irqmap;
}
--
2.20.1
- [Qemu-devel] [PATCH v5 08/18] vl: Set machine ram_size, maxram_size and ram_slots earlier, (continued)
- [Qemu-devel] [PATCH v5 08/18] vl: Set machine ram_size, maxram_size and ram_slots earlier, Eric Auger, 2019/01/23
- [Qemu-devel] [PATCH v5 12/18] hw/arm/boot: Expose the PC-DIMM nodes in the DT, Eric Auger, 2019/01/23
- [Qemu-devel] [PATCH v5 11/18] hw/arm/virt: Add memory hotplug framework, Eric Auger, 2019/01/23
- [Qemu-devel] [PATCH v5 10/18] hw/arm/virt: Bump the 255GB initial RAM limit, Eric Auger, 2019/01/23
- [Qemu-devel] [PATCH v5 02/18] linux-headers: Update to v5.0-rc2, Eric Auger, 2019/01/23
- [Qemu-devel] [PATCH v5 13/18] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT, Eric Auger, 2019/01/23
- [Qemu-devel] [PATCH v5 15/18] nvdimm: use configurable ACPI IO base and size, Eric Auger, 2019/01/23
- [Qemu-devel] [PATCH v5 14/18] hw/arm/virt: Allocate device_memory, Eric Auger, 2019/01/23
- [Qemu-devel] [PATCH v5 17/18] hw/arm/boot: Expose the pmem nodes in the DT, Eric Auger, 2019/01/23
- [Qemu-devel] [PATCH v5 16/18] hw/arm/virt: Add nvdimm hot-plug infrastructure, Eric Auger, 2019/01/23
- [Qemu-devel] [PATCH v5 18/18] hw/arm/virt: Add nvdimm and nvdimm-persistence options,
Eric Auger <=
- [Qemu-devel] [PATCH v5 01/18] update-linux-headers.sh: Copy new headers, Eric Auger, 2019/01/23