From nobody Mon Feb 9 09:29:36 2026 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 1551214922288403.82505817982315; Tue, 26 Feb 2019 13:02:02 -0800 (PST) Received: from localhost ([127.0.0.1]:33183 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyjrV-0001s5-9Y for importer@patchew.org; Tue, 26 Feb 2019 16:02:01 -0500 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 Received: from mx1.redhat.com ([209.132.183.28]:5386) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyjcT-00010X-DZ; Tue, 26 Feb 2019 15:46:32 -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 6C8D2305B16F; Tue, 26 Feb 2019 20:46:24 +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 9A7A05D6A6; Tue, 26 Feb 2019 20:46:19 +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: 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 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.49]); Tue, 26 Feb 2019 20:46:24 +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 v9 18/18] hw/arm/virt: Allow nvdimm instantiation 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: pbonzini@redhat.com, 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" 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 *ho= tplug_dev, DeviceState *dev, Error **errp) { const bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); + 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