aboutsummaryrefslogtreecommitdiff
path: root/hw/misc/macio
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-07-07 18:05:32 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-07-10 15:01:06 +0200
commit118bfd76c9c604588cb3f97811710576f58e5a76 (patch)
tree0b3c83772d214c827e2aa87581e2b9126052d612 /hw/misc/macio
parente3fe3988d7851cac30abffae06d2f555ff7bee62 (diff)
downloadqemu-118bfd76c9c604588cb3f97811710576f58e5a76.zip
qemu-118bfd76c9c604588cb3f97811710576f58e5a76.tar.gz
qemu-118bfd76c9c604588cb3f97811710576f58e5a76.tar.bz2
qdev: Use returned bool to check for qdev_realize() etc. failure
Convert foo(..., &err); if (err) { ... } to if (!foo(..., &err)) { ... } for qdev_realize(), qdev_realize_and_unref(), qbus_realize() and their wrappers isa_realize_and_unref(), pci_realize_and_unref(), sysbus_realize(), sysbus_realize_and_unref(), usb_realize_and_unref(). Coccinelle script: @@ identifier fun = { isa_realize_and_unref, pci_realize_and_unref, qbus_realize, qdev_realize, qdev_realize_and_unref, sysbus_realize, sysbus_realize_and_unref, usb_realize_and_unref }; expression list args, args2; typedef Error; Error *err; @@ - fun(args, &err, args2); - if (err) + if (!fun(args, &err, args2)) { ... } Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error message "no position information". Nothing to convert there; skipped. Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by ARMSSE being used both as typedef and function-like macro there. Converted manually. A few line breaks tidied up manually. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Greg Kurz <groug@kaod.org> Message-Id: <20200707160613.848843-5-armbru@redhat.com>
Diffstat (limited to 'hw/misc/macio')
-rw-r--r--hw/misc/macio/cuda.c3
-rw-r--r--hw/misc/macio/macio.c18
-rw-r--r--hw/misc/macio/pmu.c3
3 files changed, 8 insertions, 16 deletions
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index 5bbc777..cc7c26d 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -526,8 +526,7 @@ static void cuda_realize(DeviceState *dev, Error **errp)
ADBBusState *adb_bus = &s->adb_bus;
struct tm tm;
- sysbus_realize(SYS_BUS_DEVICE(&s->mos6522_cuda), &err);
- if (err) {
+ if (!sysbus_realize(SYS_BUS_DEVICE(&s->mos6522_cuda), &err)) {
error_propagate(errp, err);
return;
}
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index 3251c79..4241479 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -100,8 +100,7 @@ static void macio_common_realize(PCIDevice *d, Error **errp)
SysBusDevice *sysbus_dev;
Error *err = NULL;
- qdev_realize(DEVICE(&s->dbdma), BUS(&s->macio_bus), &err);
- if (err) {
+ if (!qdev_realize(DEVICE(&s->dbdma), BUS(&s->macio_bus), &err)) {
error_propagate(errp, err);
return;
}
@@ -116,8 +115,7 @@ static void macio_common_realize(PCIDevice *d, Error **errp)
qdev_prop_set_chr(DEVICE(&s->escc), "chrB", serial_hd(1));
qdev_prop_set_uint32(DEVICE(&s->escc), "chnBtype", escc_serial);
qdev_prop_set_uint32(DEVICE(&s->escc), "chnAtype", escc_serial);
- qdev_realize(DEVICE(&s->escc), BUS(&s->macio_bus), &err);
- if (err) {
+ if (!qdev_realize(DEVICE(&s->escc), BUS(&s->macio_bus), &err)) {
error_propagate(errp, err);
return;
}
@@ -159,8 +157,7 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)
qdev_prop_set_uint64(DEVICE(&s->cuda), "timebase-frequency",
s->frequency);
- qdev_realize(DEVICE(&s->cuda), BUS(&s->macio_bus), &err);
- if (err) {
+ if (!qdev_realize(DEVICE(&s->cuda), BUS(&s->macio_bus), &err)) {
error_propagate(errp, err);
return;
}
@@ -176,8 +173,7 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)
sysbus_connect_irq(sysbus_dev, 1, qdev_get_gpio_in(pic_dev,
OLDWORLD_ESCCA_IRQ));
- qdev_realize(DEVICE(&os->nvram), BUS(&s->macio_bus), &err);
- if (err) {
+ if (!qdev_realize(DEVICE(&os->nvram), BUS(&s->macio_bus), &err)) {
error_propagate(errp, err);
return;
}
@@ -345,8 +341,7 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)
object_property_set_link(OBJECT(&s->pmu), OBJECT(sysbus_dev), "gpio",
&error_abort);
qdev_prop_set_bit(DEVICE(&s->pmu), "has-adb", ns->has_adb);
- qdev_realize(DEVICE(&s->pmu), BUS(&s->macio_bus), &err);
- if (err) {
+ if (!qdev_realize(DEVICE(&s->pmu), BUS(&s->macio_bus), &err)) {
error_propagate(errp, err);
return;
}
@@ -363,8 +358,7 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)
qdev_prop_set_uint64(DEVICE(&s->cuda), "timebase-frequency",
s->frequency);
- qdev_realize(DEVICE(&s->cuda), BUS(&s->macio_bus), &err);
- if (err) {
+ if (!qdev_realize(DEVICE(&s->cuda), BUS(&s->macio_bus), &err)) {
error_propagate(errp, err);
return;
}
diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 598d8e7..42ba963 100644
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -740,8 +740,7 @@ static void pmu_realize(DeviceState *dev, Error **errp)
ADBBusState *adb_bus = &s->adb_bus;
struct tm tm;
- sysbus_realize(SYS_BUS_DEVICE(&s->mos6522_pmu), &err);
- if (err) {
+ if (!sysbus_realize(SYS_BUS_DEVICE(&s->mos6522_pmu), &err)) {
error_propagate(errp, err);
return;
}