usb: fix libusb config variable name.

[Qemu-devel] [PATCH] usb: fix libusb config variable name.

Posted by Gerd Hoffmann 6 years, 7 months ago

Cc: Jan Kiszka <jan.kiszka@siemens.com>
Fixes: 4e5ee5b21c84fe3023a64b5cc2e12a52ab0597c1
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 9255234c63..0e6d54b21f 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -42,7 +42,7 @@ redirect.o-cflags = $(USB_REDIR_CFLAGS)
 redirect.o-libs = $(USB_REDIR_LIBS)
 
 # usb pass-through
-ifeq ($(CONFIG_LIBUSB)$(CONFIG_USB),yy)
+ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy)
 common-obj-y += host-libusb.o host-legacy.o
 else
 common-obj-y += host-stub.o
-- 
2.9.3

Re: [Qemu-devel] [PATCH] usb: fix libusb config variable name.

Posted by Jan Kiszka 6 years, 7 months ago

On 2017-09-26 08:38, Gerd Hoffmann wrote:
> Cc: Jan Kiszka <jan.kiszka@siemens.com>
> Fixes: 4e5ee5b21c84fe3023a64b5cc2e12a52ab0597c1
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/usb/Makefile.objs | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
> index 9255234c63..0e6d54b21f 100644
> --- a/hw/usb/Makefile.objs
> +++ b/hw/usb/Makefile.objs
> @@ -42,7 +42,7 @@ redirect.o-cflags = $(USB_REDIR_CFLAGS)
>  redirect.o-libs = $(USB_REDIR_LIBS)
>  
>  # usb pass-through
> -ifeq ($(CONFIG_LIBUSB)$(CONFIG_USB),yy)
> +ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy)
>  common-obj-y += host-libusb.o host-legacy.o
>  else
>  common-obj-y += host-stub.o
> 

This won't still work, only patch did -> CONFIG_USB isn't set when
building the common objects.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA ITP SES-DE
Corporate Competence Center Embedded Linux

Re: [Qemu-devel] [PATCH] usb: fix libusb config variable name.

Posted by Gerd Hoffmann 6 years, 7 months ago

On Tue, 2017-09-26 at 09:16 +0200, Jan Kiszka wrote:
> On 2017-09-26 08:38, Gerd Hoffmann wrote:
> > Cc: Jan Kiszka <jan.kiszka@siemens.com>
> > Fixes: 4e5ee5b21c84fe3023a64b5cc2e12a52ab0597c1
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> > ---
> >  hw/usb/Makefile.objs | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
> > index 9255234c63..0e6d54b21f 100644
> > --- a/hw/usb/Makefile.objs
> > +++ b/hw/usb/Makefile.objs
> > @@ -42,7 +42,7 @@ redirect.o-cflags = $(USB_REDIR_CFLAGS)
> >  redirect.o-libs = $(USB_REDIR_LIBS)
> >  
> >  # usb pass-through
> > -ifeq ($(CONFIG_LIBUSB)$(CONFIG_USB),yy)
> > +ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy)
> >  common-obj-y += host-libusb.o host-legacy.o
> >  else
> >  common-obj-y += host-stub.o
> > 
> 
> This won't still work, only patch did -> CONFIG_USB isn't set when
> building the common objects.

I've tested it, and it did work.  Also note that there are a bunch of

   common-obj-$(CONFIG_USB) += something

lines in hw/usb/Makefile.objs

cheers,
  Gerd

Re: [Qemu-devel] [PATCH] usb: fix libusb config variable name.

Posted by Jan Kiszka 6 years, 7 months ago

On 2017-09-26 09:21, Gerd Hoffmann wrote:
> On Tue, 2017-09-26 at 09:16 +0200, Jan Kiszka wrote:
>> On 2017-09-26 08:38, Gerd Hoffmann wrote:
>>> Cc: Jan Kiszka <jan.kiszka@siemens.com>
>>> Fixes: 4e5ee5b21c84fe3023a64b5cc2e12a52ab0597c1
>>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>>> ---
>>>  hw/usb/Makefile.objs | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
>>> index 9255234c63..0e6d54b21f 100644
>>> --- a/hw/usb/Makefile.objs
>>> +++ b/hw/usb/Makefile.objs
>>> @@ -42,7 +42,7 @@ redirect.o-cflags = $(USB_REDIR_CFLAGS)
>>>  redirect.o-libs = $(USB_REDIR_LIBS)
>>>  
>>>  # usb pass-through
>>> -ifeq ($(CONFIG_LIBUSB)$(CONFIG_USB),yy)
>>> +ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy)
>>>  common-obj-y += host-libusb.o host-legacy.o
>>>  else
>>>  common-obj-y += host-stub.o
>>>
>>
>> This won't still work, only patch did -> CONFIG_USB isn't set when
>> building the common objects.
> 
> I've tested it, and it did work.  Also note that there are a bunch of
> 
>    common-obj-$(CONFIG_USB) += something
> 
> lines in hw/usb/Makefile.objs
> 

I swear it didn't while developing the fix, but it does indeed now.

Tested-by: Jan Kiszka <jan.kiszka@siemens.com>

Jan