From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRCPD-0007cg-Il for qemu-devel@nongnu.org; Fri, 08 Jun 2018 04:05:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRCP8-0006Mh-LT for qemu-devel@nongnu.org; Fri, 08 Jun 2018 04:05:55 -0400 Received: from 11.mo4.mail-out.ovh.net ([46.105.34.195]:36176) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRCP8-0006Ls-El for qemu-devel@nongnu.org; Fri, 08 Jun 2018 04:05:50 -0400 Received: from player726.ha.ovh.net (unknown [10.109.108.94]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id 9ED4317A74D for ; Fri, 8 Jun 2018 10:05:48 +0200 (CEST) Date: Fri, 8 Jun 2018 10:05:28 +0200 From: Greg Kurz Message-ID: <20180608100528.4bdadf6b@bahia.lan> In-Reply-To: <20180607165218.9558-4-david@redhat.com> References: <20180607165218.9558-1-david@redhat.com> <20180607165218.9558-4-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1 3/8] spapr: move all DIMM checks into spapr_memory_plug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Paolo Bonzini , Peter Crosthwaite , Richard Henderson , "Michael S . Tsirkin" , Igor Mammedov , Eduardo Habkost , David Gibson , Alexander Graf , Cornelia Huck , Christian Borntraeger On Thu, 7 Jun 2018 18:52:13 +0200 David Hildenbrand wrote: > Let's clean the hotplug handler up by moving everything into > spapr_memory_plug(). > > Signed-off-by: David Hildenbrand > --- > hw/ppc/spapr.c | 23 ++++++++++------------- > 1 file changed, 10 insertions(+), 13 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index d038f3243e..a12be24ca9 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3136,14 +3136,22 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size, > } > > static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > - uint32_t node, Error **errp) > + Error **errp) > { > Error *local_err = NULL; > sPAPRMachineState *ms = SPAPR_MACHINE(hotplug_dev); > + sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(ms); > PCDIMMDevice *dimm = PC_DIMM(dev); > PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm); > MemoryRegion *mr; > uint64_t align, size, addr; > + uint32_t node; > + > + if (!smc->dr_lmb_enabled) { > + error_setg(&local_err, "Memory hotplug not supported for this machine"); > + goto out; > + } Wouldn't it be more appropriate to move this check to spapr_memory_pre_plug() ? > + node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP, NULL); > > mr = ddc->get_memory_region(dimm, &local_err); > if (local_err) { > @@ -3568,19 +3576,8 @@ out: > static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > - MachineState *ms = MACHINE(hotplug_dev); > - sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(ms); > - > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > - int node; > - > - if (!smc->dr_lmb_enabled) { > - error_setg(errp, "Memory hotplug not supported for this machine"); > - return; > - } > - node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP, NULL); > - > - spapr_memory_plug(hotplug_dev, dev, node, errp); > + spapr_memory_plug(hotplug_dev, dev, errp); > } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) { > spapr_core_plug(hotplug_dev, dev, errp); > }