ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sysbus: Remove ignored return value of FindSysbusDeviceFunc 

Functions of type FindSysbusDeviceFunc currently return an integer.
However, this return value is always ignored by the caller in
find_sysbus_device().

This changes the function type to return void, to avoid confusion over
the function semantics.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
David Gibson 2016-09-21 15:23:53 +10:00 committed by Eduardo Habkost
parent 55c911a580
commit 4f01a63779
6 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/arm/sysbus-fdt.c
View File

@ -436,7 +436,7 @@ static const NodeCreationPair add_fdt_node_functions[] = {
* are dynamically instantiable and if so call the node creation * are dynamically instantiable and if so call the node creation
* function. * function.
*/ */
static int add_fdt_node(SysBusDevice *sbdev, void *opaque) static void add_fdt_node(SysBusDevice *sbdev, void *opaque)
{ {
int i, ret; int i, ret;
@ -445,7 +445,7 @@ static int add_fdt_node(SysBusDevice *sbdev, void *opaque)
add_fdt_node_functions[i].typename)) { add_fdt_node_functions[i].typename)) {
ret = add_fdt_node_functions[i].add_fdt_node_fn(sbdev, opaque); ret = add_fdt_node_functions[i].add_fdt_node_fn(sbdev, opaque);
assert(!ret); assert(!ret);
return 0; return;
} }
} }
error_report("Device %s can not be dynamically instantiated", error_report("Device %s can not be dynamically instantiated",

2
hw/core/machine.c
View File

@ -332,7 +332,7 @@ static bool machine_get_enforce_config_section(Object *obj, Error **errp)
return ms->enforce_config_section; return ms->enforce_config_section;
} }
static int error_on_sysbus_device(SysBusDevice *sbdev, void *opaque) static void error_on_sysbus_device(SysBusDevice *sbdev, void *opaque)
{ {
error_report("Option '-device %s' cannot be handled by this machine", error_report("Option '-device %s' cannot be handled by this machine",
object_class_get_name(object_get_class(OBJECT(sbdev)))); object_class_get_name(object_get_class(OBJECT(sbdev))));

8
hw/core/platform-bus.c
View File

@ -74,7 +74,7 @@ hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus, SysBusDevice *sbdev,
return object_property_get_int(OBJECT(sbdev_mr), "addr", NULL); return object_property_get_int(OBJECT(sbdev_mr), "addr", NULL);
} }
static int platform_bus_count_irqs(SysBusDevice *sbdev, void *opaque) static void platform_bus_count_irqs(SysBusDevice *sbdev, void *opaque)
{ {
PlatformBusDevice *pbus = opaque; PlatformBusDevice *pbus = opaque;
qemu_irq sbirq; qemu_irq sbirq;
@ -93,8 +93,6 @@ static int platform_bus_count_irqs(SysBusDevice *sbdev, void *opaque)
} }
} }
} }
return 0;
} }
/* /*
@ -168,7 +166,7 @@ static void platform_bus_map_mmio(PlatformBusDevice *pbus, SysBusDevice *sbdev,
* For each sysbus device, look for unassigned IRQ lines as well as * For each sysbus device, look for unassigned IRQ lines as well as
* unassociated MMIO regions. Connect them to the platform bus if available. * unassociated MMIO regions. Connect them to the platform bus if available.
*/ */
static int link_sysbus_device(SysBusDevice *sbdev, void *opaque) static void link_sysbus_device(SysBusDevice *sbdev, void *opaque)
{ {
PlatformBusDevice *pbus = opaque; PlatformBusDevice *pbus = opaque;
int i; int i;
@ -180,8 +178,6 @@ static int link_sysbus_device(SysBusDevice *sbdev, void *opaque)
for (i = 0; sysbus_has_mmio(sbdev, i); i++) { for (i = 0; sysbus_has_mmio(sbdev, i); i++) {
platform_bus_map_mmio(pbus, sbdev, i); platform_bus_map_mmio(pbus, sbdev, i);
} }
return 0;
} }
static void platform_bus_init_notify(Notifier *notifier, void *data) static void platform_bus_init_notify(Notifier *notifier, void *data)

4
hw/ppc/e500.c
View File

@ -196,7 +196,7 @@ static int create_devtree_etsec(SysBusDevice *sbdev, PlatformDevtreeData *data)
return 0; return 0;
} }
static int sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque) static void sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque)
{ {
PlatformDevtreeData *data = opaque; PlatformDevtreeData *data = opaque;
bool matched = false; bool matched = false;
@ -211,8 +211,6 @@ static int sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque)
qdev_fw_name(DEVICE(sbdev))); qdev_fw_name(DEVICE(sbdev)));
exit(1); exit(1);
} }
return 0;
} }
static void platform_bus_create_devtree(PPCE500Params *params, void *fdt, static void platform_bus_create_devtree(PPCE500Params *params, void *fdt,

4
hw/ppc/spapr.c
View File

@ -1110,7 +1110,7 @@ static void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift,
} }
} }
static int find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque) static void find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque)
{ {
bool matched = false; bool matched = false;
@ -1123,8 +1123,6 @@ static int find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque)
qdev_fw_name(DEVICE(sbdev))); qdev_fw_name(DEVICE(sbdev)));
exit(1); exit(1);
} }
return 0;
} }
static void ppc_spapr_reset(void) static void ppc_spapr_reset(void)

2
include/hw/sysbus.h
View File

@ -75,7 +75,7 @@ struct SysBusDevice {
uint32_t pio[QDEV_MAX_PIO]; uint32_t pio[QDEV_MAX_PIO];
}; };
typedef int FindSysbusDeviceFunc(SysBusDevice *sbdev, void *opaque); typedef void FindSysbusDeviceFunc(SysBusDevice *sbdev, void *opaque);
void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *memory); void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *memory);
MemoryRegion *sysbus_mmio_get_region(SysBusDevice *dev, int n); MemoryRegion *sysbus_mmio_get_region(SysBusDevice *dev, int n);