Commit 64f0ad8a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-07-02' into staging 



Error reporting patches patches for 2020-07-02

# gpg: Signature made Thu 02 Jul 2020 10:55:48 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-07-02: (28 commits)
  migration/rdma: Plug memory leaks in qemu_rdma_registration_stop()
  arm/{bcm2835,fsl-imx25,fsl-imx6}: Fix realize error API violations
  hw/arm/armsse: Fix armsse_realize() error API violation
  aspeed: Fix realize error API violation
  arm/stm32f205 arm/stm32f405: Fix realize error API violation
  amd_iommu: Fix amdvi_realize() error API violation
  x86: Fix x86_cpu_new() error handling
  mips/cps: Fix mips_cps_realize() error API violations
  riscv_hart: Fix riscv_harts_realize() error API violations
  riscv/sifive_u: Fix sifive_u_soc_realize() error API violations
  hw/arm: Drop useless object_property_set_link() error handling
  hw: Fix error API violation around object_property_set_link()
  qdev: Drop qbus_set_hotplug_handler() parameter @errp
  qdev: Drop qbus_set_bus_hotplug_handler() parameter @errp
  aspeed: Clean up roundabout error propagation
  vnc: Plug minor memory leak in vnc_display_open()
  test-util-filemonitor: Plug unlikely memory leak
  sd/milkymist-memcard: Plug minor memory leak in realize
  qga: Plug unlikely memory leak in guest-set-memory-blocks
  spapr: Plug minor memory leak in spapr_machine_init()
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d0c8b957 9cde9caa

chardev/char-socket.c

+4 −5
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ static void check_report_connect_error(Chardev *chr, 
                          "Unable to connect character device %s: ",

                          chr->label);

        s->connect_err_reported = true;

    } else {

        error_free(err);

    }

    qemu_chr_socket_restart_timer(chr);

}
@@ -815,22 +817,20 @@ static void tcp_chr_tls_init(Chardev *chr) 
{

    SocketChardev *s = SOCKET_CHARDEV(chr);

    QIOChannelTLS *tioc;

    Error *err = NULL;

    gchar *name;



    if (s->is_listen) {

        tioc = qio_channel_tls_new_server(

            s->ioc, s->tls_creds,

            s->tls_authz,

            &err);

            NULL);

    } else {

        tioc = qio_channel_tls_new_client(

            s->ioc, s->tls_creds,

            s->addr->u.inet.host,

            &err);

            NULL);

    }

    if (tioc == NULL) {

        error_free(err);

        tcp_chr_disconnect(chr);

        return;

    }
@@ -1086,7 +1086,6 @@ static void qemu_chr_socket_connected(QIOTask *task, void *opaque) 
    if (qio_task_propagate_error(task, &err)) {

        tcp_chr_change_state(s, TCP_CHARDEV_STATE_DISCONNECTED);

        check_report_connect_error(chr, err);

        error_free(err);

        goto cleanup;

    }

hw/9pfs/9p.c

+2 −4
Original line number Diff line number Diff line
@@ -1399,7 +1399,6 @@ static void coroutine_fn v9fs_attach(void *opaque) 
    size_t offset = 7;

    V9fsQID qid;

    ssize_t err;

    Error *local_err = NULL;



    v9fs_string_init(&uname);

    v9fs_string_init(&aname);
@@ -1437,9 +1436,8 @@ static void coroutine_fn v9fs_attach(void *opaque) 
        error_setg(&s->migration_blocker,

                   "Migration is disabled when VirtFS export path '%s' is mounted in the guest using mount_tag '%s'",

                   s->ctx.fs_root ? s->ctx.fs_root : "NULL", s->tag);

        err = migrate_add_blocker(s->migration_blocker, &local_err);

        if (local_err) {

            error_free(local_err);

        err = migrate_add_blocker(s->migration_blocker, NULL);

        if (err < 0) {

            error_free(s->migration_blocker);

            s->migration_blocker = NULL;

            clunk_fid(s, fid);

hw/acpi/pcihp.c

+1 −2
Original line number Diff line number Diff line
@@ -246,8 +246,7 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, 
            object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {

            PCIBus *sec = pci_bridge_get_sec_bus(PCI_BRIDGE(pdev));



            qbus_set_hotplug_handler(BUS(sec), OBJECT(hotplug_dev),

                                     &error_abort);

            qbus_set_hotplug_handler(BUS(sec), OBJECT(hotplug_dev));

            /* We don't have to overwrite any other hotplug handler yet */

            assert(QLIST_EMPTY(&sec->child));

        }

hw/acpi/piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) 


    piix4_acpi_system_hot_add_init(pci_address_space_io(dev),

                                   pci_get_bus(dev), s);

    qbus_set_hotplug_handler(BUS(pci_get_bus(dev)), OBJECT(s), &error_abort);

    qbus_set_hotplug_handler(BUS(pci_get_bus(dev)), OBJECT(s));



    piix4_pm_add_propeties(s);

}

hw/arm/armsse.c

+16 −45
Original line number Diff line number Diff line
@@ -563,16 +563,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
                                                &s->container, -1);

        }

        object_property_set_link(cpuobj, OBJECT(&s->cpu_container[i]),

                                 "memory", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

        object_property_set_link(cpuobj, OBJECT(s), "idau", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

                                 "memory", &error_abort);

        object_property_set_link(cpuobj, OBJECT(s), "idau", &error_abort);

        sysbus_realize(SYS_BUS_DEVICE(cpuobj), &err);

        if (err) {

            error_propagate(errp, err);
@@ -699,11 +691,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
            return;

        }

        object_property_set_link(OBJECT(&s->mpc[i]), OBJECT(&s->sram[i]),

                                 "downstream", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

                                 "downstream", &error_abort);

        sysbus_realize(SYS_BUS_DEVICE(&s->mpc[i]), &err);

        if (err) {

            error_propagate(errp, err);
@@ -754,11 +742,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer0), 0,

                       armsse_get_common_irq_in(s, 3));

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer0), 0);

    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[0]", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[0]",

                             &error_abort);



    qdev_prop_set_uint32(DEVICE(&s->timer1), "pclk-frq", s->mainclk_frq);

    sysbus_realize(SYS_BUS_DEVICE(&s->timer1), &err);
@@ -769,12 +754,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer1), 0,

                       armsse_get_common_irq_in(s, 4));

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer1), 0);

    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]",

                             &error_abort);



    qdev_prop_set_uint32(DEVICE(&s->dualtimer), "pclk-frq", s->mainclk_frq);

    sysbus_realize(SYS_BUS_DEVICE(&s->dualtimer), &err);
@@ -785,11 +766,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->dualtimer), 0,

                       armsse_get_common_irq_in(s, 5));

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dualtimer), 0);

    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]",

                             &error_abort);



    if (info->has_mhus) {

        /*
@@ -814,12 +792,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
            port = g_strdup_printf("port[%d]", i + 3);

            mr = sysbus_mmio_get_region(mhu_sbd, 0);

            object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr),

                                     port, &err);

                                     port, &error_abort);

            g_free(port);

            if (err) {

                error_propagate(errp, err);

                return;

            }



            /*

             * Each MHU has an irq line for each CPU:
@@ -966,11 +940,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->s32ktimer), 0,

                       armsse_get_common_irq_in(s, 2));

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->s32ktimer), 0);

    object_property_set_link(OBJECT(&s->apb_ppc1), OBJECT(mr), "port[0]", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_link(OBJECT(&s->apb_ppc1), OBJECT(mr), "port[0]",

                             &error_abort);



    sysbus_realize(SYS_BUS_DEVICE(&s->apb_ppc1), &err);

    if (err) {
@@ -1019,13 +990,13 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
    sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysinfo), 0, 0x40020000);

    /* System control registers */

    object_property_set_int(OBJECT(&s->sysctl), info->sys_version,

                            "SYS_VERSION", &err);

                            "SYS_VERSION", &error_abort);

    object_property_set_int(OBJECT(&s->sysctl), info->cpuwait_rst,

                            "CPUWAIT_RST", &err);

                            "CPUWAIT_RST", &error_abort);

    object_property_set_int(OBJECT(&s->sysctl), s->init_svtor,

                            "INITSVTOR0_RST", &err);

                            "INITSVTOR0_RST", &error_abort);

    object_property_set_int(OBJECT(&s->sysctl), s->init_svtor,

                            "INITSVTOR1_RST", &err);

                            "INITSVTOR1_RST", &error_abort);

    sysbus_realize(SYS_BUS_DEVICE(&s->sysctl), &err);

    if (err) {

        error_propagate(errp, err);