From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44406 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OERV6-0005nh-4F for qemu-devel@nongnu.org; Tue, 18 May 2010 14:26:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OERV4-0002vq-KA for qemu-devel@nongnu.org; Tue, 18 May 2010 14:26:44 -0400 Received: from hall.aurel32.net ([88.191.82.174]:38231) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OERV4-0002vm-FN for qemu-devel@nongnu.org; Tue, 18 May 2010 14:26:42 -0400 Date: Tue, 18 May 2010 20:26:40 +0200 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] Return contorl to host on usb_del monitor command Message-ID: <20100518182640.GF31346@ohm.aurel32.net> References: <20100419185555.GA3914@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20100419185555.GA3914@redhat.com> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Shahar Havivi Cc: qemu-devel@nongnu.org On Mon, Apr 19, 2010 at 09:55:58PM +0300, Shahar Havivi wrote: > When removing usb on guest via usb_del monitor command, qemu does > not return the control to the host, the only solution user have is to > unplug/plug the device again in order to get the device back to the host > > Signed-off-by: Shahar Havivi > --- > hw/usb-bus.c | 4 ++++ > hw/usb.h | 1 + > usb-linux.c | 11 +++++++++++ > 3 files changed, 16 insertions(+), 0 deletions(-) > > diff --git a/hw/usb-bus.c b/hw/usb-bus.c > index ee0e9e3..9781ac6 100644 > --- a/hw/usb-bus.c > +++ b/hw/usb-bus.c > @@ -208,6 +208,10 @@ int usb_device_delete_addr(int busnr, int addr) > return -1; > dev = port->dev; > > + if (!strcmp(dev->info->usbdevice_name, "host")) { > + usb_host_device_release(dev); > + } > + > qdev_free(&dev->qdev); > return 0; > } > diff --git a/hw/usb.h b/hw/usb.h > index 00d2802..f6f7cc4 100644 > --- a/hw/usb.h > +++ b/hw/usb.h > @@ -258,6 +258,7 @@ void usb_send_msg(USBDevice *dev, int msg); > USBDevice *usb_host_device_open(const char *devname); > int usb_host_device_close(const char *devname); > void usb_host_info(Monitor *mon); > +int usb_host_device_release(USBDevice *dev); > > /* usb-hid.c */ > void usb_hid_datain_cb(USBDevice *dev, void *opaque, void (*datain)(void *)); > diff --git a/usb-linux.c b/usb-linux.c > index d0d7cff..9db94dd 100644 > --- a/usb-linux.c > +++ b/usb-linux.c > @@ -284,6 +284,17 @@ static void async_cancel(USBPacket *unused, void *opaque) > } > } > > +/* release usb device, return control to host */ > +int usb_host_device_release(USBDevice *dev) > +{ > + int ret; > + > + USBHostDevice *s = DO_UPCAST(USBHostDevice, dev, dev); > + ret = ioctl(s->fd, USBDEVFS_RESET); > + > + return ret; > +} > + This function should also be added on usb-bsd.c and usb-stub.c, or at least an empty function. > static int usb_host_claim_interfaces(USBHostDevice *dev, int configuration) > { > int dev_descr_len, config_descr_len; > -- > 1.6.3.3 > > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net