From nobody Sun Nov 9 14:51:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550703448792898.146392653431; Wed, 20 Feb 2019 14:57:28 -0800 (PST) Received: from localhost ([127.0.0.1]:50198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwant-00009v-QJ for importer@patchew.org; Wed, 20 Feb 2019 17:57:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwaYa-0004po-Ee for qemu-devel@nongnu.org; Wed, 20 Feb 2019 17:41:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwaYT-0001fT-Fh for qemu-devel@nongnu.org; Wed, 20 Feb 2019 17:41:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55544) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwaYI-0000vn-Od; Wed, 20 Feb 2019 17:41:18 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 964BC3082E09; Wed, 20 Feb 2019 22:41:16 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id E84E85D6AA; Wed, 20 Feb 2019 22:41:13 +0000 (UTC) From: Eric Auger 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 Date: Wed, 20 Feb 2019 23:40:03 +0100 Message-Id: <20190220224003.4420-18-eric.auger@redhat.com> In-Reply-To: <20190220224003.4420-1-eric.auger@redhat.com> References: <20190220224003.4420-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 20 Feb 2019 22:41:16 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v7 17/17] hw/arm/virt: Add nvdimm and nvdimm-persistence options X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: drjones@redhat.com, dgilbert@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 1896920570..c7e68e2428 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1814,6 +1814,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 option= ", + 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) { @@ -1856,13 +1897,14 @@ static void virt_memory_pre_plug(HotplugHandler *ho= tplug_dev, DeviceState *dev, Error **errp) { const bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); + 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 @@ -2076,6 +2118,19 @@ static void virt_instance_init(Object *obj) vms->extended_memmap =3D true; } =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 NVD= IMM " + "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", N= ULL); + vms->irqmap =3D a15irqmap; } =20 --=20 2.20.1