From patchwork Tue Feb 19 06:07:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 1044462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 443Vfz1MBjz9s5c for ; Tue, 19 Feb 2019 17:08:56 +1100 (AEDT) Received: from localhost ([127.0.0.1]:42262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvyaL-0002jn-At for incoming@patchwork.ozlabs.org; Tue, 19 Feb 2019 01:08:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvyZd-0002iU-9K for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:08:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvyZc-0006DG-KE for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:08:09 -0500 Received: from mga09.intel.com ([134.134.136.24]:62698) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gvyZc-0006Co-CX for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:08:08 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2019 22:08:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,387,1544515200"; d="scan'208";a="147935041" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga001.fm.intel.com with ESMTP; 18 Feb 2019 22:08:05 -0800 From: Wei Yang To: qemu-devel@nongnu.org Date: Tue, 19 Feb 2019 14:07:18 +0800 Message-Id: <20190219060719.8211-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190219060719.8211-1-richardw.yang@linux.intel.com> References: <20190219060719.8211-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH 1/2] 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 , xiaoguangrong.eric@gmail.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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é Tested-by: Philippe Mathieu-Daudé --- hw/acpi/memory_hotplug.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index 8c7c1013f3..b19673d337 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -266,10 +266,6 @@ void acpi_memory_plug_cb(HotplugHandler *hotplug_dev, MemHotplugState *mem_st, MemStatus *mdev; DeviceClass *dc = DEVICE_GET_CLASS(dev); - if (!dc->hotpluggable) { - return; - } - mdev = acpi_memory_slot_status(mem_st, dev, errp); if (!mdev) { return; From patchwork Tue Feb 19 06:07:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 1044464 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 443Vfz1QHyz9s7h for ; Tue, 19 Feb 2019 17:08:56 +1100 (AEDT) Received: from localhost ([127.0.0.1]:42264 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvyaM-0002k4-2X for incoming@patchwork.ozlabs.org; Tue, 19 Feb 2019 01:08:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvyZe-0002iZ-51 for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:08:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvyZd-0006DU-5I for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:08:10 -0500 Received: from mga09.intel.com ([134.134.136.24]:62698) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gvyZc-0006Co-TR for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:08:09 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2019 22:08:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,387,1544515200"; d="scan'208";a="147935043" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga001.fm.intel.com with ESMTP; 18 Feb 2019 22:08:07 -0800 From: Wei Yang To: qemu-devel@nongnu.org Date: Tue, 19 Feb 2019 14:07:19 +0800 Message-Id: <20190219060719.8211-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190219060719.8211-1-richardw.yang@linux.intel.com> References: <20190219060719.8211-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH 2/2] pc-dimm: remove 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 , xiaoguangrong.eric@gmail.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" PCDIMM's realize callback is introduced to do proper setup for NVDIMM. Currently the NVDIMM setup task is nvdimm_prepare_memory_region(), which is done in pre_plug stage. This means related task has already been done at realize point. This patch remove PCDIMM realize callback. Signed-off-by: Wei Yang --- hw/acpi/memory_hotplug.c | 1 - hw/mem/nvdimm.c | 11 ----------- hw/mem/pc-dimm.c | 5 ----- include/hw/mem/pc-dimm.h | 3 --- 4 files changed, 20 deletions(-) diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index b19673d337..cb5284d36f 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -264,7 +264,6 @@ void acpi_memory_plug_cb(HotplugHandler *hotplug_dev, MemHotplugState *mem_st, DeviceState *dev, Error **errp) { MemStatus *mdev; - DeviceClass *dc = DEVICE_GET_CLASS(dev); mdev = acpi_memory_slot_status(mem_st, dev, errp); if (!mdev) { 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(MemoryDeviceState *md, return nvdimm->nvdimm_mr; } -static void nvdimm_realize(PCDIMMDevice *dimm, Error **errp) -{ - NVDIMMDevice *nvdimm = 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[] = { static void nvdimm_class_init(ObjectClass *oc, void *data) { - PCDIMMDeviceClass *ddc = PC_DIMM_CLASS(oc); MemoryDeviceClass *mdc = MEMORY_DEVICE_CLASS(oc); NVDIMMClass *nvc = NVDIMM_CLASS(oc); DeviceClass *dc = DEVICE_CLASS(oc); - ddc->realize = nvdimm_realize; mdc->get_memory_region = nvdimm_md_get_memory_region; dc->props = nvdimm_properties; 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 = PC_DIMM(dev); - PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm); 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; } - if (ddc->realize) { - ddc->realize(dimm, errp); - } - host_memory_backend_set_mapped(dimm->hostmem, true); } 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 { /** * 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; /* public */ - void (*realize)(PCDIMMDevice *dimm, Error **errp); MemoryRegion *(*get_vmstate_memory_region)(PCDIMMDevice *dimm, Error **errp); } PCDIMMDeviceClass;