Message ID | 1454660341-45244-4-git-send-email-vsementsov@virtuozzo.com |
---|---|
State | New |
Headers | show |
On Fri, 5 Feb 2016 11:18:59 +0300 Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> wrote: > Like pc_dimm_build_list_sorted but not sorted - for cases where sorting > is not necessary. Add stubbed version too - for targets without > CONFIG_MEM_HOTPLUG. It's not performance critical path, is there a reason why sorted list can't be used? > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > hw/mem/pc-dimm.c | 15 +++++++++++++++ > include/hw/mem/pc-dimm.h | 3 +++ > stubs/Makefile.objs | 2 +- > stubs/pc_dimm.c | 12 ++++++++++++ > stubs/qmp_pc_dimm_device_list.c | 7 ------- > 5 files changed, 31 insertions(+), 8 deletions(-) > create mode 100644 stubs/pc_dimm.c > delete mode 100644 stubs/qmp_pc_dimm_device_list.c > > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c > index 4a681bc..0f102c0 100644 > --- a/hw/mem/pc-dimm.c > +++ b/hw/mem/pc-dimm.c > @@ -266,6 +266,21 @@ static int pc_dimm_build_list_sorted(Object *obj, void *opaque) > return 0; > } > > +int pc_dimm_build_list(Object *obj, void *opaque) > +{ > + GSList **list = opaque; > + > + if (object_dynamic_cast(obj, TYPE_PC_DIMM)) { > + DeviceState *dev = DEVICE(obj); > + if (dev->realized) { /* only realized DIMMs matter */ > + *list = g_slist_prepend(*list, dev); > + } > + } > + > + object_child_foreach(obj, pc_dimm_build_list, opaque); > + return 0; > +} > + > uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, > uint64_t address_space_size, > uint64_t *hint, uint64_t align, uint64_t size, > diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h > index d83bf30..ab136a3 100644 > --- a/include/hw/mem/pc-dimm.h > +++ b/include/hw/mem/pc-dimm.h > @@ -94,4 +94,7 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms, > MemoryRegion *mr, uint64_t align, Error **errp); > void pc_dimm_memory_unplug(DeviceState *dev, MemoryHotplugState *hpms, > MemoryRegion *mr); > + > +int pc_dimm_build_list(Object *obj, void *opaque); > + > #endif > diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs > index d7898a0..781c002 100644 > --- a/stubs/Makefile.objs > +++ b/stubs/Makefile.objs > @@ -34,7 +34,7 @@ stub-obj-y += vmstate.o > stub-obj-$(CONFIG_WIN32) += fd-register.o > stub-obj-y += cpus.o > stub-obj-y += kvm.o > -stub-obj-y += qmp_pc_dimm_device_list.o > +stub-obj-y += pc_dimm.o > stub-obj-y += target-monitor-defs.o > stub-obj-y += target-get-monitor-def.o > stub-obj-y += vhost.o > diff --git a/stubs/pc_dimm.c b/stubs/pc_dimm.c > new file mode 100644 > index 0000000..5312f50 > --- /dev/null > +++ b/stubs/pc_dimm.c > @@ -0,0 +1,12 @@ > +#include "qom/object.h" > +#include "hw/mem/pc-dimm.h" > + > +int qmp_pc_dimm_device_list(Object *obj, void *opaque) > +{ > + return 0; > +} > + > +int pc_dimm_build_list(Object *obj, void *opaque) > +{ > + return 0; > +} > diff --git a/stubs/qmp_pc_dimm_device_list.c b/stubs/qmp_pc_dimm_device_list.c > deleted file mode 100644 > index 5cb220c..0000000 > --- a/stubs/qmp_pc_dimm_device_list.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include "qom/object.h" > -#include "hw/mem/pc-dimm.h" > - > -int qmp_pc_dimm_device_list(Object *obj, void *opaque) > -{ > - return 0; > -}
On 05.02.2016 15:51, Igor Mammedov wrote: > On Fri, 5 Feb 2016 11:18:59 +0300 > Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> wrote: > >> Like pc_dimm_build_list_sorted but not sorted - for cases where sorting >> is not necessary. Add stubbed version too - for targets without >> CONFIG_MEM_HOTPLUG. > It's not performance critical path, is there a reason why sorted list > can't be used? Only not doing superfluous sorting, no other reasons. I'm ok with sorted version too. > >> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> >> --- >> hw/mem/pc-dimm.c | 15 +++++++++++++++ >> include/hw/mem/pc-dimm.h | 3 +++ >> stubs/Makefile.objs | 2 +- >> stubs/pc_dimm.c | 12 ++++++++++++ >> stubs/qmp_pc_dimm_device_list.c | 7 ------- >> 5 files changed, 31 insertions(+), 8 deletions(-) >> create mode 100644 stubs/pc_dimm.c >> delete mode 100644 stubs/qmp_pc_dimm_device_list.c >> >> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c >> index 4a681bc..0f102c0 100644 >> --- a/hw/mem/pc-dimm.c >> +++ b/hw/mem/pc-dimm.c >> @@ -266,6 +266,21 @@ static int pc_dimm_build_list_sorted(Object *obj, void *opaque) >> return 0; >> } >> >> +int pc_dimm_build_list(Object *obj, void *opaque) >> +{ >> + GSList **list = opaque; >> + >> + if (object_dynamic_cast(obj, TYPE_PC_DIMM)) { >> + DeviceState *dev = DEVICE(obj); >> + if (dev->realized) { /* only realized DIMMs matter */ >> + *list = g_slist_prepend(*list, dev); >> + } >> + } >> + >> + object_child_foreach(obj, pc_dimm_build_list, opaque); >> + return 0; >> +} >> + >> uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, >> uint64_t address_space_size, >> uint64_t *hint, uint64_t align, uint64_t size, >> diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h >> index d83bf30..ab136a3 100644 >> --- a/include/hw/mem/pc-dimm.h >> +++ b/include/hw/mem/pc-dimm.h >> @@ -94,4 +94,7 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms, >> MemoryRegion *mr, uint64_t align, Error **errp); >> void pc_dimm_memory_unplug(DeviceState *dev, MemoryHotplugState *hpms, >> MemoryRegion *mr); >> + >> +int pc_dimm_build_list(Object *obj, void *opaque); >> + >> #endif >> diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs >> index d7898a0..781c002 100644 >> --- a/stubs/Makefile.objs >> +++ b/stubs/Makefile.objs >> @@ -34,7 +34,7 @@ stub-obj-y += vmstate.o >> stub-obj-$(CONFIG_WIN32) += fd-register.o >> stub-obj-y += cpus.o >> stub-obj-y += kvm.o >> -stub-obj-y += qmp_pc_dimm_device_list.o >> +stub-obj-y += pc_dimm.o >> stub-obj-y += target-monitor-defs.o >> stub-obj-y += target-get-monitor-def.o >> stub-obj-y += vhost.o >> diff --git a/stubs/pc_dimm.c b/stubs/pc_dimm.c >> new file mode 100644 >> index 0000000..5312f50 >> --- /dev/null >> +++ b/stubs/pc_dimm.c >> @@ -0,0 +1,12 @@ >> +#include "qom/object.h" >> +#include "hw/mem/pc-dimm.h" >> + >> +int qmp_pc_dimm_device_list(Object *obj, void *opaque) >> +{ >> + return 0; >> +} >> + >> +int pc_dimm_build_list(Object *obj, void *opaque) >> +{ >> + return 0; >> +} >> diff --git a/stubs/qmp_pc_dimm_device_list.c b/stubs/qmp_pc_dimm_device_list.c >> deleted file mode 100644 >> index 5cb220c..0000000 >> --- a/stubs/qmp_pc_dimm_device_list.c >> +++ /dev/null >> @@ -1,7 +0,0 @@ >> -#include "qom/object.h" >> -#include "hw/mem/pc-dimm.h" >> - >> -int qmp_pc_dimm_device_list(Object *obj, void *opaque) >> -{ >> - return 0; >> -}
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 4a681bc..0f102c0 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -266,6 +266,21 @@ static int pc_dimm_build_list_sorted(Object *obj, void *opaque) return 0; } +int pc_dimm_build_list(Object *obj, void *opaque) +{ + GSList **list = opaque; + + if (object_dynamic_cast(obj, TYPE_PC_DIMM)) { + DeviceState *dev = DEVICE(obj); + if (dev->realized) { /* only realized DIMMs matter */ + *list = g_slist_prepend(*list, dev); + } + } + + object_child_foreach(obj, pc_dimm_build_list, opaque); + return 0; +} + uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, uint64_t address_space_size, uint64_t *hint, uint64_t align, uint64_t size, diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index d83bf30..ab136a3 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -94,4 +94,7 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms, MemoryRegion *mr, uint64_t align, Error **errp); void pc_dimm_memory_unplug(DeviceState *dev, MemoryHotplugState *hpms, MemoryRegion *mr); + +int pc_dimm_build_list(Object *obj, void *opaque); + #endif diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index d7898a0..781c002 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -34,7 +34,7 @@ stub-obj-y += vmstate.o stub-obj-$(CONFIG_WIN32) += fd-register.o stub-obj-y += cpus.o stub-obj-y += kvm.o -stub-obj-y += qmp_pc_dimm_device_list.o +stub-obj-y += pc_dimm.o stub-obj-y += target-monitor-defs.o stub-obj-y += target-get-monitor-def.o stub-obj-y += vhost.o diff --git a/stubs/pc_dimm.c b/stubs/pc_dimm.c new file mode 100644 index 0000000..5312f50 --- /dev/null +++ b/stubs/pc_dimm.c @@ -0,0 +1,12 @@ +#include "qom/object.h" +#include "hw/mem/pc-dimm.h" + +int qmp_pc_dimm_device_list(Object *obj, void *opaque) +{ + return 0; +} + +int pc_dimm_build_list(Object *obj, void *opaque) +{ + return 0; +} diff --git a/stubs/qmp_pc_dimm_device_list.c b/stubs/qmp_pc_dimm_device_list.c deleted file mode 100644 index 5cb220c..0000000 --- a/stubs/qmp_pc_dimm_device_list.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "qom/object.h" -#include "hw/mem/pc-dimm.h" - -int qmp_pc_dimm_device_list(Object *obj, void *opaque) -{ - return 0; -}
Like pc_dimm_build_list_sorted but not sorted - for cases where sorting is not necessary. Add stubbed version too - for targets without CONFIG_MEM_HOTPLUG. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- hw/mem/pc-dimm.c | 15 +++++++++++++++ include/hw/mem/pc-dimm.h | 3 +++ stubs/Makefile.objs | 2 +- stubs/pc_dimm.c | 12 ++++++++++++ stubs/qmp_pc_dimm_device_list.c | 7 ------- 5 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 stubs/pc_dimm.c delete mode 100644 stubs/qmp_pc_dimm_device_list.c