Commit aacc7c8b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-05-27' into staging 



Error reporting patches for 2020-05-27

# gpg: Signature made Wed 27 May 2020 06:48:02 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-error-2020-05-27:
  i386: Fix x86_cpu_load_model() error API violation
  arm/sabrelite: Consistently use &error_fatal in sabrelite_init()
  mips/boston: Plug memory leak in boston_mach_init()
  mips/boston: Fix boston_mach_init() error handling
  mips/malta: Fix create_cps() error handling
  error: Use error_reportf_err() where appropriate
  tests/migration: Tighten error checking
  s390x/cpumodel: Fix harmless misuse of visit_check_struct()
  xen: Fix and improve handling of device_add usb-host errors
  nvdimm: Plug memory leak in uuid property setter

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8b92b9ef 49e2fa85

chardev/char-socket.c

+3 −2
Original line number Diff line number Diff line
@@ -138,8 +138,9 @@ static void check_report_connect_error(Chardev *chr, 
    SocketChardev *s = SOCKET_CHARDEV(chr);



    if (!s->connect_err_reported) {

        error_report("Unable to connect character device %s: %s",

                     chr->label, error_get_pretty(err));

        error_reportf_err(err,

                          "Unable to connect character device %s: ",

                          chr->label);

        s->connect_err_reported = true;

    }

    qemu_chr_socket_restart_timer(chr);

hw/arm/sabrelite.c

+1 −6
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ static void sabrelite_reset_secondary(ARMCPU *cpu, 
static void sabrelite_init(MachineState *machine)

{

    FslIMX6State *s;

    Error *err = NULL;



    /* Check the amount of memory is compatible with the SOC */

    if (machine->ram_size > FSL_IMX6_MMDC_SIZE) {
@@ -52,11 +51,7 @@ static void sabrelite_init(MachineState *machine) 


    s = FSL_IMX6(object_new(TYPE_FSL_IMX6));

    object_property_add_child(OBJECT(machine), "soc", OBJECT(s));

    object_property_set_bool(OBJECT(s), true, "realized", &err);

    if (err != NULL) {

        error_report("%s", error_get_pretty(err));

        exit(1);

    }

    object_property_set_bool(OBJECT(s), true, "realized", &error_fatal);



    memory_region_add_subregion(get_system_memory(), FSL_IMX6_MMDC_ADDR,

                                machine->ram);

hw/mem/nvdimm.c

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ static void nvdimm_set_uuid(Object *obj, Visitor *v, const char *name, 
    if (qemu_uuid_parse(value, &nvdimm->uuid) != 0) {

        error_setg(errp, "Property '%s.%s' has invalid value",

                   object_get_typename(obj), name);

        goto out;

    }

    g_free(value);

hw/mips/boston.c

+7 −10
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ static void boston_mach_init(MachineState *machine) 
{

    DeviceState *dev;

    BostonState *s;

    Error *err = NULL;

    MemoryRegion *flash, *ddr_low_alias, *lcd, *platreg;

    MemoryRegion *sys_mem = get_system_memory();

    XilinxPCIEHost *pcie2;
@@ -458,19 +457,17 @@ static void boston_mach_init(MachineState *machine) 
    sysbus_init_child_obj(OBJECT(machine), "cps", OBJECT(&s->cps),

                          sizeof(s->cps), TYPE_MIPS_CPS);

    object_property_set_str(OBJECT(&s->cps), machine->cpu_type, "cpu-type",

                            &err);

    object_property_set_int(OBJECT(&s->cps), machine->smp.cpus, "num-vp", &err);

    object_property_set_bool(OBJECT(&s->cps), true, "realized", &err);



    if (err != NULL) {

        error_report("%s", error_get_pretty(err));

        exit(1);

    }

                            &error_fatal);

    object_property_set_int(OBJECT(&s->cps), machine->smp.cpus, "num-vp",

                            &error_fatal);

    object_property_set_bool(OBJECT(&s->cps), true, "realized",

                             &error_fatal);



    sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->cps), 0, 0, 1);



    flash =  g_new(MemoryRegion, 1);

    memory_region_init_rom(flash, NULL, "boston.flash", 128 * MiB, &err);

    memory_region_init_rom(flash, NULL, "boston.flash", 128 * MiB,

                           &error_fatal);

    memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0);



    memory_region_add_subregion_overlap(sys_mem, 0x80000000, machine->ram, 0);

hw/mips/malta.c

+6 −9
Original line number Diff line number Diff line
@@ -1183,17 +1183,14 @@ static void create_cpu_without_cps(MachineState *ms, 
static void create_cps(MachineState *ms, MaltaState *s,

                       qemu_irq *cbus_irq, qemu_irq *i8259_irq)

{

    Error *err = NULL;



    sysbus_init_child_obj(OBJECT(s), "cps", OBJECT(&s->cps), sizeof(s->cps),

                          TYPE_MIPS_CPS);

    object_property_set_str(OBJECT(&s->cps), ms->cpu_type, "cpu-type", &err);

    object_property_set_int(OBJECT(&s->cps), ms->smp.cpus, "num-vp", &err);

    object_property_set_bool(OBJECT(&s->cps), true, "realized", &err);

    if (err != NULL) {

        error_report("%s", error_get_pretty(err));

        exit(1);

    }

    object_property_set_str(OBJECT(&s->cps), ms->cpu_type, "cpu-type",

                            &error_fatal);

    object_property_set_int(OBJECT(&s->cps), ms->smp.cpus, "num-vp",

                            &error_fatal);

    object_property_set_bool(OBJECT(&s->cps), true, "realized",

                             &error_fatal);



    sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->cps), 0, 0, 1);