Commit f4bbaaf5 authored by Markus Armbruster's avatar Markus Armbruster Committed by Gerd Hoffmann
Browse files

usb: Propagate errors through usb_register_companion() 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 5a499283

hw/usb/bus.c

+10 −7
Original line number Diff line number Diff line
@@ -360,9 +360,10 @@ void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, 
    bus->nfree++;

}



int usb_register_companion(const char *masterbus, USBPort *ports[],

void usb_register_companion(const char *masterbus, USBPort *ports[],

                            uint32_t portcount, uint32_t firstport,

                           void *opaque, USBPortOps *ops, int speedmask)

                            void *opaque, USBPortOps *ops, int speedmask,

                            Error **errp)

{

    USBBus *bus;

    int i;
@@ -374,21 +375,23 @@ int usb_register_companion(const char *masterbus, USBPort *ports[], 
    }



    if (!bus || !bus->ops->register_companion) {

        qerror_report(QERR_INVALID_PARAMETER_VALUE, "masterbus",

        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);

        }

        return -1;

#endif

        return;

    }



    for (i = 0; i < portcount; i++) {

        usb_fill_port(ports[i], opaque, i, ops, speedmask);

    }



    return bus->ops->register_companion(bus, ports, portcount, firstport);

    bus->ops->register_companion(bus, ports, portcount, firstport, errp);

}



void usb_port_location(USBPort *downstream, USBPort *upstream, int portnr)

hw/usb/hcd-ehci.c

+13 −10
Original line number Diff line number Diff line
@@ -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",

        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",

            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,

hw/usb/hcd-ohci.c

+7 −3
Original line number Diff line number Diff line
@@ -1832,6 +1832,7 @@ static int usb_ohci_init(OHCIState *ohci, DeviceState *dev, 
                         char *masterbus, uint32_t firstport,

                         AddressSpace *as)

{

    Error *err = NULL;

    int i;



    ohci->as = as;
@@ -1857,9 +1858,12 @@ static int usb_ohci_init(OHCIState *ohci, DeviceState *dev, 
        for(i = 0; i < num_ports; i++) {

            ports[i] = &ohci->rhport[i].port;

        }

        if (usb_register_companion(masterbus, ports, num_ports,

        usb_register_companion(masterbus, ports, num_ports,

                               firstport, ohci, &ohci_port_ops,

                USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL) != 0) {

                               USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL,

                               &err);

        if (err) {

            error_report_err(err);

            return -1;

        }

    } else {

hw/usb/hcd-uhci.c

+7 −3
Original line number Diff line number Diff line
@@ -1192,6 +1192,7 @@ static USBBusOps uhci_bus_ops = { 


static int usb_uhci_common_initfn(PCIDevice *dev)

{

    Error *err = NULL;

    PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);

    UHCIPCIDeviceClass *u = container_of(pc, UHCIPCIDeviceClass, parent_class);

    UHCIState *s = DO_UPCAST(UHCIState, dev, dev);
@@ -1209,9 +1210,12 @@ static int usb_uhci_common_initfn(PCIDevice *dev) 
        for(i = 0; i < NB_PORTS; i++) {

            ports[i] = &s->ports[i].port;

        }

        if (usb_register_companion(s->masterbus, ports, NB_PORTS,

        usb_register_companion(s->masterbus, ports, NB_PORTS,

                               s->firstport, s, &uhci_port_ops,

                USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL) != 0) {

                               USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL,

                               &err);

        if (err) {

            error_report_err(err);

            return -1;

        }

    } else {

include/hw/usb.h

+7 −5
Original line number Diff line number Diff line
@@ -526,8 +526,9 @@ struct USBBus { 
};



struct USBBusOps {

    int (*register_companion)(USBBus *bus, USBPort *ports[],

                              uint32_t portcount, uint32_t firstport);

    void (*register_companion)(USBBus *bus, USBPort *ports[],

                               uint32_t portcount, uint32_t firstport,

                               Error **errp);

    void (*wakeup_endpoint)(USBBus *bus, USBEndpoint *ep, unsigned int stream);

};
@@ -543,9 +544,10 @@ USBDevice *usb_create_simple(USBBus *bus, const char *name); 
USBDevice *usbdevice_create(const char *cmdline);

void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index,

                       USBPortOps *ops, int speedmask);

int usb_register_companion(const char *masterbus, USBPort *ports[],

void usb_register_companion(const char *masterbus, USBPort *ports[],

                            uint32_t portcount, uint32_t firstport,

                           void *opaque, USBPortOps *ops, int speedmask);

                            void *opaque, USBPortOps *ops, int speedmask,

                            Error **errp);

void usb_port_location(USBPort *downstream, USBPort *upstream, int portnr);

void usb_unregister_port(USBBus *bus, USBPort *port);

void usb_claim_port(USBDevice *dev, Error **errp);