From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr4cc-00013p-Os for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:35:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr4ca-0004n9-EH for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:34:58 -0500 From: Eric Auger Date: Tue, 5 Feb 2019 18:33:06 +0100 Message-Id: <20190205173306.20483-19-eric.auger@redhat.com> In-Reply-To: <20190205173306.20483-1-eric.auger@redhat.com> References: <20190205173306.20483-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v6 18/18] hw/arm/virt: Add nvdimm and nvdimm-persistence options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, shameerali.kolothum.thodi@huawei.com, imammedo@redhat.com, david@redhat.com Cc: dgilbert@redhat.com, david@gibson.dropbear.id.au, drjones@redhat.com Machine option nvdimm allows to turn NVDIMM support on. Signed-off-by: Eric Auger --- hw/arm/virt.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0c8c2cc191..85ce9becdb 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1776,6 +1776,47 @@ static void virt_set_iommu(Object *obj, const char= *value, Error **errp) } } =20 +static bool virt_get_nvdimm(Object *obj, Error **errp) +{ + VirtMachineState *vms =3D VIRT_MACHINE(obj); + + return vms->acpi_nvdimm_state.is_enabled; +} + +static void virt_set_nvdimm(Object *obj, bool value, Error **errp) +{ + VirtMachineState *vms =3D VIRT_MACHINE(obj); + + vms->acpi_nvdimm_state.is_enabled =3D value; +} + +static char *virt_get_nvdimm_persistence(Object *obj, Error **errp) +{ + VirtMachineState *vms =3D 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 =3D VIRT_MACHINE(obj); + AcpiNVDIMMState *nvdimm_state =3D &vms->acpi_nvdimm_state; + + if (strcmp(value, "cpu") =3D=3D 0) + nvdimm_state->persistence =3D 3; + else if (strcmp(value, "mem-ctrl") =3D=3D 0) + nvdimm_state->persistence =3D 2; + else { + error_report("-machine nvdimm-persistence=3D%s: unsupported opti= on", + value); + exit(EXIT_FAILURE); + } + + g_free(nvdimm_state->persistence_string); + nvdimm_state->persistence_string =3D g_strdup(value); +} + static CpuInstanceProperties virt_cpu_index_to_props(MachineState *ms, unsigned cpu_index) { @@ -1818,13 +1859,14 @@ static void virt_memory_pre_plug(HotplugHandler *= hotplug_dev, DeviceState *dev, Error **errp) { const bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIM= M); + VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); =20 if (dev->hotplugged) { error_setg(errp, "memory hotplug is not supported"); } =20 - 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; } =20 @@ -2032,6 +2074,19 @@ static void virt_instance_init(Object *obj) "Valid values are none and smmuv3", NULL); =20 + 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 N= VDIMM " + "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 =3D a15irqmap; } =20 --=20 2.20.1