From nobody Sat Nov 8 06:05:22 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=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155010563043342.241839941562375; Wed, 13 Feb 2019 16:53:50 -0800 (PST) Received: from localhost ([127.0.0.1]:37661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu5Hf-0001OX-Gr for importer@patchew.org; Wed, 13 Feb 2019 19:53:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu5Gr-00017F-DG for qemu-devel@nongnu.org; Wed, 13 Feb 2019 19:52:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu5Gq-0005G8-3k for qemu-devel@nongnu.org; Wed, 13 Feb 2019 19:52:57 -0500 Received: from mga06.intel.com ([134.134.136.31]:53677) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gu5Go-0005Ce-AM for qemu-devel@nongnu.org; Wed, 13 Feb 2019 19:52:56 -0500 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Feb 2019 16:52:51 -0800 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga005.fm.intel.com with ESMTP; 13 Feb 2019 16:52:50 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,367,1544515200"; d="scan'208";a="320211950" From: Wei Yang To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 08:52:25 +0800 Message-Id: <20190214005225.24048-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.31 Subject: [Qemu-devel] [PATCH] i386, acpi: check acpi_memory_hotplug capacity in pre_plug 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: imammedo@redhat.com, Wei Yang , mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Currently we do device realization like below: hotplug_handler_pre_plug() dc->realize() hotplug_handler_plug() Before we do device realization and plug, we would allocate necessary resources and check the capacity. While we leave acpi_memory_hotplug capacity check in the last step. This looks not comply with current architecture and does some unnecessary work. This patch abstract the check on acpi_memory_hotplug capacity in pre_plug stage. Signed-off-by: Wei Yang --- hw/acpi/piix4.c | 14 ++++++++++++-- hw/i386/pc.c | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index e330f24c71..c97b747496 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -370,13 +370,22 @@ static void piix4_pm_powerdown_req(Notifier *n, void = *opaque) acpi_pm1_evt_power_down(&s->ar); } =20 +static void piix4_device_pre_plug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + PIIX4PMState *s =3D PIIX4_PM(hotplug_dev); + + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) && + !s->acpi_memory_hotplug.is_enabled) + error_setg(errp, + "memory hotplug is not enabled: PIIX4 memory hotplug disabled"= ); +} static void piix4_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { PIIX4PMState *s =3D PIIX4_PM(hotplug_dev); =20 - if (s->acpi_memory_hotplug.is_enabled && - object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) { nvdimm_acpi_plug_cb(hotplug_dev, dev); } else { @@ -702,6 +711,7 @@ static void piix4_pm_class_init(ObjectClass *klass, voi= d *data) */ dc->user_creatable =3D false; dc->hotpluggable =3D false; + hc->pre_plug =3D piix4_device_pre_plug_cb; hc->plug =3D piix4_device_plug_cb; hc->unplug_request =3D piix4_device_unplug_request_cb; hc->unplug =3D piix4_device_unplug_cb; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 734d3268fa..3c6eed0cd3 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1662,6 +1662,7 @@ static void pc_memory_pre_plug(HotplugHandler *hotplu= g_dev, DeviceState *dev, const PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); const bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); const uint64_t legacy_align =3D TARGET_PAGE_SIZE; + HotplugHandlerClass *hhc; =20 /* * When -no-acpi is used with Q35 machine type, no ACPI is built, @@ -1674,6 +1675,13 @@ static void pc_memory_pre_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, return; } =20 + /* + * Check acpi_dev memory hotplug capacity + */ + hhc =3D HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); + if (hcc->pre_plug) + hhc->pre_plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, errp); + if (is_nvdimm && !pcms->acpi_nvdimm_state.is_enabled) { error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'"= ); return; --=20 2.19.1