diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb/bus.c | 18 | ||||
| -rw-r--r-- | 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; } } |