[Qemu-devel] [PATCH 0/2] 2 compile / build fixes

[Qemu-devel] [PATCH 0/2] 2 compile / build fixes

[Hans de Goede]

Hi All,

The joys of working with a cutting edge distro on my workstation ...

Regards,

Hans

[Qemu-devel] [PATCH 1/2] device_tree: Fix build with latest libfdt

[Hans de Goede]

We override libfdt_env.h with our own copy, and the latest libfdt expects
libfdt_env.h to define fdt##_t types.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 include/libfdt_env.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 3667d4c..1cd8766 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -19,8 +19,14 @@
 #ifndef _LIBFDT_ENV_H
 #define _LIBFDT_ENV_H
 
+#include <stdint.h>
+
 #include "qemu/bswap.h"
 
+typedef uint16_t fdt16_t;
+typedef uint32_t fdt32_t;
+typedef uint64_t fdt64_t;
+
 #ifdef HOST_WORDS_BIGENDIAN
 #define fdt32_to_cpu(x)  (x)
 #define cpu_to_fdt32(x)  (x)
-- 
1.8.2.1

Re: [Qemu-devel] [PATCH 1/2] device_tree: Fix build with latest libfdt

[Gerd Hoffmann]

On 06/06/13 16:39, Hans de Goede wrote:
> We override libfdt_env.h with our own copy, and the latest libfdt expects
> libfdt_env.h to define fdt##_t types.

Looks sane to me, but I'll leave that to the fdt experts ...

cheers,
  Gerd

Re: [Qemu-devel] [PATCH 1/2] device_tree: Fix build with latest libfdt

[Peter Crosthwaite]

Hi Hans,

On Fri, Jun 7, 2013 at 12:39 AM, Hans de Goede <hdegoede@redhat.com> wrote:
> We override libfdt_env.h with our own copy, and the latest libfdt expects
> libfdt_env.h to define fdt##_t types.
>

This discussion is open on list, and AFAICT the consensus is to drop
qemus libfdt_env.h altogether. QEMU should not be trying to override
libfdt_env.h because it does not have a good reason to.

[PATCH v2 1/1] configure: dtc: Probe for libfdt_env.h

CCing the crowd.

Regards,
Peter

> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  include/libfdt_env.h | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/include/libfdt_env.h b/include/libfdt_env.h
> index 3667d4c..1cd8766 100644
> --- a/include/libfdt_env.h
> +++ b/include/libfdt_env.h
> @@ -19,8 +19,14 @@
>  #ifndef _LIBFDT_ENV_H
>  #define _LIBFDT_ENV_H
>
> +#include <stdint.h>
> +
>  #include "qemu/bswap.h"
>
> +typedef uint16_t fdt16_t;
> +typedef uint32_t fdt32_t;
> +typedef uint64_t fdt64_t;
> +
>  #ifdef HOST_WORDS_BIGENDIAN
>  #define fdt32_to_cpu(x)  (x)
>  #define cpu_to_fdt32(x)  (x)
> --
> 1.8.2.1
>
>

Re: [Qemu-devel] [PATCH 1/2] device_tree: Fix build with latest libfdt

[Paolo Bonzini]

Il 10/06/2013 22:13, Peter Crosthwaite ha scritto:
> Hi Hans,
> 
> On Fri, Jun 7, 2013 at 12:39 AM, Hans de Goede <hdegoede@redhat.com> wrote:
>> We override libfdt_env.h with our own copy, and the latest libfdt expects
>> libfdt_env.h to define fdt##_t types.
>>
> 
> This discussion is open on list, and AFAICT the consensus is to drop
> qemus libfdt_env.h altogether. QEMU should not be trying to override
> libfdt_env.h because it does not have a good reason to.
> 
> [PATCH v2 1/1] configure: dtc: Probe for libfdt_env.h
> 
> CCing the crowd.

F19, F20 and EPEL6 will all distribute libfdt_env.h by the time 1.6 is
out.  If this patch is not qemu-stable material, you have my ack too.
Thanks!

Paolo

Re: [Qemu-devel] [PATCH 1/2] device_tree: Fix build with latest libfdt

[Peter Maydell]

On 12 June 2013 14:55, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 10/06/2013 22:13, Peter Crosthwaite ha scritto:
>> Hi Hans,
>>
>> On Fri, Jun 7, 2013 at 12:39 AM, Hans de Goede <hdegoede@redhat.com> wrote:
>>> We override libfdt_env.h with our own copy, and the latest libfdt expects
>>> libfdt_env.h to define fdt##_t types.
>>>
>>
>> This discussion is open on list, and AFAICT the consensus is to drop
>> qemus libfdt_env.h altogether. QEMU should not be trying to override
>> libfdt_env.h because it does not have a good reason to.
>>
>> [PATCH v2 1/1] configure: dtc: Probe for libfdt_env.h
>>
>> CCing the crowd.
>
> F19, F20 and EPEL6 will all distribute libfdt_env.h by the time 1.6 is
> out.  If this patch is not qemu-stable material, you have my ack too.

For clarity, by "this patch" do you mean the one that started
this email thread (from Hans) or the one from Peter that he
quotes the Subject of here?

thanks
-- PMM

Re: [Qemu-devel] [PATCH 1/2] device_tree: Fix build with latest libfdt

[Paolo Bonzini]

Il 12/06/2013 10:01, Peter Maydell ha scritto:
>>> >> [PATCH v2 1/1] configure: dtc: Probe for libfdt_env.h
>>> >>
>>> >> CCing the crowd.
>> >
>> > F19, F20 and EPEL6 will all distribute libfdt_env.h by the time 1.6 is
>> > out.  If this patch is not qemu-stable material, you have my ack too.
> For clarity, by "this patch" do you mean the one that started
> this email thread (from Hans) or the one from Peter that he
> quotes the Subject of here?

The one that requires libfdt_env.h to be installed under /usr/include.

Paolo

[Qemu-devel] [PATCH 2/2] usb/host-libusb: Fix building with libusb git master code

[Hans de Goede]

The next libusb release will deprecate libusb_get_port_path, and since
we compile with -Werror, this breaks the build.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/usb/host-libusb.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 3a582c5..0c12b0f 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -241,7 +241,11 @@ static int usb_host_get_port(libusb_device *dev, char *port, size_t len)
     size_t off;
     int rc, i;
 
+#if LIBUSBX_API_VERSION >= 0x01000102
+    rc = libusb_get_port_numbers(dev, path, 7);
+#else
     rc = libusb_get_port_path(ctx, dev, path, 7);
+#endif
     if (rc < 0) {
         return 0;
     }
-- 
1.8.2.1

Re: [Qemu-devel] [PATCH 2/2] usb/host-libusb: Fix building with libusb git master code

[Gerd Hoffmann]

On 06/06/13 16:39, Hans de Goede wrote:
> The next libusb release will deprecate libusb_get_port_path, and since
> we compile with -Werror, this breaks the build.

Patch added to usb patch queue.

thanks,
  Gerd

Re: [Qemu-devel] [PATCH 2/2] usb/host-libusb: Fix building with libusb git master code

[Ed Maste]

On 6 June 2013 10:39, Hans de Goede <hdegoede@redhat.com> wrote:
> +#if LIBUSBX_API_VERSION >= 0x01000102
> +    rc = libusb_get_port_numbers(dev, path, 7);
> +#else
>      rc = libusb_get_port_path(ctx, dev, path, 7);
> +#endif

I just added libusb_get_port_numbers to FreeBSD's libusb, but we don't
have LIBUSBX_API_VERSION defined; we don't (yet) implement all of the
functionality that would be implied by given version.

I'm not sure if it'd be better to add the definition in FreeBSD's
libusb (and fault in missing functionality as needed, presumably), or
address it in libusb consumers with additional #ifdefs.