From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYDhf-0006Yv-7w for qemu-devel@nongnu.org; Wed, 18 Mar 2015 09:08:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYDhZ-0005ug-91 for qemu-devel@nongnu.org; Wed, 18 Mar 2015 09:08:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYDhZ-0005uO-1C for qemu-devel@nongnu.org; Wed, 18 Mar 2015 09:08:01 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id B4497C6572 for ; Wed, 18 Mar 2015 13:08:00 +0000 (UTC) From: Gerd Hoffmann Date: Wed, 18 Mar 2015 14:07:44 +0100 Message-Id: <1426684075-27224-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1426684075-27224-1-git-send-email-kraxel@redhat.com> References: <1426684075-27224-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 02/13] usb: Improve companion configuration error messages List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Gerd Hoffmann From: Markus Armbruster The previous commit broke the additional messages explaining the error messages. Improve the error messages, so they don't need explaining so much. Helps QMP users as well, unlike additional explanations. Signed-off-by: Markus Armbruster Signed-off-by: Gerd Hoffmann --- hw/usb/bus.c | 18 ++++++++---------- hw/usb/hcd-ehci.c | 21 ++++++--------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 98e33ea..3751675 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -374,16 +374,14 @@ void usb_register_companion(const char *masterbus, USBPort *ports[], } } - if (!bus || !bus->ops->register_companion) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "masterbus", - "an USB masterbus"); -#if 0 /* conversion from qerror_report() to error_set() broke this: */ - if (bus) { - error_printf_unless_qmp( - "USB bus '%s' does not allow companion controllers\n", - masterbus); - } -#endif + if (!bus) { + error_setg(errp, "USB bus '%s' not found", masterbus); + return; + } + if (!bus->ops->register_companion) { + error_setg(errp, "Can't use USB bus '%s' as masterbus," + " it doesn't support companion controllers", + masterbus); return; } diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 7d16ba8..5c2a452 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -777,26 +777,17 @@ static void ehci_register_companion(USBBus *bus, USBPort *ports[], uint32_t i; if (firstport + portcount > NB_PORTS) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "firstport", - "firstport on masterbus"); -#if 0 /* conversion from qerror_report() to error_set() broke this: */ - error_printf_unless_qmp( - "firstport value of %u makes companion take ports %u - %u, which " - "is outside of the valid range of 0 - %u\n", firstport, firstport, - firstport + portcount - 1, NB_PORTS - 1); -#endif + error_setg(errp, "firstport must be between 0 and %u", + NB_PORTS - portcount); return; } for (i = 0; i < portcount; i++) { if (s->companion_ports[firstport + i]) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "masterbus", - "an USB masterbus"); -#if 0 /* conversion from qerror_report() to error_set() broke this: */ - error_printf_unless_qmp( - "port %u on masterbus %s already has a companion assigned\n", - firstport + i, bus->qbus.name); -#endif + error_setg(errp, "firstport %u asks for ports %u-%u," + " but port %u has a companion assigned already", + firstport, firstport, firstport + portcount - 1, + firstport + i); return; } } -- 1.8.3.1