motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 09:43:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: Propagate errors through usb_register_companion()

Browse source 
This loses the messages explaining the error printed with
error_printf_unless_qmp().  The next commit will make up for the loss.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Markus Armbruster 2015-02-17 14:28:02 +01:00 • committed by Gerd Hoffmann
parent 5a4992834d
commit f4bbaaf584
5 changed files with 44 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
hw/usb/hcd-ehci.c
View file

@ -769,30 +769,35 @@ static void ehci_wakeup(USBPort *port)
qemu_bh_schedule(s->async_bh);
}
static int ehci_register_companion(USBBus *bus, USBPort *ports[],
uint32_t portcount, uint32_t firstport)
static void ehci_register_companion(USBBus *bus, USBPort *ports[],
uint32_t portcount, uint32_t firstport,
Error **errp)
{
EHCIState *s = container_of(bus, EHCIState, bus);
uint32_t i;
if (firstport + portcount > NB_PORTS) {
qerror_report(QERR_INVALID_PARAMETER_VALUE, "firstport",
"firstport on masterbus");
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);
return -1;
#endif
return;
}
for (i = 0; i < portcount; i++) {
if (s->companion_ports[firstport + i]) {
qerror_report(QERR_INVALID_PARAMETER_VALUE, "masterbus",
"an USB masterbus");
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);
return -1;
#endif
return;
}
}
@ -806,8 +811,6 @@ static int ehci_register_companion(USBBus *bus, USBPort *ports[],
s->companion_count++;
s->caps[0x05] = (s->companion_count << 4) | portcount;
return 0;
}
static void ehci_wakeup_endpoint(USBBus *bus, USBEndpoint *ep,