Commit 4ae740cc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150508-1' into staging 



usb: qomify, bugfixes for xhci & uhci.

# gpg: Signature made Fri May  8 12:39:28 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-20150508-1:
  uhci: controller is halted after reset
  usb: usb-serial QOMify
  usb: usb-redir QOMify
  usb: usb-wacom-tablet QOMify
  usb: usb-uas QOMify
  usb: usb-storage QOMify
  usb: usb-ccid QOMify
  usb: usb-net QOMify
  usb-mtp: fix segmentation fault
  usb: usb-mtp QOMify
  usb: usb-hub QOMify
  usb: usb-hid QOMify
  usb: usb-bt QOMify
  usb: usb-audio QOMify
  uhci: QOMify
  xhci: fix events for setup trb.
  Revert "xhci: generate a Transfer Event for each Transfer TRB with the IOC bit set"
  xhci: set timer to retry xfers
  usb: fix usb-net segfault

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fc85cf4a ca5a21c4

hw/usb/dev-audio.c

+13 −10
Original line number Diff line number Diff line
@@ -361,6 +361,9 @@ typedef struct USBAudioState { 
    uint32_t buffer;

} USBAudioState;



#define TYPE_USB_AUDIO "usb-audio"

#define USB_AUDIO(obj) OBJECT_CHECK(USBAudioState, (obj), TYPE_USB_AUDIO)



static void output_callback(void *opaque, int avail)

{

    USBAudioState *s = opaque;
@@ -506,7 +509,7 @@ static void usb_audio_handle_control(USBDevice *dev, USBPacket *p, 
                                    int request, int value, int index,

                                    int length, uint8_t *data)

{

    USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);

    USBAudioState *s = USB_AUDIO(dev);

    int ret = 0;



    if (s->debug) {
@@ -565,7 +568,7 @@ fail: 
static void usb_audio_set_interface(USBDevice *dev, int iface,

                                    int old, int value)

{

    USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);

    USBAudioState *s = USB_AUDIO(dev);



    if (iface == 1) {

        usb_audio_set_output_altset(s, value);
@@ -574,7 +577,7 @@ static void usb_audio_set_interface(USBDevice *dev, int iface, 


static void usb_audio_handle_reset(USBDevice *dev)

{

    USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);

    USBAudioState *s = USB_AUDIO(dev);



    if (s->debug) {

        fprintf(stderr, "usb-audio: reset\n");
@@ -615,7 +618,7 @@ static void usb_audio_handle_data(USBDevice *dev, USBPacket *p) 


static void usb_audio_handle_destroy(USBDevice *dev)

{

    USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);

    USBAudioState *s = USB_AUDIO(dev);



    if (s->debug) {

        fprintf(stderr, "usb-audio: destroy\n");
@@ -630,12 +633,12 @@ static void usb_audio_handle_destroy(USBDevice *dev) 


static void usb_audio_realize(USBDevice *dev, Error **errp)

{

    USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);

    USBAudioState *s = USB_AUDIO(dev);



    usb_desc_create_serial(dev);

    usb_desc_init(dev);

    s->dev.opaque = s;

    AUD_register_card("usb-audio", &s->card);

    AUD_register_card(TYPE_USB_AUDIO, &s->card);



    s->out.altset        = ALTSET_OFF;

    s->out.mute          = false;
@@ -647,14 +650,14 @@ static void usb_audio_realize(USBDevice *dev, Error **errp) 
    s->out.as.endianness = 0;

    streambuf_init(&s->out.buf, s->buffer);



    s->out.voice = AUD_open_out(&s->card, s->out.voice, "usb-audio",

    s->out.voice = AUD_open_out(&s->card, s->out.voice, TYPE_USB_AUDIO,

                                s, output_callback, &s->out.as);

    AUD_set_volume_out(s->out.voice, s->out.mute, s->out.vol[0], s->out.vol[1]);

    AUD_set_active_out(s->out.voice, 0);

}



static const VMStateDescription vmstate_usb_audio = {

    .name = "usb-audio",

    .name = TYPE_USB_AUDIO,

    .unmigratable = 1,

};
@@ -684,7 +687,7 @@ static void usb_audio_class_init(ObjectClass *klass, void *data) 
}



static const TypeInfo usb_audio_info = {

    .name          = "usb-audio",

    .name          = TYPE_USB_AUDIO,

    .parent        = TYPE_USB_DEVICE,

    .instance_size = sizeof(USBAudioState),

    .class_init    = usb_audio_class_init,
@@ -693,7 +696,7 @@ static const TypeInfo usb_audio_info = { 
static void usb_audio_register_types(void)

{

    type_register_static(&usb_audio_info);

    usb_legacy_register("usb-audio", "audio", NULL);

    usb_legacy_register(TYPE_USB_AUDIO, "audio", NULL);

}



type_init(usb_audio_register_types)

hw/usb/dev-bluetooth.c

+8 −5
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ struct USBBtState { 
    } outcmd, outacl, outsco;

};



#define TYPE_USB_BT "usb-bt-dongle"

#define USB_BT(obj) OBJECT_CHECK(struct USBBtState, (obj), TYPE_USB_BT)



#define USB_EVT_EP	1

#define USB_ACL_EP	2

#define USB_SCO_EP	3
@@ -503,7 +506,7 @@ static void usb_bt_handle_destroy(USBDevice *dev) 


static void usb_bt_realize(USBDevice *dev, Error **errp)

{

    struct USBBtState *s = DO_UPCAST(struct USBBtState, dev, dev);

    struct USBBtState *s = USB_BT(dev);



    usb_desc_create_serial(dev);

    usb_desc_init(dev);
@@ -523,7 +526,7 @@ static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline) 
    USBDevice *dev;

    struct USBBtState *s;

    HCIInfo *hci;

    const char *name = "usb-bt-dongle";

    const char *name = TYPE_USB_BT;



    if (*cmdline) {

        hci = hci_init(cmdline);
@@ -534,7 +537,7 @@ static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline) 
        return NULL;



    dev = usb_create(bus, name);

    s = DO_UPCAST(struct USBBtState, dev, dev);

    s = USB_BT(dev);

    s->hci = hci;

    return dev;

}
@@ -561,7 +564,7 @@ static void usb_bt_class_initfn(ObjectClass *klass, void *data) 
}



static const TypeInfo bt_info = {

    .name          = "usb-bt-dongle",

    .name          = TYPE_USB_BT,

    .parent        = TYPE_USB_DEVICE,

    .instance_size = sizeof(struct USBBtState),

    .class_init    = usb_bt_class_initfn,
@@ -570,7 +573,7 @@ static const TypeInfo bt_info = { 
static void usb_bt_register_types(void)

{

    type_register_static(&bt_info);

    usb_legacy_register("usb-bt-dongle", "bt", usb_bt_init);

    usb_legacy_register(TYPE_USB_BT, "bt", usb_bt_init);

}



type_init(usb_bt_register_types)

hw/usb/dev-hid.c

+20 −14
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ typedef struct USBHIDState { 
    uint32_t head;

} USBHIDState;



#define TYPE_USB_HID "usb-hid"

#define USB_HID(obj) OBJECT_CHECK(USBHIDState, (obj), TYPE_USB_HID)



enum {

    STR_MANUFACTURER = 1,

    STR_PRODUCT_MOUSE,
@@ -564,7 +567,7 @@ static void usb_hid_changed(HIDState *hs) 


static void usb_hid_handle_reset(USBDevice *dev)

{

    USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);

    USBHIDState *us = USB_HID(dev);



    hid_reset(&us->hid);

}
@@ -572,7 +575,7 @@ static void usb_hid_handle_reset(USBDevice *dev) 
static void usb_hid_handle_control(USBDevice *dev, USBPacket *p,

               int request, int value, int index, int length, uint8_t *data)

{

    USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);

    USBHIDState *us = USB_HID(dev);

    HIDState *hs = &us->hid;

    int ret;
@@ -651,7 +654,7 @@ static void usb_hid_handle_control(USBDevice *dev, USBPacket *p, 


static void usb_hid_handle_data(USBDevice *dev, USBPacket *p)

{

    USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);

    USBHIDState *us = USB_HID(dev);

    HIDState *hs = &us->hid;

    uint8_t buf[p->iov.size];

    int len = 0;
@@ -687,7 +690,7 @@ static void usb_hid_handle_data(USBDevice *dev, USBPacket *p) 


static void usb_hid_handle_destroy(USBDevice *dev)

{

    USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);

    USBHIDState *us = USB_HID(dev);



    hid_free(&us->hid);

}
@@ -696,7 +699,7 @@ static void usb_hid_initfn(USBDevice *dev, int kind, 
                           const USBDesc *usb1, const USBDesc *usb2,

                           Error **errp)

{

    USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);

    USBHIDState *us = USB_HID(dev);

    switch (us->usb_version) {

    case 1:

        dev->usb_desc = usb1;
@@ -784,6 +787,14 @@ static void usb_hid_class_initfn(ObjectClass *klass, void *data) 
    uc->handle_attach  = usb_desc_attach;

}



static const TypeInfo usb_hid_type_info = {

    .name = TYPE_USB_HID,

    .parent = TYPE_USB_DEVICE,

    .instance_size = sizeof(USBHIDState),

    .abstract = true,

    .class_init = usb_hid_class_initfn,

};



static Property usb_tablet_properties[] = {

        DEFINE_PROP_UINT32("usb_version", USBHIDState, usb_version, 2),

        DEFINE_PROP_STRING("display", USBHIDState, display),
@@ -796,7 +807,6 @@ static void usb_tablet_class_initfn(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    USBDeviceClass *uc = USB_DEVICE_CLASS(klass);



    usb_hid_class_initfn(klass, data);

    uc->realize        = usb_tablet_realize;

    uc->product_desc   = "QEMU USB Tablet";

    dc->vmsd = &vmstate_usb_ptr;
@@ -806,8 +816,7 @@ static void usb_tablet_class_initfn(ObjectClass *klass, void *data) 


static const TypeInfo usb_tablet_info = {

    .name          = "usb-tablet",

    .parent        = TYPE_USB_DEVICE,

    .instance_size = sizeof(USBHIDState),

    .parent        = TYPE_USB_HID,

    .class_init    = usb_tablet_class_initfn,

};
@@ -821,7 +830,6 @@ static void usb_mouse_class_initfn(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    USBDeviceClass *uc = USB_DEVICE_CLASS(klass);



    usb_hid_class_initfn(klass, data);

    uc->realize        = usb_mouse_realize;

    uc->product_desc   = "QEMU USB Mouse";

    dc->vmsd = &vmstate_usb_ptr;
@@ -831,8 +839,7 @@ static void usb_mouse_class_initfn(ObjectClass *klass, void *data) 


static const TypeInfo usb_mouse_info = {

    .name          = "usb-mouse",

    .parent        = TYPE_USB_DEVICE,

    .instance_size = sizeof(USBHIDState),

    .parent        = TYPE_USB_HID,

    .class_init    = usb_mouse_class_initfn,

};
@@ -847,7 +854,6 @@ static void usb_keyboard_class_initfn(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    USBDeviceClass *uc = USB_DEVICE_CLASS(klass);



    usb_hid_class_initfn(klass, data);

    uc->realize        = usb_keyboard_realize;

    uc->product_desc   = "QEMU USB Keyboard";

    dc->vmsd = &vmstate_usb_kbd;
@@ -857,13 +863,13 @@ static void usb_keyboard_class_initfn(ObjectClass *klass, void *data) 


static const TypeInfo usb_keyboard_info = {

    .name          = "usb-kbd",

    .parent        = TYPE_USB_DEVICE,

    .instance_size = sizeof(USBHIDState),

    .parent        = TYPE_USB_HID,

    .class_init    = usb_keyboard_class_initfn,

};



static void usb_hid_register_types(void)

{

    type_register_static(&usb_hid_type_info);

    type_register_static(&usb_tablet_info);

    usb_legacy_register("usb-tablet", "tablet", NULL);

    type_register_static(&usb_mouse_info);

hw/usb/dev-hub.c

+7 −4
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ typedef struct USBHubState { 
    USBHubPort ports[NUM_PORTS];

} USBHubState;



#define TYPE_USB_HUB "usb-hub"

#define USB_HUB(obj) OBJECT_CHECK(USBHubState, (obj), TYPE_USB_HUB)



#define ClearHubFeature		(0x2000 | USB_REQ_CLEAR_FEATURE)

#define ClearPortFeature	(0x2300 | USB_REQ_CLEAR_FEATURE)

#define GetHubDescriptor	(0xa000 | USB_REQ_GET_DESCRIPTOR)
@@ -227,7 +230,7 @@ static void usb_hub_complete(USBPort *port, USBPacket *packet) 


static USBDevice *usb_hub_find_device(USBDevice *dev, uint8_t addr)

{

    USBHubState *s = DO_UPCAST(USBHubState, dev, dev);

    USBHubState *s = USB_HUB(dev);

    USBHubPort *port;

    USBDevice *downstream;

    int i;
@@ -247,7 +250,7 @@ static USBDevice *usb_hub_find_device(USBDevice *dev, uint8_t addr) 


static void usb_hub_handle_reset(USBDevice *dev)

{

    USBHubState *s = DO_UPCAST(USBHubState, dev, dev);

    USBHubState *s = USB_HUB(dev);

    USBHubPort *port;

    int i;
@@ -513,7 +516,7 @@ static USBPortOps usb_hub_port_ops = { 


static void usb_hub_realize(USBDevice *dev, Error **errp)

{

    USBHubState *s = DO_UPCAST(USBHubState, dev, dev);

    USBHubState *s = USB_HUB(dev);

    USBHubPort *port;

    int i;
@@ -577,7 +580,7 @@ static void usb_hub_class_initfn(ObjectClass *klass, void *data) 
}



static const TypeInfo hub_info = {

    .name          = "usb-hub",

    .name          = TYPE_USB_HUB,

    .parent        = TYPE_USB_DEVICE,

    .instance_size = sizeof(USBHubState),

    .class_init    = usb_hub_class_initfn,

hw/usb/dev-mtp.c

+11 −4
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ struct MTPState { 
    QTAILQ_HEAD(, MTPObject) objects;

};



#define TYPE_USB_MTP "usb-mtp"

#define USB_MTP(obj) OBJECT_CHECK(MTPState, (obj), TYPE_USB_MTP)



#define QEMU_STORAGE_ID 0x00010001



#define MTP_FLAG_WRITABLE 0
@@ -878,7 +881,7 @@ static void usb_mtp_command(MTPState *s, MTPControl *c) 


static void usb_mtp_handle_reset(USBDevice *dev)

{

    MTPState *s = DO_UPCAST(MTPState, dev, dev);

    MTPState *s = USB_MTP(dev);



    trace_usb_mtp_reset(s->dev.addr);
@@ -914,7 +917,7 @@ static void usb_mtp_cancel_packet(USBDevice *dev, USBPacket *p) 


static void usb_mtp_handle_data(USBDevice *dev, USBPacket *p)

{

    MTPState *s = DO_UPCAST(MTPState, dev, dev);

    MTPState *s = USB_MTP(dev);

    MTPControl cmd;

    mtp_container container;

    uint32_t params[5];
@@ -1062,12 +1065,16 @@ static void usb_mtp_handle_data(USBDevice *dev, USBPacket *p) 


static void usb_mtp_realize(USBDevice *dev, Error **errp)

{

    MTPState *s = DO_UPCAST(MTPState, dev, dev);

    MTPState *s = USB_MTP(dev);



    usb_desc_create_serial(dev);

    usb_desc_init(dev);

    QTAILQ_INIT(&s->objects);

    if (s->desc == NULL) {

        if (s->root == NULL) {

            error_setg(errp, "usb-mtp: x-root property must be configured");

            return;

        }

        s->desc = strrchr(s->root, '/');

        if (s->desc && s->desc[0]) {

            s->desc = g_strdup(s->desc + 1);
@@ -1113,7 +1120,7 @@ static void usb_mtp_class_initfn(ObjectClass *klass, void *data) 
}



static TypeInfo mtp_info = {

    .name          = "usb-mtp",

    .name          = TYPE_USB_MTP,

    .parent        = TYPE_USB_DEVICE,

    .instance_size = sizeof(MTPState),

    .class_init    = usb_mtp_class_initfn,