From nobody Mon May 20 22:54:15 2024 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 1550624186068127.75990433187417; Tue, 19 Feb 2019 16:56:26 -0800 (PST) Received: from localhost ([127.0.0.1]:57272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwGBN-0002H8-Tp for importer@patchew.org; Tue, 19 Feb 2019 19:56:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwG9n-0001Mc-Al for qemu-devel@nongnu.org; Tue, 19 Feb 2019 19:54:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwG9U-0006dg-6z for qemu-devel@nongnu.org; Tue, 19 Feb 2019 19:54:27 -0500 Received: from mga12.intel.com ([192.55.52.136]:25996) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwG9R-0005XQ-Ib for qemu-devel@nongnu.org; Tue, 19 Feb 2019 19:54:17 -0500 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Feb 2019 16:52:11 -0800 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga006.jf.intel.com with ESMTP; 19 Feb 2019 16:52:09 -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,388,1544515200"; d="scan'208";a="117519257" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 20 Feb 2019 08:51:22 +0800 Message-Id: <20190220005124.24224-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190220005124.24224-1-richardw.yang@linux.intel.com> References: <20190220005124.24224-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.136 Subject: [Qemu-devel] [PATCH v2 1/3] pc-dimm: remove check on pc-dimm hotpluggable 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 , philmd@redhat.com, xiaoguangrong.eric@gmail.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Function acpi_memory_plug_cb() is only invoked when dev is a PCDIMM, which is hotpluggable. This means it is not necessary to check this property again. This patch removes this check. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Xiao Guangrong Tested-by: Philippe Mathieu-Daud=C3=A9 --- v2: * remove unused dc --- hw/acpi/memory_hotplug.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index 8c7c1013f3..cb5284d36f 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -264,11 +264,6 @@ void acpi_memory_plug_cb(HotplugHandler *hotplug_dev, = MemHotplugState *mem_st, DeviceState *dev, Error **errp) { MemStatus *mdev; - DeviceClass *dc =3D DEVICE_GET_CLASS(dev); - - if (!dc->hotpluggable) { - return; - } =20 mdev =3D acpi_memory_slot_status(mem_st, dev, errp); if (!mdev) { --=20 2.19.1 From nobody Mon May 20 22:54:15 2024 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 1550624251094675.7835179513274; Tue, 19 Feb 2019 16:57:31 -0800 (PST) Received: from localhost ([127.0.0.1]:57284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwGCW-0003HH-5z for importer@patchew.org; Tue, 19 Feb 2019 19:57:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwG9v-0001QJ-2s for qemu-devel@nongnu.org; Tue, 19 Feb 2019 19:54:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwG9t-0006he-Iw for qemu-devel@nongnu.org; Tue, 19 Feb 2019 19:54:46 -0500 Received: from mga12.intel.com ([192.55.52.136]:26001) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwG9n-0005Xg-Jc for qemu-devel@nongnu.org; Tue, 19 Feb 2019 19:54:41 -0500 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Feb 2019 16:52:13 -0800 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga006.jf.intel.com with ESMTP; 19 Feb 2019 16:52:11 -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,388,1544515200"; d="scan'208";a="117519259" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 20 Feb 2019 08:51:23 +0800 Message-Id: <20190220005124.24224-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190220005124.24224-1-richardw.yang@linux.intel.com> References: <20190220005124.24224-1-richardw.yang@linux.intel.com> 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: 192.55.52.136 Subject: [Qemu-devel] [PATCH v2 2/3] mem/nvdimm: remove nvdimm_realize 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 , philmd@redhat.com, xiaoguangrong.eric@gmail.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" nvdimm_realize is used to prepare its memory region, while this is done in pre_plug stage. This is time to remove it. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Xiao Guangrong --- v2: split nvdimm part here --- hw/mem/nvdimm.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index bf2adf5e16..8f69576926 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -136,15 +136,6 @@ static MemoryRegion *nvdimm_md_get_memory_region(Memor= yDeviceState *md, return nvdimm->nvdimm_mr; } =20 -static void nvdimm_realize(PCDIMMDevice *dimm, Error **errp) -{ - NVDIMMDevice *nvdimm =3D NVDIMM(dimm); - - if (!nvdimm->nvdimm_mr) { - nvdimm_prepare_memory_region(nvdimm, errp); - } -} - /* * the caller should check the input parameters before calling * label read/write functions. @@ -192,12 +183,10 @@ static Property nvdimm_properties[] =3D { =20 static void nvdimm_class_init(ObjectClass *oc, void *data) { - PCDIMMDeviceClass *ddc =3D PC_DIMM_CLASS(oc); MemoryDeviceClass *mdc =3D MEMORY_DEVICE_CLASS(oc); NVDIMMClass *nvc =3D NVDIMM_CLASS(oc); DeviceClass *dc =3D DEVICE_CLASS(oc); =20 - ddc->realize =3D nvdimm_realize; mdc->get_memory_region =3D nvdimm_md_get_memory_region; dc->props =3D nvdimm_properties; =20 --=20 2.19.1 From nobody Mon May 20 22:54:15 2024 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 1550624190353128.6751287812756; Tue, 19 Feb 2019 16:56:30 -0800 (PST) Received: from localhost ([127.0.0.1]:57274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwGBU-0002M1-Bv for importer@patchew.org; Tue, 19 Feb 2019 19:56:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwG9v-0001QI-2p for qemu-devel@nongnu.org; Tue, 19 Feb 2019 19:54:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwG9t-0006hh-Iy for qemu-devel@nongnu.org; Tue, 19 Feb 2019 19:54:46 -0500 Received: from mga12.intel.com ([192.55.52.136]:26003) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwG9p-0005ZS-0z for qemu-devel@nongnu.org; Tue, 19 Feb 2019 19:54:41 -0500 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Feb 2019 16:52:15 -0800 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga006.jf.intel.com with ESMTP; 19 Feb 2019 16:52:13 -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,388,1544515200"; d="scan'208";a="117519260" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 20 Feb 2019 08:51:24 +0800 Message-Id: <20190220005124.24224-4-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190220005124.24224-1-richardw.yang@linux.intel.com> References: <20190220005124.24224-1-richardw.yang@linux.intel.com> 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: 192.55.52.136 Subject: [Qemu-devel] [PATCH v2 3/3] pc-dimm: revert "introduce realize callback" 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 , philmd@redhat.com, xiaoguangrong.eric@gmail.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" realize callback in introduced to check if the backend memory is large enough to contain label data and init its memory region, while this task is handled in pre_plug stage. Now it's time to remove it. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Xiao Guangrong --- hw/mem/pc-dimm.c | 5 ----- include/hw/mem/pc-dimm.h | 3 --- 2 files changed, 8 deletions(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 152400b1fc..5832c0ba92 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -159,7 +159,6 @@ static void pc_dimm_init(Object *obj) static void pc_dimm_realize(DeviceState *dev, Error **errp) { PCDIMMDevice *dimm =3D PC_DIMM(dev); - PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); =20 if (!dimm->hostmem) { error_setg(errp, "'" PC_DIMM_MEMDEV_PROP "' property is not set"); @@ -178,10 +177,6 @@ static void pc_dimm_realize(DeviceState *dev, Error **= errp) return; } =20 - if (ddc->realize) { - ddc->realize(dimm, errp); - } - host_memory_backend_set_mapped(dimm->hostmem, true); } =20 diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 01436b9f50..d18f8246b7 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -59,8 +59,6 @@ typedef struct PCDIMMDevice { =20 /** * PCDIMMDeviceClass: - * @realize: called after common dimm is realized so that the dimm based - * devices get the chance to do specified operations. * @get_vmstate_memory_region: returns #MemoryRegion which indicates the * memory of @dimm should be kept during live migration. Will not fail * after the device was realized. @@ -70,7 +68,6 @@ typedef struct PCDIMMDeviceClass { DeviceClass parent_class; =20 /* public */ - void (*realize)(PCDIMMDevice *dimm, Error **errp); MemoryRegion *(*get_vmstate_memory_region)(PCDIMMDevice *dimm, Error **errp); } PCDIMMDeviceClass; --=20 2.19.1