| Message ID | 20180615140448.32234-5-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | pc-dimm: next bunch of cleanups | expand |
On Fri, Jun 15, 2018 at 04:04:39PM +0200, David Hildenbrand wrote: > Not used outside of pc-dimm.c and there shouldn't be other users. If > other devices (e.g. memory devices) ever have to also use slots, then we > will have to factor this out. > > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/mem/pc-dimm.c | 4 +++- > include/hw/mem/pc-dimm.h | 2 -- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c > index 9e0c83e415..7387963cf1 100644 > --- a/hw/mem/pc-dimm.c > +++ b/hw/mem/pc-dimm.c > @@ -27,6 +27,8 @@ > #include "sysemu/numa.h" > #include "trace.h" > > +static int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp); > + > void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align, > Error **errp) > { > @@ -111,7 +113,7 @@ static int pc_dimm_slot2bitmap(Object *obj, void *opaque) > return 0; > } > > -int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp) > +static int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp) > { > unsigned long *bitmap; > int slot = 0; > diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h > index 860343d64f..cf71247630 100644 > --- a/include/hw/mem/pc-dimm.h > +++ b/include/hw/mem/pc-dimm.h > @@ -76,8 +76,6 @@ typedef struct PCDIMMDeviceClass { > MemoryRegion *(*get_vmstate_memory_region)(PCDIMMDevice *dimm); > } PCDIMMDeviceClass; > > -int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp); > - > void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align, > Error **errp); > void pc_dimm_unplug(DeviceState *dev, MachineState *machine);
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 9e0c83e415..7387963cf1 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -27,6 +27,8 @@ #include "sysemu/numa.h" #include "trace.h" +static int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp); + void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align, Error **errp) { @@ -111,7 +113,7 @@ static int pc_dimm_slot2bitmap(Object *obj, void *opaque) return 0; } -int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp) +static int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp) { unsigned long *bitmap; int slot = 0; diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 860343d64f..cf71247630 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -76,8 +76,6 @@ typedef struct PCDIMMDeviceClass { MemoryRegion *(*get_vmstate_memory_region)(PCDIMMDevice *dimm); } PCDIMMDeviceClass; -int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp); - void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align, Error **errp); void pc_dimm_unplug(DeviceState *dev, MachineState *machine);