[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/10] xen: Fix and improve handling of device_add usb-host errors
From: |
Markus Armbruster |
Subject: |
[PULL 02/10] xen: Fix and improve handling of device_add usb-host errors |
Date: |
Wed, 27 May 2020 07:59:37 +0200 |
usbback_portid_add() leaks the error when qdev_device_add() fails.
Fix that. While there, use the error to improve the error message.
The qemu_opts_from_qdict() similarly leaks on failure. But any
failure there is a programming error. Pass &error_abort.
Fixes: 816ac92ef769f9ffc534e49a1bb6177bddce7aa2
Cc: Stefano Stabellini <address@hidden>
Cc: Anthony Perard <address@hidden>
Cc: Paul Durrant <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Acked-by: Paul Durrant <address@hidden>
---
hw/usb/xen-usb.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c
index 961190d0f7..4d266d7bb4 100644
--- a/hw/usb/xen-usb.c
+++ b/hw/usb/xen-usb.c
@@ -30,6 +30,7 @@
#include "hw/usb.h"
#include "hw/xen/xen-legacy-backend.h"
#include "monitor/qdev.h"
+#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h"
@@ -755,13 +756,16 @@ static void usbback_portid_add(struct usbback_info
*usbif, unsigned port,
qdict_put_int(qdict, "port", port);
qdict_put_int(qdict, "hostbus", atoi(busid));
qdict_put_str(qdict, "hostport", portname);
- opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict, &local_err);
- if (local_err) {
- goto err;
- }
+ opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict,
+ &error_abort);
usbif->ports[port - 1].dev = USB_DEVICE(qdev_device_add(opts, &local_err));
if (!usbif->ports[port - 1].dev) {
- goto err;
+ qobject_unref(qdict);
+ xen_pv_printf(&usbif->xendev, 0,
+ "device %s could not be opened: %s\n",
+ busid, error_get_pretty(local_err));
+ error_free(local_err);
+ return;
}
qobject_unref(qdict);
speed = usbif->ports[port - 1].dev->speed;
@@ -793,11 +797,6 @@ static void usbback_portid_add(struct usbback_info *usbif,
unsigned port,
usbback_hotplug_enq(usbif, port);
TR_BUS(&usbif->xendev, "port %d attached\n", port);
- return;
-
-err:
- qobject_unref(qdict);
- xen_pv_printf(&usbif->xendev, 0, "device %s could not be opened\n", busid);
}
static void usbback_process_port(struct usbback_info *usbif, unsigned port)
--
2.21.3
- [PULL 00/10] Error reporting patches for 2020-05-27, Markus Armbruster, 2020/05/27
- [PULL 01/10] nvdimm: Plug memory leak in uuid property setter, Markus Armbruster, 2020/05/27
- [PULL 10/10] i386: Fix x86_cpu_load_model() error API violation, Markus Armbruster, 2020/05/27
- [PULL 03/10] s390x/cpumodel: Fix harmless misuse of visit_check_struct(), Markus Armbruster, 2020/05/27
- [PULL 05/10] error: Use error_reportf_err() where appropriate, Markus Armbruster, 2020/05/27
- [PULL 04/10] tests/migration: Tighten error checking, Markus Armbruster, 2020/05/27
- [PULL 06/10] mips/malta: Fix create_cps() error handling, Markus Armbruster, 2020/05/27
- [PULL 02/10] xen: Fix and improve handling of device_add usb-host errors,
Markus Armbruster <=
- [PULL 08/10] mips/boston: Plug memory leak in boston_mach_init(), Markus Armbruster, 2020/05/27
- [PULL 09/10] arm/sabrelite: Consistently use &error_fatal in sabrelite_init(), Markus Armbruster, 2020/05/27
- [PULL 07/10] mips/boston: Fix boston_mach_init() error handling, Markus Armbruster, 2020/05/27
- Re: [PULL 00/10] Error reporting patches for 2020-05-27, Peter Maydell, 2020/05/28