[PULL 0/1] Usb 20191107 patches

[PULL 0/1] Usb 20191107 patches

[Gerd Hoffmann]

The following changes since commit 412fbef3d076c43e56451bacb28c4544858c66a3:

  Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-next-pull-request' into staging (2019-11-05 20:17:11 +0000)

are available in the Git repository at:

  git://git.kraxel.org/qemu tags/usb-20191107-pull-request

for you to fetch changes up to 1dfe2b91dcb1633d0ba450a8139d53006e700a9b:

  usb-host: add option to allow all resets. (2019-11-06 13:26:04 +0100)

----------------------------------------------------------------
usb: fix for usb-host

----------------------------------------------------------------

Gerd Hoffmann (1):
  usb-host: add option to allow all resets.

 hw/usb/host-libusb.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

-- 
2.18.1

[PULL 1/1] usb-host: add option to allow all resets.

[Gerd Hoffmann]

Commit 65f14ab98da1 ("usb-host: skip reset for untouched devices")
filters out multiple usb device resets in a row.  While this improves
the situation for usb some devices it doesn't work for others :-(

So go add a config option to make the behavior configurable.

Buglink: https://bugs.launchpad.net/bugs/1846451
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20191015064426.19454-1-kraxel@redhat.com
---
 hw/usb/host-libusb.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 472cc26fc403..fcf48c019333 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -86,7 +86,9 @@ struct USBHostDevice {
     uint32_t                         options;
     uint32_t                         loglevel;
     bool                             needs_autoscan;
-    bool                             allow_guest_reset;
+    bool                             allow_one_guest_reset;
+    bool                             allow_all_guest_resets;
+
     /* state */
     QTAILQ_ENTRY(USBHostDevice)      next;
     int                              seen, errcount;
@@ -1462,10 +1464,10 @@ static void usb_host_handle_reset(USBDevice *udev)
     USBHostDevice *s = USB_HOST_DEVICE(udev);
     int rc;
 
-    if (!s->allow_guest_reset) {
+    if (!s->allow_one_guest_reset && !s->allow_all_guest_resets) {
         return;
     }
-    if (udev->addr == 0) {
+    if (!s->allow_all_guest_resets && udev->addr == 0) {
         return;
     }
 
@@ -1586,7 +1588,10 @@ static Property usb_host_dev_properties[] = {
     DEFINE_PROP_UINT32("productid", USBHostDevice, match.product_id, 0),
     DEFINE_PROP_UINT32("isobufs",  USBHostDevice, iso_urb_count,    4),
     DEFINE_PROP_UINT32("isobsize", USBHostDevice, iso_urb_frames,   32),
-    DEFINE_PROP_BOOL("guest-reset", USBHostDevice, allow_guest_reset, true),
+    DEFINE_PROP_BOOL("guest-reset", USBHostDevice,
+                     allow_one_guest_reset, true),
+    DEFINE_PROP_BOOL("guest-resets-all", USBHostDevice,
+                     allow_all_guest_resets, false),
     DEFINE_PROP_UINT32("loglevel",  USBHostDevice, loglevel,
                        LIBUSB_LOG_LEVEL_WARNING),
     DEFINE_PROP_BIT("pipeline",    USBHostDevice, options,
-- 
2.18.1

Re: [PULL 0/1] Usb 20191107 patches

[Peter Maydell]

On Thu, 7 Nov 2019 at 08:58, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 412fbef3d076c43e56451bacb28c4544858c66a3:
>
>   Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-next-pull-request' into staging (2019-11-05 20:17:11 +0000)
>
> are available in the Git repository at:
>
>   git://git.kraxel.org/qemu tags/usb-20191107-pull-request
>
> for you to fetch changes up to 1dfe2b91dcb1633d0ba450a8139d53006e700a9b:
>
>   usb-host: add option to allow all resets. (2019-11-06 13:26:04 +0100)
>
> ----------------------------------------------------------------
> usb: fix for usb-host
>
> ----------------------------------------------------------------
>
> Gerd Hoffmann (1):
>   usb-host: add option to allow all resets.
>
>  hw/usb/host-libusb.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)

This didn't quite make rc0 but it'll go in for rc1.

thanks
-- PMM

Re: [PULL 0/1] Usb 20191107 patches

[Philippe Mathieu-Daudé]

Hi Peter,

On 11/7/19 7:26 PM, Peter Maydell wrote:
> On Thu, 7 Nov 2019 at 08:58, Gerd Hoffmann <kraxel@redhat.com> wrote:
>>
>> The following changes since commit 412fbef3d076c43e56451bacb28c4544858c66a3:
>>
>>    Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-next-pull-request' into staging (2019-11-05 20:17:11 +0000)
>>
>> are available in the Git repository at:
>>
>>    git://git.kraxel.org/qemu tags/usb-20191107-pull-request
>>
>> for you to fetch changes up to 1dfe2b91dcb1633d0ba450a8139d53006e700a9b:
>>
>>    usb-host: add option to allow all resets. (2019-11-06 13:26:04 +0100)
>>
>> ----------------------------------------------------------------
>> usb: fix for usb-host
>>
>> ----------------------------------------------------------------
>>
>> Gerd Hoffmann (1):
>>    usb-host: add option to allow all resets.
>>
>>   hw/usb/host-libusb.c | 13 +++++++++----
>>   1 file changed, 9 insertions(+), 4 deletions(-)
> 
> This didn't quite make rc0 but it'll go in for rc1.

Won't this make bisection confusing?

Re: [PULL 0/1] Usb 20191107 patches

[Peter Maydell]

On Thu, 7 Nov 2019 at 18:57, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> Hi Peter,
>
> On 11/7/19 7:26 PM, Peter Maydell wrote:
> > On Thu, 7 Nov 2019 at 08:58, Gerd Hoffmann <kraxel@redhat.com> wrote:
> >>
> >> The following changes since commit 412fbef3d076c43e56451bacb28c4544858c66a3:
> >>
> >>    Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-next-pull-request' into staging (2019-11-05 20:17:11 +0000)
> >>
> >> are available in the Git repository at:
> >>
> >>    git://git.kraxel.org/qemu tags/usb-20191107-pull-request
> >>
> >> for you to fetch changes up to 1dfe2b91dcb1633d0ba450a8139d53006e700a9b:
> >>
> >>    usb-host: add option to allow all resets. (2019-11-06 13:26:04 +0100)
> >>
> >> ----------------------------------------------------------------
> >> usb: fix for usb-host
> >>
> >> ----------------------------------------------------------------
> >>
> >> Gerd Hoffmann (1):
> >>    usb-host: add option to allow all resets.
> >>
> >>   hw/usb/host-libusb.c | 13 +++++++++----
> >>   1 file changed, 9 insertions(+), 4 deletions(-)
> >
> > This didn't quite make rc0 but it'll go in for rc1.
>
> Won't this make bisection confusing?

No, why should it?

thanks
-- PMM

Re: [PULL 0/1] Usb 20191107 patches

[Peter Maydell]

On Thu, 7 Nov 2019 at 08:58, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 412fbef3d076c43e56451bacb28c4544858c66a3:
>
>   Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-next-pull-request' into staging (2019-11-05 20:17:11 +0000)
>
> are available in the Git repository at:
>
>   git://git.kraxel.org/qemu tags/usb-20191107-pull-request
>
> for you to fetch changes up to 1dfe2b91dcb1633d0ba450a8139d53006e700a9b:
>
>   usb-host: add option to allow all resets. (2019-11-06 13:26:04 +0100)
>
> ----------------------------------------------------------------
> usb: fix for usb-host
>
> ----------------------------------------------------------------
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.

-- PMM