Message ID | 20200605145625.2920920-15-armbru@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Crazy shit around -global (pardon my french) | expand |
On 6/5/20 4:56 PM, Markus Armbruster wrote: > We always pass &error_abort. Drop the parameter, use &error_abort > directly. > > Cc: Cédric Le Goater <clg@kaod.org> > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: Joel Stanley <joel@jms.id.au> > Cc: qemu-arm@nongnu.org > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > hw/arm/aspeed.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 5ffaf86b86..4ce6ca0ef5 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -215,8 +215,8 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr, size_t rom_size, > g_free(storage); > } > > -static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, > - Error **errp) > +static void aspeed_board_init_flashes(AspeedSMCState *s, > + const char *flashtype) > { > int i ; > > @@ -227,8 +227,8 @@ static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, > > fl->flash = qdev_new(flashtype); > if (dinfo) { > - qdev_prop_set_drive_err(fl->flash, "drive", > - blk_by_legacy_dinfo(dinfo), errp); > + qdev_prop_set_drive(fl->flash, "drive", > + blk_by_legacy_dinfo(dinfo)); > } > qdev_realize_and_unref(fl->flash, BUS(s->spi), &error_fatal); > > @@ -314,8 +314,8 @@ static void aspeed_machine_init(MachineState *machine) > "max_ram", max_ram_size - ram_size); > memory_region_add_subregion(&bmc->ram_container, ram_size, &bmc->max_ram); > > - aspeed_board_init_flashes(&bmc->soc.fmc, amc->fmc_model, &error_abort); > - aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model, &error_abort); > + aspeed_board_init_flashes(&bmc->soc.fmc, amc->fmc_model); > + aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model); > > /* Install first FMC flash content as a boot rom. */ > if (drive0) { >
On 6/5/20 4:56 PM, Markus Armbruster wrote: > We always pass &error_abort. Drop the parameter, use &error_abort > directly. > > Cc: Cédric Le Goater <clg@kaod.org> > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: Joel Stanley <joel@jms.id.au> > Cc: qemu-arm@nongnu.org > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/arm/aspeed.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 5ffaf86b86..4ce6ca0ef5 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -215,8 +215,8 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr, size_t rom_size, > g_free(storage); > } > > -static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, > - Error **errp) > +static void aspeed_board_init_flashes(AspeedSMCState *s, > + const char *flashtype) > { > int i ; > > @@ -227,8 +227,8 @@ static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, > > fl->flash = qdev_new(flashtype); > if (dinfo) { > - qdev_prop_set_drive_err(fl->flash, "drive", > - blk_by_legacy_dinfo(dinfo), errp); > + qdev_prop_set_drive(fl->flash, "drive", > + blk_by_legacy_dinfo(dinfo)); > } > qdev_realize_and_unref(fl->flash, BUS(s->spi), &error_fatal); > > @@ -314,8 +314,8 @@ static void aspeed_machine_init(MachineState *machine) > "max_ram", max_ram_size - ram_size); > memory_region_add_subregion(&bmc->ram_container, ram_size, &bmc->max_ram); > > - aspeed_board_init_flashes(&bmc->soc.fmc, amc->fmc_model, &error_abort); > - aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model, &error_abort); > + aspeed_board_init_flashes(&bmc->soc.fmc, amc->fmc_model); > + aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model); > > /* Install first FMC flash content as a boot rom. */ > if (drive0) { >
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 5ffaf86b86..4ce6ca0ef5 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -215,8 +215,8 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr, size_t rom_size, g_free(storage); } -static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, - Error **errp) +static void aspeed_board_init_flashes(AspeedSMCState *s, + const char *flashtype) { int i ; @@ -227,8 +227,8 @@ static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, fl->flash = qdev_new(flashtype); if (dinfo) { - qdev_prop_set_drive_err(fl->flash, "drive", - blk_by_legacy_dinfo(dinfo), errp); + qdev_prop_set_drive(fl->flash, "drive", + blk_by_legacy_dinfo(dinfo)); } qdev_realize_and_unref(fl->flash, BUS(s->spi), &error_fatal); @@ -314,8 +314,8 @@ static void aspeed_machine_init(MachineState *machine) "max_ram", max_ram_size - ram_size); memory_region_add_subregion(&bmc->ram_container, ram_size, &bmc->max_ram); - aspeed_board_init_flashes(&bmc->soc.fmc, amc->fmc_model, &error_abort); - aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model, &error_abort); + aspeed_board_init_flashes(&bmc->soc.fmc, amc->fmc_model); + aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model); /* Install first FMC flash content as a boot rom. */ if (drive0) {
We always pass &error_abort. Drop the parameter, use &error_abort directly. Cc: Cédric Le Goater <clg@kaod.org> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Andrew Jeffery <andrew@aj.id.au> Cc: Joel Stanley <joel@jms.id.au> Cc: qemu-arm@nongnu.org Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/arm/aspeed.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)