From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxCEc-0002hI-Ex for qemu-devel@nongnu.org; Wed, 18 Jun 2014 05:32:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxCEU-00020m-OW for qemu-devel@nongnu.org; Wed, 18 Jun 2014 05:32:50 -0400 Message-ID: <53A15CB2.4090701@redhat.com> Date: Wed, 18 Jun 2014 11:32:34 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1403047414-27505-1-git-send-email-kroosec@gmail.com> In-Reply-To: <1403047414-27505-1-git-send-email-kroosec@gmail.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv2] usb: Fix usb-bt-dongle initialization. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hani Benhabiles , qemu-devel@nongnu.org, qemu-trivial@nongnu.org Cc: kraxel@redhat.com, qemu-stable@nongnu.org Il 18/06/2014 01:23, Hani Benhabiles ha scritto: > Due to an incomplete initialization, adding a usb-bt-dongle device through HMP > or QMP will cause a segmentation fault. > > Signed-off-by: Hani Benhabiles > Suggested-by: Paolo Bonzini > --- > > Compared to v1: > * Remove duplicate code from usb_bt_init() and inline usb_create_simple() call. > * usb_bt_initfn() check for s->hci. > > hw/usb/dev-bluetooth.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c > index a9661d2..a76e581 100644 > --- a/hw/usb/dev-bluetooth.c > +++ b/hw/usb/dev-bluetooth.c > @@ -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; > } > Perfect! My comment about inlining usb_create_simple was a bit cryptic, but you got what I meant. Thanks. :) Not really trivial, but you've CCed Gerd too. Reviewed-by: Paolo Bonzini