| Message ID | 20180607165218.9558-6-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | pc/spapr/s390x: machine hotplug handler cleanups | expand |
On Thu, Jun 07, 2018 at 06:52:15PM +0200, David Hildenbrand wrote: > We'll be handling unplug of e.g. CPUs and PCDIMMs via the general > hotplug handler soon, so let's add that handler function. > > Signed-off-by: David Hildenbrand <david@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/ppc/spapr.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 4447cb197f..bcb72d9fa7 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3586,6 +3586,11 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, > error_propagate(errp, local_err); > } > > +static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > +{ > +} > + > static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > @@ -3988,6 +3993,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) > mc->get_default_cpu_node_id = spapr_get_default_cpu_node_id; > mc->possible_cpu_arch_ids = spapr_possible_cpu_arch_ids; > hc->unplug_request = spapr_machine_device_unplug_request; > + hc->unplug = spapr_machine_device_unplug; > > smc->dr_lmb_enabled = true; > mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power8_v2.0");
On Thu, 7 Jun 2018 18:52:15 +0200 David Hildenbrand <david@redhat.com> wrote: > We'll be handling unplug of e.g. CPUs and PCDIMMs via the general > hotplug handler soon, so let's add that handler function. > > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/ppc/spapr.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 4447cb197f..bcb72d9fa7 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3586,6 +3586,11 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, > error_propagate(errp, local_err); > } > > +static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > +{ > +} > + > static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > @@ -3988,6 +3993,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) > mc->get_default_cpu_node_id = spapr_get_default_cpu_node_id; > mc->possible_cpu_arch_ids = spapr_possible_cpu_arch_ids; > hc->unplug_request = spapr_machine_device_unplug_request; > + hc->unplug = spapr_machine_device_unplug; > > smc->dr_lmb_enabled = true; > mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power8_v2.0");
On Thu, 7 Jun 2018 18:52:15 +0200 David Hildenbrand <david@redhat.com> wrote: > We'll be handling unplug of e.g. CPUs and PCDIMMs via the general > hotplug handler soon, so let's add that handler function. > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/ppc/spapr.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 4447cb197f..bcb72d9fa7 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3586,6 +3586,11 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, > error_propagate(errp, local_err); > } > > +static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > +{ > +} > + > static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > @@ -3988,6 +3993,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) > mc->get_default_cpu_node_id = spapr_get_default_cpu_node_id; > mc->possible_cpu_arch_ids = spapr_possible_cpu_arch_ids; > hc->unplug_request = spapr_machine_device_unplug_request; > + hc->unplug = spapr_machine_device_unplug; > > smc->dr_lmb_enabled = true; > mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power8_v2.0");
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4447cb197f..bcb72d9fa7 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3586,6 +3586,11 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, error_propagate(errp, local_err); } +static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ +} + static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { @@ -3988,6 +3993,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->get_default_cpu_node_id = spapr_get_default_cpu_node_id; mc->possible_cpu_arch_ids = spapr_possible_cpu_arch_ids; hc->unplug_request = spapr_machine_device_unplug_request; + hc->unplug = spapr_machine_device_unplug; smc->dr_lmb_enabled = true; mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power8_v2.0");
We'll be handling unplug of e.g. CPUs and PCDIMMs via the general hotplug handler soon, so let's add that handler function. Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/ppc/spapr.c | 6 ++++++ 1 file changed, 6 insertions(+)