motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-10 19:14:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qom: Use returned bool to check for failure, Coccinelle part

Browse source 
The previous commit enables conversion of

    foo(..., &err);
    if (err) {
        ...
    }

to

    if (!foo(..., errp)) {
        ...
    }

for QOM functions that now return true / false on success / error.
Coccinelle script:

    @@
    identifier fun = {
        object_apply_global_props, object_initialize_child_with_props,
        object_initialize_child_with_propsv, object_property_get,
        object_property_get_bool, object_property_parse, object_property_set,
        object_property_set_bool, object_property_set_int,
        object_property_set_link, object_property_set_qobject,
        object_property_set_str, object_property_set_uint, object_set_props,
        object_set_propv, user_creatable_add_dict,
        user_creatable_complete, user_creatable_del
    };
    expression list args, args2;
    typedef Error;
    Error *err;
    @@
    -    fun(args, &err, args2);
    -    if (err)
    +    if (!fun(args, &err, args2))
         {
             ...
         }

Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.

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>
Message-Id: <20200707160613.848843-29-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-07-07 18:05:56 +02:00
parent 6fd5bef10b
commit 778a2dc592
28 changed files with 96 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

52
hw/arm/armsse.c
View file

@ -534,22 +534,20 @@ static void armsse_realize(DeviceState *dev, Error **errp)
* later if necessary.
*/
if (extract32(info->cpuwait_rst, i, 1)) {
object_property_set_bool(cpuobj, "start-powered-off", true, &err);
if (err) {
if (!object_property_set_bool(cpuobj, "start-powered-off", true,
&err)) {
error_propagate(errp, err);
return;
}
}
if (!s->cpu_fpu[i]) {
object_property_set_bool(cpuobj, "vfp", false, &err);
if (err) {
if (!object_property_set_bool(cpuobj, "vfp", false, &err)) {
error_propagate(errp, err);
return;
}
}
if (!s->cpu_dsp[i]) {
object_property_set_bool(cpuobj, "dsp", false, &err);
if (err) {
if (!object_property_set_bool(cpuobj, "dsp", false, &err)) {
error_propagate(errp, err);
return;
}
@ -604,9 +602,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
DeviceState *devs = DEVICE(splitter);
int cpunum;
object_property_set_int(splitter, "num-lines", info->num_cpus,
&err);
if (err) {
if (!object_property_set_int(splitter, "num-lines",
info->num_cpus, &err)) {
error_propagate(errp, err);
return;
}
@ -658,9 +655,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
* multiple lines, one for each of the PPCs within the ARMSSE and one
* that will be an output from the ARMSSE to the system.
*/
object_property_set_int(OBJECT(&s->sec_resp_splitter), "num-lines", 3,
&err);
if (err) {
if (!object_property_set_int(OBJECT(&s->sec_resp_splitter),
"num-lines", 3, &err)) {
error_propagate(errp, err);
return;
}
@ -702,9 +698,9 @@ static void armsse_realize(DeviceState *dev, Error **errp)
}
/* We must OR together lines from the MPC splitters to go to the NVIC */
object_property_set_int(OBJECT(&s->mpc_irq_orgate), "num-lines",
IOTS_NUM_EXP_MPC + info->sram_banks, &err);
if (err) {
if (!object_property_set_int(OBJECT(&s->mpc_irq_orgate), "num-lines",
IOTS_NUM_EXP_MPC + info->sram_banks,
&err)) {
error_propagate(errp, err);
return;
}
@ -841,9 +837,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
* ones) are sent individually to the security controller, and also
* ORed together to give a single combined PPC interrupt to the NVIC.
*/
object_property_set_int(OBJECT(&s->ppc_irq_orgate), "num-lines", NUM_PPCS,
&err);
if (err) {
if (!object_property_set_int(OBJECT(&s->ppc_irq_orgate),
"num-lines", NUM_PPCS, &err)) {
error_propagate(errp, err);
return;
}
@ -949,15 +944,13 @@ static void armsse_realize(DeviceState *dev, Error **errp)
qdev_get_gpio_in_named(dev_apb_ppc1,
"cfg_sec_resp", 0));
object_property_set_int(OBJECT(&s->sysinfo), "SYS_VERSION",
info->sys_version, &err);
if (err) {
if (!object_property_set_int(OBJECT(&s->sysinfo), "SYS_VERSION",
info->sys_version, &err)) {
error_propagate(errp, err);
return;
}
object_property_set_int(OBJECT(&s->sysinfo), "SYS_CONFIG",
armsse_sys_config_value(s, info), &err);
if (err) {
if (!object_property_set_int(OBJECT(&s->sysinfo), "SYS_CONFIG",
armsse_sys_config_value(s, info), &err)) {
error_propagate(errp, err);
return;
}
@ -1005,8 +998,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
}
/* This OR gate wires together outputs from the secure watchdogs to NMI */
object_property_set_int(OBJECT(&s->nmi_orgate), "num-lines", 2, &err);
if (err) {
if (!object_property_set_int(OBJECT(&s->nmi_orgate), "num-lines", 2,
&err)) {
error_propagate(errp, err);
return;
}
@ -1049,8 +1042,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
for (i = 0; i < ARRAY_SIZE(s->ppc_irq_splitter); i++) {
Object *splitter = OBJECT(&s->ppc_irq_splitter[i]);
object_property_set_int(splitter, "num-lines", 2, &err);
if (err) {
if (!object_property_set_int(splitter, "num-lines", 2, &err)) {
error_propagate(errp, err);
return;
}
@ -1095,8 +1087,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
SplitIRQ *splitter = &s->mpc_irq_splitter[i];
DeviceState *dev_splitter = DEVICE(splitter);
object_property_set_int(OBJECT(splitter), "num-lines", 2, &err);
if (err) {
if (!object_property_set_int(OBJECT(splitter), "num-lines", 2,
&err)) {
error_propagate(errp, err);
return;
}

20
hw/arm/armv7m.c
View file

@ -174,31 +174,27 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
&error_abort);
}
if (object_property_find(OBJECT(s->cpu), "init-svtor", NULL)) {
object_property_set_uint(OBJECT(s->cpu), "init-svtor", s->init_svtor,
&err);
if (err != NULL) {
if (!object_property_set_uint(OBJECT(s->cpu), "init-svtor",
s->init_svtor, &err)) {
error_propagate(errp, err);
return;
}
}
if (object_property_find(OBJECT(s->cpu), "start-powered-off", NULL)) {
object_property_set_bool(OBJECT(s->cpu), "start-powered-off",
s->start_powered_off, &err);
if (err != NULL) {
if (!object_property_set_bool(OBJECT(s->cpu), "start-powered-off",
s->start_powered_off, &err)) {
error_propagate(errp, err);
return;
}
}
if (object_property_find(OBJECT(s->cpu), "vfp", NULL)) {
object_property_set_bool(OBJECT(s->cpu), "vfp", s->vfp, &err);
if (err != NULL) {
if (!object_property_set_bool(OBJECT(s->cpu), "vfp", s->vfp, &err)) {
error_propagate(errp, err);
return;
}
}
if (object_property_find(OBJECT(s->cpu), "dsp", NULL)) {
object_property_set_bool(OBJECT(s->cpu), "dsp", s->dsp, &err);
if (err != NULL) {
if (!object_property_set_bool(OBJECT(s->cpu), "dsp", s->dsp, &err)) {
error_propagate(errp, err);
return;
}
@ -243,8 +239,8 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
Object *obj = OBJECT(&s->bitband[i]);
SysBusDevice *sbd = SYS_BUS_DEVICE(&s->bitband[i]);
object_property_set_int(obj, "base", bitband_input_addr[i], &err);
if (err != NULL) {
if (!object_property_set_int(obj, "base",
bitband_input_addr[i], &err)) {
error_propagate(errp, err);
return;
}

5
hw/arm/aspeed_ast2600.c
View file

@ -356,9 +356,8 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
/* FMC, The number of CS is set at the board level */
object_property_set_link(OBJECT(&s->fmc), "dram", OBJECT(s->dram_mr),
&error_abort);
object_property_set_int(OBJECT(&s->fmc), "sdram-base",
sc->memmap[ASPEED_SDRAM], &err);
if (err) {
if (!object_property_set_int(OBJECT(&s->fmc), "sdram-base",
sc->memmap[ASPEED_SDRAM], &err)) {
error_propagate(errp, err);
return;
}

5
hw/arm/aspeed_soc.c
View file

@ -308,9 +308,8 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
/* FMC, The number of CS is set at the board level */
object_property_set_link(OBJECT(&s->fmc), "dram", OBJECT(s->dram_mr),
&error_abort);
object_property_set_int(OBJECT(&s->fmc), "sdram-base",
sc->memmap[ASPEED_SDRAM], &err);
if (err) {
if (!object_property_set_int(OBJECT(&s->fmc), "sdram-base",
sc->memmap[ASPEED_SDRAM], &err)) {
error_propagate(errp, err);
return;
}

5
hw/arm/bcm2835_peripherals.c
View file

@ -222,9 +222,8 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
return;
}
object_property_set_uint(OBJECT(&s->fb), "vcram-base",
ram_size - vcram_size, &err);
if (err) {
if (!object_property_set_uint(OBJECT(&s->fb), "vcram-base",
ram_size - vcram_size, &err)) {
error_propagate(errp, err);
return;
}

12
hw/arm/bcm2836.c
View file

@ -110,17 +110,17 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
s->cpu[n].core.mp_affinity = (info->clusterid << 8) | n;
/* set periphbase/CBAR value for CPU-local registers */
object_property_set_int(OBJECT(&s->cpu[n].core), "reset-cbar",
info->peri_base, &err);
if (err) {
if (!object_property_set_int(OBJECT(&s->cpu[n].core), "reset-cbar",
info->peri_base, &err)) {
error_propagate(errp, err);
return;
}
/* start powered off if not enabled */
object_property_set_bool(OBJECT(&s->cpu[n].core), "start-powered-off",
n >= s->enabled_cpus, &err);
if (err) {
if (!object_property_set_bool(OBJECT(&s->cpu[n].core),
"start-powered-off",
n >= s->enabled_cpus,
&err)) {
error_propagate(errp, err);
return;
}

11
hw/arm/cubieboard.c
View file

@ -62,20 +62,19 @@ static void cubieboard_init(MachineState *machine)
object_property_add_child(OBJECT(machine), "soc", OBJECT(a10));
object_unref(OBJECT(a10));
object_property_set_int(OBJECT(&a10->emac), "phy-addr", 1, &err);
if (err != NULL) {
if (!object_property_set_int(OBJECT(&a10->emac), "phy-addr", 1, &err)) {
error_reportf_err(err, "Couldn't set phy address: ");
exit(1);
}
object_property_set_int(OBJECT(&a10->timer), "clk0-freq", 32768, &err);
if (err != NULL) {
if (!object_property_set_int(OBJECT(&a10->timer), "clk0-freq", 32768,
&err)) {
error_reportf_err(err, "Couldn't set clk0 frequency: ");
exit(1);
}
object_property_set_int(OBJECT(&a10->timer), "clk1-freq", 24000000, &err);
if (err != NULL) {
if (!object_property_set_int(OBJECT(&a10->timer), "clk1-freq", 24000000,
&err)) {
error_reportf_err(err, "Couldn't set clk1 frequency: ");
exit(1);
}

4
hw/arm/digic.c
View file

@ -56,8 +56,8 @@ static void digic_realize(DeviceState *dev, Error **errp)
SysBusDevice *sbd;
int i;
object_property_set_bool(OBJECT(&s->cpu), "reset-hivecs", true, &err);
if (err != NULL) {
if (!object_property_set_bool(OBJECT(&s->cpu), "reset-hivecs", true,
&err)) {
error_propagate(errp, err);
return;
}

8
hw/arm/nrf51_soc.c
View file

@ -106,9 +106,8 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)
BASE_TO_IRQ(NRF51_RNG_BASE)));
/* UICR, FICR, NVMC, FLASH */
object_property_set_uint(OBJECT(&s->nvm), "flash-size", s->flash_size,
&err);
if (err) {
if (!object_property_set_uint(OBJECT(&s->nvm), "flash-size",
s->flash_size, &err)) {
error_propagate(errp, err);
return;
}
@ -141,8 +140,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)
/* TIMER */
for (i = 0; i < NRF51_NUM_TIMERS; i++) {
object_property_set_uint(OBJECT(&s->timer[i]), "id", i, &err);
if (err) {
if (!object_property_set_uint(OBJECT(&s->timer[i]), "id", i, &err)) {
error_propagate(errp, err);
return;
}

7
hw/arm/stm32f405_soc.c
View file

@ -160,10 +160,9 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)
}
/* ADC device, the IRQs are ORed together */
object_initialize_child_with_props(OBJECT(s), "adc-orirq", &s->adc_irqs,
sizeof(s->adc_irqs), TYPE_OR_IRQ, &err,
NULL);
if (err != NULL) {
if (!object_initialize_child_with_props(OBJECT(s), "adc-orirq",
&s->adc_irqs, sizeof(s->adc_irqs),
TYPE_OR_IRQ, &err, NULL)) {
error_propagate(errp, err);
return;
}

14
hw/arm/xlnx-zynqmp.c
View file

@ -507,18 +507,16 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
* - SDIO Specification Version 3.0
* - eMMC Specification Version 4.51
*/
object_property_set_uint(sdhci, "sd-spec-version", 3, &err);
if (err) {
if (!object_property_set_uint(sdhci, "sd-spec-version", 3, &err)) {
error_propagate(errp, err);
return;
}
object_property_set_uint(sdhci, "capareg", SDHCI_CAPABILITIES, &err);
if (err) {
if (!object_property_set_uint(sdhci, "capareg", SDHCI_CAPABILITIES,
&err)) {
error_propagate(errp, err);
return;
}
object_property_set_uint(sdhci, "uhs", UHS_I, &err);
if (err) {
if (!object_property_set_uint(sdhci, "uhs", UHS_I, &err)) {
error_propagate(errp, err);
return;
}
@ -606,8 +604,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
sysbus_connect_irq(SYS_BUS_DEVICE(&s->rtc), 0, gic_spi[RTC_IRQ]);
for (i = 0; i < XLNX_ZYNQMP_NUM_GDMA_CH; i++) {
object_property_set_uint(OBJECT(&s->gdma[i]), "bus-width", 128, &err);
if (err) {
if (!object_property_set_uint(OBJECT(&s->gdma[i]), "bus-width", 128,
&err)) {
error_propagate(errp, err);
return;
}