Replace calls to object_child_foreach() with object_child_foreach_recursive()
PATCH v2 1/1 Replace calls to object_child_foreach() with object_child_foreach_recursive()
Replace calls to object_child_foreach() with object_child_foreach_recursive() when applicable: nvdimm_device_list, nmi_monitor_handle, find_sysbus_device,pc_dimm_slot2bitmap, build_dimm_list.
Signed-off-by Ernest Esene <[email protected]>
---
v2:
* applied changes suggested by Paolo
--- hw/acpi/nvdimm.c | 4 +--- hw/core/sysbus.c | 11 ++++------- hw/mem/pc-dimm.c | 3 +-- hw/virtio/virtio-balloon.c | 3 +-- 4 files changed, 7 insertions(+), 14 deletions(-)
hw/acpi/nvdimm.c +1 -3
@@ -40,8 +40,6 @@ static int nvdimm_device_list(Object *obj, void *opaque)if (object_dynamic_cast (obj,TYPE_NVDIMM )) { *list =g_slist_append (*list,DEVICE (obj)); } - -object_child_foreach (obj, nvdimm_device_list, opaque);return 0 ; }
@@ -56,7 +54,7 @@ static GSList *nvdimm_get_device_list(void) {GSList *list =NULL ; -object_child_foreach (qdev_get_machine (), nvdimm_device_list, &list); +object_child_foreach_recursive (qdev_get_machine (), nvdimm_device_list, &list);return list; }
hw/core/sysbus.c +4 -7
@@ -41,13 +41,10 @@ static int find_sysbus_device(Object *obj, void *opaque) dev =object_dynamic_cast (obj,TYPE_SYS_BUS_DEVICE ); sbdev = (SysBusDevice *)dev; -if (!sbdev) { -/* Container, traverse it for children */ -return object_child_foreach (obj, find_sysbus_device, opaque); +if (sbdev) { + find->func (sbdev, find->opaque); } - find->func (sbdev, find->opaque); -return 0 ; }
@@ -65,9 +62,9 @@ void foreach_dynamic_sysbus_device(FindSysbusDeviceFunc *func, void *opaque)/* Loop through all sysbus devices that were spawened outside the machine */ container =container_get (qdev_get_machine (),"/peripheral" ); -find_sysbus_device (container, &find); +object_child_foreach_recursive (container, find_sysbus_device, &find); container =container_get (qdev_get_machine (),"/peripheral-anon" ); -find_sysbus_device (container, &find); +object_child_foreach_recursive (container, find_sysbus_device, &find); }
hw/mem/pc-dimm.c +1 -2
@@ -84,7 +84,6 @@ static int pc_dimm_slot2bitmap(Object *obj, void *opaque) } } -object_child_foreach (obj, pc_dimm_slot2bitmap, opaque);return 0 ; }
@@ -100,7 +99,7 @@ static int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp) } bitmap =bitmap_new (max_slots); -object_child_foreach (qdev_get_machine (), pc_dimm_slot2bitmap, bitmap); +object_child_foreach_recursive (qdev_get_machine (), pc_dimm_slot2bitmap, bitmap);/* check if requested slot is not occupied */ if (hint) {
hw/virtio/virtio-balloon.c +1 -2
@@ -649,7 +649,6 @@ static int build_dimm_list(Object *obj, void *opaque) } } -object_child_foreach (obj, build_dimm_list, opaque);return 0 ; }
@@ -658,7 +657,7 @@ static ram_addr_t get_current_ram_size(void)GSList *list =NULL , *item;ram_addr_t size = ram_size; -build_dimm_list (qdev_get_machine (), &list); +object_child_foreach_recursive (qdev_get_machine (), build_dimm_list, &list);for (item = list; item; item =g_slist_next (item)) {Object *obj =OBJECT (item->data);if (!strcmp (object_get_typename (obj),TYPE_PC_DIMM )) {
Signature · 1 line
2.14.2
Quoted 10 lines · Ernest Esene
Replace calls to
object_child_foreach()withobject_child_foreach_recursive()when applicable:nvdimm_device_list,nmi_monitor_handle,find_sysbus_device,pc_dimm_slot2bitmap,build_dimm_list.Signed-off-by Ernest Esene <[email protected]>---
v2:
* applied changes suggested by Paolo
Quoted 6 lines
--- hw/acpi/nvdimm.c | 4 +--- hw/core/sysbus.c | 11 ++++------- hw/mem/pc-dimm.c | 3 +-- hw/virtio/virtio-balloon.c | 3 +-- 4 files changed, 7 insertions(+), 14 deletions(-)
Reviewed-by Stefan Hajnoczi <[email protected]>