| Message ID | 149882869053.24031.15086612121177689276.stgit@bahia.lan |
|---|---|
| State | New |
| Headers | show |
On Fri, Jun 30, 2017 at 03:18:10PM +0200, Greg Kurz wrote: > Since commit ff9006ddbfd1 ("spapr: move spapr_core_[foo]plug() callbacks > close to machine code in spapr.c"), this function doesn't need to be extern > anymore. > > Signed-off-by: Greg Kurz <groug@kaod.org> Applied to ppc-for-2.10. > --- > hw/ppc/spapr.c | 4 ++-- > include/hw/ppc/spapr.h | 2 -- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 0ee9fac50bd4..65d8ad2f4966 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2863,8 +2863,8 @@ out: > error_propagate(errp, local_err); > } > > -void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset, > - sPAPRMachineState *spapr) > +static void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset, > + sPAPRMachineState *spapr) > { > PowerPCCPU *cpu = POWERPC_CPU(cs); > DeviceClass *dc = DEVICE_GET_CLASS(cs); > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index a66bbac35242..12bf9697990e 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -640,8 +640,6 @@ void spapr_hotplug_req_add_by_count_indexed(sPAPRDRConnectorType drc_type, > void spapr_hotplug_req_remove_by_count_indexed(sPAPRDRConnectorType drc_type, > uint32_t count, uint32_t index); > void spapr_cpu_parse_features(sPAPRMachineState *spapr); > -void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset, > - sPAPRMachineState *spapr); > > /* CPU and LMB DRC release callbacks. */ > void spapr_core_release(DeviceState *dev); >
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0ee9fac50bd4..65d8ad2f4966 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2863,8 +2863,8 @@ out: error_propagate(errp, local_err); } -void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset, - sPAPRMachineState *spapr) +static void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset, + sPAPRMachineState *spapr) { PowerPCCPU *cpu = POWERPC_CPU(cs); DeviceClass *dc = DEVICE_GET_CLASS(cs); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index a66bbac35242..12bf9697990e 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -640,8 +640,6 @@ void spapr_hotplug_req_add_by_count_indexed(sPAPRDRConnectorType drc_type, void spapr_hotplug_req_remove_by_count_indexed(sPAPRDRConnectorType drc_type, uint32_t count, uint32_t index); void spapr_cpu_parse_features(sPAPRMachineState *spapr); -void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset, - sPAPRMachineState *spapr); /* CPU and LMB DRC release callbacks. */ void spapr_core_release(DeviceState *dev);
Since commit ff9006ddbfd1 ("spapr: move spapr_core_[foo]plug() callbacks close to machine code in spapr.c"), this function doesn't need to be extern anymore. Signed-off-by: Greg Kurz <groug@kaod.org> --- hw/ppc/spapr.c | 4 ++-- include/hw/ppc/spapr.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)