From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWOyu-0005sT-Nd for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:14:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWOyo-0002At-Id for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:14:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26921) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWOyo-00029X-Ab for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:14:02 -0400 From: Gerd Hoffmann Date: Tue, 23 Sep 2014 14:13:33 +0200 Message-Id: <1411474417-9704-23-git-send-email-kraxel@redhat.com> In-Reply-To: <1411474417-9704-1-git-send-email-kraxel@redhat.com> References: <1411474417-9704-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 22/26] usb-bus: introduce a wrapper function to check speed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , Gerd Hoffmann From: Gonglei In this way, we can check speed directly, don't need call usb_device_attach(), which has other conditions, such as checking the chardev is open. Signed-off-by: Gonglei Reviewed-by: Paolo Bonzini Signed-off-by: Gerd Hoffmann --- hw/usb/bus.c | 14 +++++++++++++- include/hw/usb.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index b375293..da1eba9 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -478,7 +478,7 @@ static void usb_mask_to_str(char *dest, size_t size, } } -void usb_device_attach(USBDevice *dev, Error **errp) +void usb_check_attach(USBDevice *dev, Error **errp) { USBBus *bus = usb_bus_from_device(dev); USBPort *port = dev->port; @@ -499,6 +499,18 @@ void usb_device_attach(USBDevice *dev, Error **errp) bus->qbus.name, port->path, portspeed); return; } +} + +void usb_device_attach(USBDevice *dev, Error **errp) +{ + USBPort *port = dev->port; + Error *local_err = NULL; + + usb_check_attach(dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } dev->attached++; usb_attach(port); diff --git a/include/hw/usb.h b/include/hw/usb.h index 8ffbba2..b20b959 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -553,6 +553,7 @@ void usb_release_port(USBDevice *dev); void usb_device_attach(USBDevice *dev, Error **errp); int usb_device_detach(USBDevice *dev); int usb_device_delete_addr(int busnr, int addr); +void usb_check_attach(USBDevice *dev, Error **errp); static inline USBBus *usb_bus_from_device(USBDevice *d) { -- 1.8.3.1