From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:60927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyjcf-0006uf-LZ for qemu-devel@nongnu.org; Tue, 26 Feb 2019 15:46:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyjce-0001GL-QL for qemu-devel@nongnu.org; Tue, 26 Feb 2019 15:46:41 -0500 From: Eric Auger Date: Tue, 26 Feb 2019 21:44:39 +0100 Message-Id: <20190226204439.2296-19-eric.auger@redhat.com> In-Reply-To: <20190226204439.2296-1-eric.auger@redhat.com> References: <20190226204439.2296-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v9 18/18] hw/arm/virt: Allow nvdimm instantiation 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, pbonzini@redhat.com If NVDIMM option is enabled at machine level, let's allow NVDIMM plug. Signed-off-by: Eric Auger --- 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 =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIM= M); + MachineState *ms =3D 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 && !ms->acpi_nvdimm_state.is_enabled) { + error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M= '"); return; } =20 --=20 2.20.1