{"id":806865,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806865/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1503965694-10794-55-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:14:29","name":"[54/79] spapr: add pre_plug function for memory","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"aa8978d6878c665960436b6d37ea92b60fbd59f3","submitter":{"id":5549,"url":"http://patchwork.ozlabs.org/api/1.0/people/5549/?format=json","name":"Michael Roth","email":"mdroth@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-55-git-send-email-mdroth@linux.vnet.ibm.com/mbox/","series":[{"id":281,"url":"http://patchwork.ozlabs.org/api/1.0/series/281/?format=json","date":"2017-08-29T00:13:45","name":"Patch Round-up for stable 2.9.1, freeze on 2017-09-04","version":1,"mbox":"http://patchwork.ozlabs.org/series/281/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806865/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xh9F71HNsz9s7M\n\tfor ;\n\tTue, 29 Aug 2017 10:56:27 +1000 (AEST)","from localhost ([::1]:42109 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmUpN-0003Tn-2T\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:56:25 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48506)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmUCg-0001Xu-Mf\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:30 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmUCe-0005pK-8t\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:26 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:56881)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmUCd-0005mu-W7\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:24 -0400","from pps.filterd (m0098410.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0ECuc042865\n\tfor ; Mon, 28 Aug 2017 20:16:23 -0400","from e17.ny.us.ibm.com (e17.ny.us.ibm.com [129.33.205.207])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cmr8nf0bu-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 28 Aug 2017 20:16:22 -0400","from localhost\n\tby e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 28 Aug 2017 20:16:21 -0400","from b01cxnp23032.gho.pok.ibm.com (9.57.198.27)\n\tby e17.ny.us.ibm.com (146.89.104.204) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 20:16:18 -0400","from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com\n\t[9.57.199.110])\n\tby b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP\n\tid v7T0GIGf26083402; Tue, 29 Aug 2017 00:16:18 GMT","from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id CA33CAE034;\n\tMon, 28 Aug 2017 20:16:41 -0400 (EDT)","from localhost (unknown [9.80.85.217])\n\tby b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP id 9C883AE03B;\n\tMon, 28 Aug 2017 20:16:41 -0400 (EDT)"],"From":"Michael Roth ","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:14:29 -0500","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","References":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17082900-0040-0000-0000-00000396DEFA","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:16:19","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082900-0041-0000-0000-0000078B107C","Message-Id":"<1503965694-10794-55-git-send-email-mdroth@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.156.1","Subject":"[Qemu-devel] [PATCH 54/79] spapr: add pre_plug function for memory","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Laurent Vivier , qemu-stable@nongnu.org,\n\tDavid Gibson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Laurent Vivier \n\nThis allows to manage errors before the memory\nhas started to be hotplugged. We already have\nthe function for the CPU cores.\n\nSigned-off-by: Laurent Vivier \nReviewed-by: Greg Kurz \n[dwg: Fixed a couple of style nits]\nSigned-off-by: David Gibson \n\n(cherry picked from commit c871bc70bb22d1d70451bc813ecb008fe98cc92b)\nSigned-off-by: Michael Roth \n---\n hw/ppc/spapr.c | 41 ++++++++++++++++++++++++++---------------\n 1 file changed, 26 insertions(+), 15 deletions(-)","diff":"diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c\nindex 35db949..5564f78 100644\n--- a/hw/ppc/spapr.c\n+++ b/hw/ppc/spapr.c\n@@ -2508,20 +2508,6 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,\n uint64_t align = memory_region_get_alignment(mr);\n uint64_t size = memory_region_size(mr);\n uint64_t addr;\n- char *mem_dev;\n-\n- if (size % SPAPR_MEMORY_BLOCK_SIZE) {\n- error_setg(&local_err, \"Hotplugged memory size must be a multiple of \"\n- \"%lld MB\", SPAPR_MEMORY_BLOCK_SIZE/M_BYTE);\n- goto out;\n- }\n-\n- mem_dev = object_property_get_str(OBJECT(dimm), PC_DIMM_MEMDEV_PROP, NULL);\n- if (mem_dev && !kvmppc_is_mem_backend_page_size_ok(mem_dev)) {\n- error_setg(&local_err, \"Memory backend has bad page size. \"\n- \"Use 'memory-backend-file' with correct mem-path.\");\n- goto out;\n- }\n \n pc_dimm_memory_plug(dev, &ms->hotplug_memory, mr, align, &local_err);\n if (local_err) {\n@@ -2542,6 +2528,29 @@ out:\n error_propagate(errp, local_err);\n }\n \n+static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,\n+ Error **errp)\n+{\n+ PCDIMMDevice *dimm = PC_DIMM(dev);\n+ PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);\n+ MemoryRegion *mr = ddc->get_memory_region(dimm);\n+ uint64_t size = memory_region_size(mr);\n+ char *mem_dev;\n+\n+ if (size % SPAPR_MEMORY_BLOCK_SIZE) {\n+ error_setg(errp, \"Hotplugged memory size must be a multiple of \"\n+ \"%lld MB\", SPAPR_MEMORY_BLOCK_SIZE / M_BYTE);\n+ return;\n+ }\n+\n+ mem_dev = object_property_get_str(OBJECT(dimm), PC_DIMM_MEMDEV_PROP, NULL);\n+ if (mem_dev && !kvmppc_is_mem_backend_page_size_ok(mem_dev)) {\n+ error_setg(errp, \"Memory backend has bad page size. \"\n+ \"Use 'memory-backend-file' with correct mem-path.\");\n+ return;\n+ }\n+}\n+\n typedef struct sPAPRDIMMState {\n uint32_t nr_lmbs;\n } sPAPRDIMMState;\n@@ -2912,7 +2921,9 @@ static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_dev,\n static void spapr_machine_device_pre_plug(HotplugHandler *hotplug_dev,\n DeviceState *dev, Error **errp)\n {\n- if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {\n+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {\n+ spapr_memory_pre_plug(hotplug_dev, dev, errp);\n+ } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {\n spapr_core_pre_plug(hotplug_dev, dev, errp);\n }\n }\n","prefixes":["54/79"]}