Commit c340a284 authored by Hani Benhabiles's avatar Hani Benhabiles Committed by Gerd Hoffmann
Browse files

usb: Fix usb-bt-dongle initialization. 



Due to an incomplete initialization, adding a usb-bt-dongle device through HMP
or QMP will cause a segmentation fault.

Signed-off-by: default avatarHani Benhabiles <hani@linux.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 35e83d10

hw/usb/dev-bluetooth.c

+16 −8
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 */



#include "qemu-common.h"

#include "qemu/error-report.h"

#include "hw/usb.h"

#include "hw/usb/desc.h"

#include "sysemu/bt.h"
@@ -506,6 +507,14 @@ static int usb_bt_initfn(USBDevice *dev) 


    usb_desc_create_serial(dev);

    usb_desc_init(dev);

    s->dev.opaque = s;

    if (!s->hci) {

        s->hci = bt_new_hci(qemu_find_bt_vlan(0));

    }

    s->hci->opaque = s;

    s->hci->evt_recv = usb_bt_out_hci_packet_event;

    s->hci->acl_recv = usb_bt_out_hci_packet_acl;

    usb_bt_handle_reset(&s->dev);

    s->intr = usb_ep_get(dev, USB_TOKEN_IN, USB_EVT_EP);



    return 0;
@@ -516,6 +525,7 @@ static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline) 
    USBDevice *dev;

    struct USBBtState *s;

    HCIInfo *hci;

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



    if (*cmdline) {

        hci = hci_init(cmdline);
@@ -525,19 +535,17 @@ static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline) 


    if (!hci)

        return NULL;

    dev = usb_create_simple(bus, "usb-bt-dongle");

    dev = usb_create(bus, name);

    if (!dev) {

        error_report("Failed to create USB device '%s'", name);

        return NULL;

    }

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

    s->dev.opaque = s;



    s->hci = hci;

    s->hci->opaque = s;

    s->hci->evt_recv = usb_bt_out_hci_packet_event;

    s->hci->acl_recv = usb_bt_out_hci_packet_acl;



    usb_bt_handle_reset(&s->dev);

    if (qdev_init(&dev->qdev) < 0) {

        error_report("Failed to initialize USB device '%s'", name);

        return NULL;

    }



    return dev;

}