Message ID | 20180615112500.19854-3-david@redhat.com |
---|---|
State | New |
Headers | show |
Series | pc-dimm: next bunch of cleanups | expand |
On Fri, 15 Jun 2018 13:24:50 +0200 David Hildenbrand <david@redhat.com> wrote: > Use a similar naming scheme as spapr. This way, we can go ahead and > rename e.g. pc_dimm_memory_plug to pc_dimm_plug_plug, which avoids ^^^^^ typo? > confusion. > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > hw/i386/pc.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 622e49d6bc..f9250ffae7 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1674,8 +1674,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name) > } > } > > -static void pc_dimm_plug(HotplugHandler *hotplug_dev, > - DeviceState *dev, Error **errp) > +static void pc_memory_plug(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > { > HotplugHandlerClass *hhc; > Error *local_err = NULL; > @@ -1728,8 +1728,8 @@ out: > error_propagate(errp, local_err); > } > > -static void pc_dimm_unplug_request(HotplugHandler *hotplug_dev, > - DeviceState *dev, Error **errp) > +static void pc_memory_unplug_request(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > { > HotplugHandlerClass *hhc; > Error *local_err = NULL; > @@ -1759,8 +1759,8 @@ out: > error_propagate(errp, local_err); > } > > -static void pc_dimm_unplug(HotplugHandler *hotplug_dev, > - DeviceState *dev, Error **errp) > +static void pc_memory_unplug(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > { > PCMachineState *pcms = PC_MACHINE(hotplug_dev); > HotplugHandlerClass *hhc; > @@ -2015,7 +2015,7 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > - pc_dimm_plug(hotplug_dev, dev, errp); > + pc_memory_plug(hotplug_dev, dev, errp); > } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > pc_cpu_plug(hotplug_dev, dev, errp); > } > @@ -2025,7 +2025,7 @@ static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > - pc_dimm_unplug_request(hotplug_dev, dev, errp); > + pc_memory_unplug_request(hotplug_dev, dev, errp); > } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > pc_cpu_unplug_request_cb(hotplug_dev, dev, errp); > } else { > @@ -2038,7 +2038,7 @@ static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > - pc_dimm_unplug(hotplug_dev, dev, errp); > + pc_memory_unplug(hotplug_dev, dev, errp); > } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > pc_cpu_unplug_cb(hotplug_dev, dev, errp); > } else {
On 15.06.2018 13:51, Igor Mammedov wrote: > On Fri, 15 Jun 2018 13:24:50 +0200 > David Hildenbrand <david@redhat.com> wrote: > >> Use a similar naming scheme as spapr. This way, we can go ahead and >> rename e.g. pc_dimm_memory_plug to pc_dimm_plug_plug, which avoids > ^^^^^ typo? Indeed, luckily only in the patch description.
On Fri, 15 Jun 2018 13:52:25 +0200 David Hildenbrand <david@redhat.com> wrote: > On 15.06.2018 13:51, Igor Mammedov wrote: > > On Fri, 15 Jun 2018 13:24:50 +0200 > > David Hildenbrand <david@redhat.com> wrote: > > > >> Use a similar naming scheme as spapr. This way, we can go ahead and > >> rename e.g. pc_dimm_memory_plug to pc_dimm_plug_plug, which avoids > > ^^^^^ typo? > > Indeed, luckily only in the patch description. with that fixed Reviewed-by: Igor Mammedov <imammedo@redhat.com>
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 622e49d6bc..f9250ffae7 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1674,8 +1674,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name) } } -static void pc_dimm_plug(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +static void pc_memory_plug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { HotplugHandlerClass *hhc; Error *local_err = NULL; @@ -1728,8 +1728,8 @@ out: error_propagate(errp, local_err); } -static void pc_dimm_unplug_request(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +static void pc_memory_unplug_request(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { HotplugHandlerClass *hhc; Error *local_err = NULL; @@ -1759,8 +1759,8 @@ out: error_propagate(errp, local_err); } -static void pc_dimm_unplug(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +static void pc_memory_unplug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { PCMachineState *pcms = PC_MACHINE(hotplug_dev); HotplugHandlerClass *hhc; @@ -2015,7 +2015,7 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - pc_dimm_plug(hotplug_dev, dev, errp); + pc_memory_plug(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { pc_cpu_plug(hotplug_dev, dev, errp); } @@ -2025,7 +2025,7 @@ static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - pc_dimm_unplug_request(hotplug_dev, dev, errp); + pc_memory_unplug_request(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { pc_cpu_unplug_request_cb(hotplug_dev, dev, errp); } else { @@ -2038,7 +2038,7 @@ static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - pc_dimm_unplug(hotplug_dev, dev, errp); + pc_memory_unplug(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { pc_cpu_unplug_cb(hotplug_dev, dev, errp); } else {
Use a similar naming scheme as spapr. This way, we can go ahead and rename e.g. pc_dimm_memory_plug to pc_dimm_plug_plug, which avoids confusion. Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/i386/pc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)