From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTnvE-0007QY-6I for qemu-devel@nongnu.org; Fri, 15 Jun 2018 08:33:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTnvB-0006mB-26 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 08:33:44 -0400 Date: Fri, 15 Jun 2018 14:33:37 +0200 From: Igor Mammedov Message-ID: <20180615143337.22e61fe9@redhat.com> In-Reply-To: <20180615112500.19854-4-david@redhat.com> References: <20180615112500.19854-1-david@redhat.com> <20180615112500.19854-4-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 03/12] pc-dimm: rename pc_dimm_memory_* to pc_dimm_* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S . Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Xiao Guangrong , David Gibson , Alexander Graf On Fri, 15 Jun 2018 13:24:51 +0200 David Hildenbrand wrote: > Let's rename it to make it look more consistent. > > Signed-off-by: David Hildenbrand Reviewed-by: Igor Mammedov > --- > hw/i386/pc.c | 4 ++-- > hw/mem/pc-dimm.c | 6 +++--- > hw/ppc/spapr.c | 6 +++--- > include/hw/mem/pc-dimm.h | 6 +++--- > 4 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index f9250ffae7..f23133facc 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1713,7 +1713,7 @@ static void pc_memory_plug(HotplugHandler *hotplug_dev, > goto out; > } > > - pc_dimm_memory_plug(dev, MACHINE(pcms), align, &local_err); > + pc_dimm_plug(dev, MACHINE(pcms), align, &local_err); > if (local_err) { > goto out; > } > @@ -1773,7 +1773,7 @@ static void pc_memory_unplug(HotplugHandler *hotplug_dev, > goto out; > } > > - pc_dimm_memory_unplug(dev, MACHINE(pcms)); > + pc_dimm_unplug(dev, MACHINE(pcms)); > object_unparent(OBJECT(dev)); > > out: > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c > index 62b34a992e..9e0c83e415 100644 > --- a/hw/mem/pc-dimm.c > +++ b/hw/mem/pc-dimm.c > @@ -27,8 +27,8 @@ > #include "sysemu/numa.h" > #include "trace.h" > > -void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine, > - uint64_t align, Error **errp) > +void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align, > + Error **errp) > { > int slot; > PCDIMMDevice *dimm = PC_DIMM(dev); > @@ -84,7 +84,7 @@ out: > error_propagate(errp, local_err); > } > > -void pc_dimm_memory_unplug(DeviceState *dev, MachineState *machine) > +void pc_dimm_unplug(DeviceState *dev, MachineState *machine) > { > PCDIMMDevice *dimm = PC_DIMM(dev); > PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm); > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index f59999daac..3e5320020f 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3153,7 +3153,7 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > align = memory_region_get_alignment(mr); > size = memory_region_size(mr); > > - pc_dimm_memory_plug(dev, MACHINE(ms), align, &local_err); > + pc_dimm_plug(dev, MACHINE(ms), align, &local_err); > if (local_err) { > goto out; > } > @@ -3176,7 +3176,7 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > return; > > out_unplug: > - pc_dimm_memory_unplug(dev, MACHINE(ms)); > + pc_dimm_unplug(dev, MACHINE(ms)); > out: > error_propagate(errp, local_err); > } > @@ -3328,7 +3328,7 @@ static void spapr_memory_unplug(HotplugHandler *hotplug_dev, DeviceState *dev) > sPAPRMachineState *spapr = SPAPR_MACHINE(hotplug_dev); > sPAPRDIMMState *ds = spapr_pending_dimm_unplugs_find(spapr, PC_DIMM(dev)); > > - pc_dimm_memory_unplug(dev, MACHINE(hotplug_dev)); > + pc_dimm_unplug(dev, MACHINE(hotplug_dev)); > object_unparent(OBJECT(dev)); > spapr_pending_dimm_unplugs_remove(spapr, ds); > } > diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h > index 627c8601d9..860343d64f 100644 > --- a/include/hw/mem/pc-dimm.h > +++ b/include/hw/mem/pc-dimm.h > @@ -78,7 +78,7 @@ typedef struct PCDIMMDeviceClass { > > int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp); > > -void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine, > - uint64_t align, Error **errp); > -void pc_dimm_memory_unplug(DeviceState *dev, MachineState *machine); > +void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align, > + Error **errp); > +void pc_dimm_unplug(DeviceState *dev, MachineState *machine); > #endif