[Qemu-devel] [PATCH 0/2] docker: update package list for fedora image

[Qemu-devel] [PATCH 0/2] docker: update package list for fedora image

[Paolo Bonzini]

The first patch modernizes and completes the list of packages installed
in the Fedora docker image.  Both MinGW cross and native compilation are
switched to SDL 2.0 and GTK+ 3.0.

Paolo

Paolo Bonzini (2):
  docker: test-mingw: use SDL2 and GTK+3
  docker: fedora: include more build dependencies

 tests/docker/dockerfiles/fedora.docker | 67 ++++++++++++++++++++++++++++------
 tests/docker/test-mingw                |  4 +-
 2 files changed, 57 insertions(+), 14 deletions(-)

-- 
2.16.2

[Qemu-devel] [PATCH 1/2] docker: test-mingw: use SDL2 and GTK+3

[Paolo Bonzini]

Do not test the deprecated API versions.  debian-win32-cross and debian-win64-cross
are already using SDL2 (they do not cover GTK+ at all).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/docker/dockerfiles/fedora.docker | 8 ++++----
 tests/docker/test-mingw                | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index a00004319e..be3566325c 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -4,12 +4,12 @@ ENV PACKAGES \
     glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
     gcc gcc-c++ llvm clang make perl which bc findutils libaio-devel \
     nettle-devel libasan libubsan \
-    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
-    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
+    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \
+    mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
     mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
     mingw32-bzip2 \
-    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
-    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
+    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \
+    mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
     mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
     mingw64-bzip2
 ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw
index 503a6bc6f7..7cca7e16a6 100755
--- a/tests/docker/test-mingw
+++ b/tests/docker/test-mingw
@@ -28,8 +28,8 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
         --enable-vnc \
         --enable-bzip2 \
         --enable-guest-agent \
-        --with-sdlabi=1.2 \
-        --with-gtkabi=2.0
+        --with-sdlabi=2.0 \
+        --with-gtkabi=3.0
     install_qemu
     make clean
 
-- 
2.16.2

[Qemu-devel] [PATCH 2/2] docker: fedora: include more build dependencies

[Paolo Bonzini]

Install optional dependencies of QEMU to get better coverage.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/docker/dockerfiles/fedora.docker | 67 ++++++++++++++++++++++++++++------
 1 file changed, 55 insertions(+), 12 deletions(-)

diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index be3566325c..6d810f6a92 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,18 +1,61 @@
 FROM fedora:27
 ENV PACKAGES \
     ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname \
-    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
-    gcc gcc-c++ llvm clang make perl which bc findutils libaio-devel \
-    nettle-devel libasan libubsan \
-    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \
-    mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
-    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
-    mingw32-bzip2 \
-    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \
-    mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
-    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
-    mingw64-bzip2
-ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
+    gcc gcc-c++ llvm clang make perl which bc findutils libasan libubsan \
+    alsa-lib-devel \
+    bluez-libs-devel \
+    brlapi-devel \
+    bzip2-devel mingw32-bzip2 mingw64-bzip2 \
+    cyrus-sasl-devel \
+    device-mapper-multipath-devel \
+    glib2-devel mingw32-glib2 mingw64-glib2 \
+    glusterfs-api-devel \
+    gnutls-devel mingw32-gnutls mingw64-gnutls \
+    gtk3-devel mingw32-gtk3 mingw64-gtk3 \
+    libaio-devel \
+    libattr-devel \
+    libcacard-devel \
+    libcap-devel \
+    libcap-ng-devel \
+    libcurl-devel mingw32-curl mingw64-curl \
+    libepoxy-devel \
+    libfdt-devel \
+    mingw32-gmp mingw64-gmp \
+    libiscsi-devel \
+    libjpeg-devel mingw32-libjpeg-turbo mingw64-libjpeg-turbo \
+    libnfs-devel \
+    libpng-devel mingw32-libpng mingw64-libpng \
+    librbd-devel \
+    librdmacm-devel \
+    libseccomp-devel \
+    libtasn1-devel mingw32-libtasn1 mingw64-libtasn1 \
+    libssh2-devel mingw32-libssh2 mingw64-libssh2 \
+    libusbx-devel \
+    libuuid-devel \
+    libxml2-devel \
+    lzo-devel \
+    mesa-libgbm-devel \
+    ncurses-devel \
+    nettle-devel mingw32-nettle mingw64-nettle \
+    nss-devel \
+    numactl-devel \
+    perl-podlators \
+    pkg-config mingw32-pkg-config mingw64-pkg-config \
+    pulseaudio-libs-devel \
+    pixman-devel mingw32-pixman mingw64-pixman \
+    SDL2-devel mingw32-SDL2 mingw64-SDL2 \
+    snappy-devel \
+    spice-server-devel \
+    systemd-devel \
+    systemtap-sdt-devel \
+    texinfo \
+    usbredir-devel \
+    virglrenderer-devel \
+    vte291-devel \
+    xen-devel \
+    zlib-devel
+
+ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 --enable-trace-backends=dtrace,log,simple
 
 RUN dnf install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt
-- 
2.16.2

Re: [Qemu-devel] [PATCH 1/2] docker: test-mingw: use SDL2 and GTK+3

[Daniel P. Berrangé]

On Fri, Mar 16, 2018 at 01:25:39PM +0100, Paolo Bonzini wrote:
> Do not test the deprecated API versions.  debian-win32-cross and debian-win64-cross
> are already using SDL2 (they do not cover GTK+ at all).
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  tests/docker/dockerfiles/fedora.docker | 8 ++++----
>  tests/docker/test-mingw                | 4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 2/2] docker: fedora: include more build dependencies

[Daniel P. Berrangé]

On Fri, Mar 16, 2018 at 01:25:40PM +0100, Paolo Bonzini wrote:
> Install optional dependencies of QEMU to get better coverage.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  tests/docker/dockerfiles/fedora.docker | 67 ++++++++++++++++++++++++++++------
>  1 file changed, 55 insertions(+), 12 deletions(-)
> 
> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
> index be3566325c..6d810f6a92 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -1,18 +1,61 @@
>  FROM fedora:27
>  ENV PACKAGES \
>      ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname \
> -    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
> -    gcc gcc-c++ llvm clang make perl which bc findutils libaio-devel \
> -    nettle-devel libasan libubsan \
> -    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \
> -    mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
> -    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
> -    mingw32-bzip2 \
> -    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \
> -    mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
> -    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
> -    mingw64-bzip2
> -ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
> +    gcc gcc-c++ llvm clang make perl which bc findutils libasan libubsan \
> +    alsa-lib-devel \
> +    bluez-libs-devel \
> +    brlapi-devel \
> +    bzip2-devel mingw32-bzip2 mingw64-bzip2 \
> +    cyrus-sasl-devel \
> +    device-mapper-multipath-devel \
> +    glib2-devel mingw32-glib2 mingw64-glib2 \

No need for glib as that's pulled in automatically by gtk

> +    glusterfs-api-devel \
> +    gnutls-devel mingw32-gnutls mingw64-gnutls \
> +    gtk3-devel mingw32-gtk3 mingw64-gtk3 \
> +    libaio-devel \
> +    libattr-devel \
> +    libcacard-devel \
> +    libcap-devel \
> +    libcap-ng-devel \
> +    libcurl-devel mingw32-curl mingw64-curl \
> +    libepoxy-devel \
> +    libfdt-devel \
> +    mingw32-gmp mingw64-gmp \
> +    libiscsi-devel \
> +    libjpeg-devel mingw32-libjpeg-turbo mingw64-libjpeg-turbo \
> +    libnfs-devel \
> +    libpng-devel mingw32-libpng mingw64-libpng \
> +    librbd-devel \
> +    librdmacm-devel \
> +    libseccomp-devel \
> +    libtasn1-devel mingw32-libtasn1 mingw64-libtasn1 \
> +    libssh2-devel mingw32-libssh2 mingw64-libssh2 \
> +    libusbx-devel \
> +    libuuid-devel \
> +    libxml2-devel \
> +    lzo-devel \
> +    mesa-libgbm-devel \
> +    ncurses-devel \
> +    nettle-devel mingw32-nettle mingw64-nettle \

nettle should be pulled in automatically by gnutls
if it were needed - we automatically link against
whatever gnutls pulls in.

> +    nss-devel \

nss-devel is not required by anything.

> +    numactl-devel \
> +    perl-podlators \
> +    pkg-config mingw32-pkg-config mingw64-pkg-config \
> +    pulseaudio-libs-devel \
> +    pixman-devel mingw32-pixman mingw64-pixman \
> +    SDL2-devel mingw32-SDL2 mingw64-SDL2 \
> +    snappy-devel \
> +    spice-server-devel \
> +    systemd-devel \
> +    systemtap-sdt-devel \
> +    texinfo \
> +    usbredir-devel \
> +    virglrenderer-devel \
> +    vte291-devel \
> +    xen-devel \
> +    zlib-devel
> +
> +ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 --enable-trace-backends=dtrace,log,simple
>  
>  RUN dnf install -y $PACKAGES
>  RUN rpm -q $PACKAGES | sort > /packages.txt
> -- 
> 2.16.2
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 2/2] docker: fedora: include more build dependencies

[Paolo Bonzini]

On 16/03/2018 13:45, Daniel P. Berrangé wrote:
> On Fri, Mar 16, 2018 at 01:25:40PM +0100, Paolo Bonzini wrote:
>> Install optional dependencies of QEMU to get better coverage.
>>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>>  tests/docker/dockerfiles/fedora.docker | 67 ++++++++++++++++++++++++++++------
>>  1 file changed, 55 insertions(+), 12 deletions(-)
>>
>> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
>> index be3566325c..6d810f6a92 100644
>> --- a/tests/docker/dockerfiles/fedora.docker
>> +++ b/tests/docker/dockerfiles/fedora.docker
>> @@ -1,18 +1,61 @@
>>  FROM fedora:27
>>  ENV PACKAGES \
>>      ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname \
>> -    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
>> -    gcc gcc-c++ llvm clang make perl which bc findutils libaio-devel \
>> -    nettle-devel libasan libubsan \
>> -    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \
>> -    mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
>> -    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
>> -    mingw32-bzip2 \
>> -    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \
>> -    mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
>> -    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
>> -    mingw64-bzip2
>> -ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
>> +    gcc gcc-c++ llvm clang make perl which bc findutils libasan libubsan \
>> +    alsa-lib-devel \
>> +    bluez-libs-devel \
>> +    brlapi-devel \
>> +    bzip2-devel mingw32-bzip2 mingw64-bzip2 \
>> +    cyrus-sasl-devel \
>> +    device-mapper-multipath-devel \
>> +    glib2-devel mingw32-glib2 mingw64-glib2 \
> 
> No need for glib as that's pulled in automatically by gtk

We use it, so (unlike nettle-devel and nss-devel) I think it should be
added anyway.

>> +    nettle-devel mingw32-nettle mingw64-nettle \
> 
> nettle should be pulled in automatically by gnutls
> if it were needed - we automatically link against
> whatever gnutls pulls in.
> 
>> +    nss-devel \
> 
> nss-devel is not required by anything.

Yeah, libcacard uses it but we install its own devel package.

Paolo

Re: [Qemu-devel] [PATCH 1/2] docker: test-mingw: use SDL2 and GTK+3

[Philippe Mathieu-Daudé]

On 03/16/2018 01:25 PM, Paolo Bonzini wrote:
> Do not test the deprecated API versions.  debian-win32-cross and debian-win64-cross
> are already using SDL2 (they do not cover GTK+ at all).

Good idea to start a doc/test/docker-coverage.txt with a matrix of
configs tested (for example debian-amd64 tests virgl and netmap).

> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  tests/docker/dockerfiles/fedora.docker | 8 ++++----
>  tests/docker/test-mingw                | 4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
> index a00004319e..be3566325c 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -4,12 +4,12 @@ ENV PACKAGES \
>      glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
>      gcc gcc-c++ llvm clang make perl which bc findutils libaio-devel \
>      nettle-devel libasan libubsan \
> -    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
> -    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
> +    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \
> +    mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
>      mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
>      mingw32-bzip2 \
> -    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
> -    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
> +    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \
> +    mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
>      mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
>      mingw64-bzip2
>  ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
> diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw
> index 503a6bc6f7..7cca7e16a6 100755
> --- a/tests/docker/test-mingw
> +++ b/tests/docker/test-mingw
> @@ -28,8 +28,8 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
>          --enable-vnc \
>          --enable-bzip2 \
>          --enable-guest-agent \
> -        --with-sdlabi=1.2 \
> -        --with-gtkabi=2.0
> +        --with-sdlabi=2.0 \
> +        --with-gtkabi=3.0
>      install_qemu
>      make clean
>  
>