All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/6] tests/docker: Update Fedora containers
@ 2021-11-03 14:48 John Snow
  2021-11-03 14:48 ` [PATCH 1/6] spice: Update QXLInterface for spice >= 0.15.0 John Snow
                   ` (6 more replies)
  0 siblings, 7 replies; 24+ messages in thread
From: John Snow @ 2021-11-03 14:48 UTC (permalink / raw)
  To: qemu-devel
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Willian Rampazzo, John Snow,
	Gerd Hoffmann, Alex Bennée

Fedora 33 will be EOL before 6.2 ships; Fedora 35 was just
released. Update our various containers to test on F34 and F35.

Fix a minor code warning issue that surfaces in a new version of Clang,
and fix a small deprecation issue for the latest version of spice.

In testing, I found that oss-fuzz was more likely to time out on GitLab;
it's unclear if this is a performance regression or just getting unlucky
with when I test.

Summary:
  fedora.docker updated to F34 and then F35
  fedora34.docker copied from fedora.docker, new build test added
  cross-compile targets bumped from F33 to F34

John Snow (6):
  spice: Update QXLInterface for spice >= 0.15.0
  ui/clipboard: Don't use g_autoptr just to free a variable
  docker: update fedora container to Fedora 34
  docker: update Fedora-based cross-compiler containers to Fedora 34
  docker: update 'python' dockerfile to use Fedora registry
  docker: Add Fedora 35 container

 include/ui/qemu-spice.h                       |   6 +
 hw/display/qxl.c                              |  14 ++-
 ui/clipboard.c                                |   3 +-
 ui/spice-display.c                            |  11 ++
 .gitlab-ci.d/buildtest.yml                    |  16 +++
 .gitlab-ci.d/container-core.yml               |   5 +
 .../dockerfiles/fedora-cris-cross.docker      |   2 +-
 .../dockerfiles/fedora-win32-cross.docker     |   2 +-
 .../dockerfiles/fedora-win64-cross.docker     |   2 +-
 tests/docker/dockerfiles/fedora.docker        |   2 +-
 tests/docker/dockerfiles/fedora34.docker      | 117 ++++++++++++++++++
 tests/docker/dockerfiles/python.docker        |   2 +-
 12 files changed, 175 insertions(+), 7 deletions(-)
 create mode 100644 tests/docker/dockerfiles/fedora34.docker

-- 
2.31.1




^ permalink raw reply	[flat|nested] 24+ messages in thread
* [PATCH 1/6] spice: Update QXLInterface for spice >= 0.15.0
  2021-11-03 14:48 [PATCH 0/6] tests/docker: Update Fedora containers John Snow
@ 2021-11-03 14:48 ` John Snow
  2021-11-04  6:47   ` Gerd Hoffmann
  2021-11-03 14:48 ` [PATCH 2/6] ui/clipboard: Don't use g_autoptr just to free a variable John Snow
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 24+ messages in thread
From: John Snow @ 2021-11-03 14:48 UTC (permalink / raw)
  To: qemu-devel
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Willian Rampazzo, John Snow,
	Gerd Hoffmann, Alex Bennée

spice updated the spelling (and arguments) of "attache_worker" in
0.15.0. Update QEMU to match, preventing -Wdeprecated-declarations
compilations from reporting build errors.

See also:
https://gitlab.freedesktop.org/spice/spice/-/commit/974692bda1e77af92b71ed43b022439448492cb9

Signed-off-by: John Snow <jsnow@redhat.com>
---
 include/ui/qemu-spice.h |  6 ++++++
 hw/display/qxl.c        | 14 +++++++++++++-
 ui/spice-display.c      | 11 +++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 71ecd6cfd1..21fe195e18 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -40,6 +40,12 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
 #define SPICE_NEEDS_SET_MM_TIME 0
 #endif
 
+#if defined(SPICE_SERVER_VERSION) && (SPICE_SERVER_VERSION >= 0x000f00)
+#define SPICE_HAS_ATTACHED_WORKER 1
+#else
+#define SPICE_HAS_ATTACHED_WORKER 0
+#endif
+
 #else  /* CONFIG_SPICE */
 
 #include "qemu/error-report.h"
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 29c80b4289..1da6703e44 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -517,13 +517,20 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext)
 
 /* spice display interface callbacks */
 
-static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worker)
+static void interface_attached_worker(QXLInstance *sin)
 {
     PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
 
     trace_qxl_interface_attach_worker(qxl->id);
 }
 
+#if !(SPICE_HAS_ATTACHED_WORKER)
+static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worker)
+{
+    interface_attached_worker(sin);
+}
+#endif
+
 static void interface_set_compression_level(QXLInstance *sin, int level)
 {
     PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
@@ -1131,7 +1138,12 @@ static const QXLInterface qxl_interface = {
     .base.major_version      = SPICE_INTERFACE_QXL_MAJOR,
     .base.minor_version      = SPICE_INTERFACE_QXL_MINOR,
 
+#if SPICE_HAS_ATTACHED_WORKER
+    .attached_worker         = interface_attached_worker,
+#else
     .attache_worker          = interface_attach_worker,
+#endif
+
     .set_compression_level   = interface_set_compression_level,
 #if SPICE_NEEDS_SET_MM_TIME
     .set_mm_time             = interface_set_mm_time,
diff --git a/ui/spice-display.c b/ui/spice-display.c
index f59c69882d..1a60cebb7d 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -500,10 +500,17 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd)
 
 /* spice display interface callbacks */
 
+#if SPICE_HAS_ATTACHED_WORKER
+static void interface_attached_worker(QXLInstance *sin)
+{
+    /* nothing to do */
+}
+#else
 static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worker)
 {
     /* nothing to do */
 }
+#endif
 
 static void interface_set_compression_level(QXLInstance *sin, int level)
 {
@@ -702,7 +709,11 @@ static const QXLInterface dpy_interface = {
     .base.major_version      = SPICE_INTERFACE_QXL_MAJOR,
     .base.minor_version      = SPICE_INTERFACE_QXL_MINOR,
 
+#if SPICE_HAS_ATTACHED_WORKER
+    .attached_worker         = interface_attached_worker,
+#else
     .attache_worker          = interface_attach_worker,
+#endif
     .set_compression_level   = interface_set_compression_level,
 #if SPICE_NEEDS_SET_MM_TIME
     .set_mm_time             = interface_set_mm_time,
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [PATCH 2/6] ui/clipboard: Don't use g_autoptr just to free a variable
  2021-11-03 14:48 [PATCH 0/6] tests/docker: Update Fedora containers John Snow
  2021-11-03 14:48 ` [PATCH 1/6] spice: Update QXLInterface for spice >= 0.15.0 John Snow
@ 2021-11-03 14:48 ` John Snow
  2021-11-03 14:57   ` Marc-André Lureau
  2021-11-03 14:58   ` Daniel P. Berrangé
  2021-11-03 14:48 ` [PATCH 3/6] docker: update fedora container to Fedora 34 John Snow
                   ` (4 subsequent siblings)
  6 siblings, 2 replies; 24+ messages in thread
From: John Snow @ 2021-11-03 14:48 UTC (permalink / raw)
  To: qemu-devel
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Willian Rampazzo, John Snow,
	Gerd Hoffmann, Alex Bennée

Clang doesn't recognize that the variable is being "used" and will emit
a warning:

  ../ui/clipboard.c:47:34: error: variable 'old' set but not used [-Werror,-Wunused-but-set-variable]
      g_autoptr(QemuClipboardInfo) old = NULL;
                                 ^
  1 error generated.

OK, fine. Just do things the old way.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 ui/clipboard.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/clipboard.c b/ui/clipboard.c
index d7b008d62a..d53576b0f6 100644
--- a/ui/clipboard.c
+++ b/ui/clipboard.c
@@ -44,13 +44,14 @@ void qemu_clipboard_peer_release(QemuClipboardPeer *peer,
 
 void qemu_clipboard_update(QemuClipboardInfo *info)
 {
-    g_autoptr(QemuClipboardInfo) old = NULL;
+    QemuClipboardInfo *old = NULL;
     assert(info->selection < QEMU_CLIPBOARD_SELECTION__COUNT);
 
     notifier_list_notify(&clipboard_notifiers, info);
 
     old = cbinfo[info->selection];
     cbinfo[info->selection] = qemu_clipboard_info_ref(info);
+    g_free(old);
 }
 
 QemuClipboardInfo *qemu_clipboard_info(QemuClipboardSelection selection)
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [PATCH 3/6] docker: update fedora container to Fedora 34
  2021-11-03 14:48 [PATCH 0/6] tests/docker: Update Fedora containers John Snow
  2021-11-03 14:48 ` [PATCH 1/6] spice: Update QXLInterface for spice >= 0.15.0 John Snow
  2021-11-03 14:48 ` [PATCH 2/6] ui/clipboard: Don't use g_autoptr just to free a variable John Snow
@ 2021-11-03 14:48 ` John Snow
  2021-11-03 14:52   ` Philippe Mathieu-Daudé
  2021-11-03 16:55   ` Willian Rampazzo
  2021-11-03 14:48 ` [PATCH 4/6] docker: update Fedora-based cross-compiler containers " John Snow
                   ` (3 subsequent siblings)
  6 siblings, 2 replies; 24+ messages in thread
From: John Snow @ 2021-11-03 14:48 UTC (permalink / raw)
  To: qemu-devel
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Willian Rampazzo, John Snow,
	Gerd Hoffmann, Alex Bennée

Fedora 33 will be EOL 2021-11-23, before QEMU 6.2 will release. Upgrade
the version we're testing as our minimum now.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/docker/dockerfiles/fedora.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index eec1add7f6..44d7f12110 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:34
 
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [PATCH 4/6] docker: update Fedora-based cross-compiler containers to Fedora 34
  2021-11-03 14:48 [PATCH 0/6] tests/docker: Update Fedora containers John Snow
                   ` (2 preceding siblings ...)
  2021-11-03 14:48 ` [PATCH 3/6] docker: update fedora container to Fedora 34 John Snow
@ 2021-11-03 14:48 ` John Snow
  2021-11-03 14:52   ` Philippe Mathieu-Daudé
  2021-11-03 16:56   ` Willian Rampazzo
  2021-11-03 14:48 ` [PATCH 5/6] docker: update 'python' dockerfile to use Fedora registry John Snow
                   ` (2 subsequent siblings)
  6 siblings, 2 replies; 24+ messages in thread
From: John Snow @ 2021-11-03 14:48 UTC (permalink / raw)
  To: qemu-devel
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Willian Rampazzo, John Snow,
	Gerd Hoffmann, Alex Bennée

Similarly to the last patch, Fedora 33 will be EOL by the time QEMU 6.2
releases, so bump the version for all of the other Fedora containers,
too.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/docker/dockerfiles/fedora-cris-cross.docker  | 2 +-
 tests/docker/dockerfiles/fedora-win32-cross.docker | 2 +-
 tests/docker/dockerfiles/fedora-win64-cross.docker | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/docker/dockerfiles/fedora-cris-cross.docker
index 91c373fdd3..b6787dc572 100644
--- a/tests/docker/dockerfiles/fedora-cris-cross.docker
+++ b/tests/docker/dockerfiles/fedora-cris-cross.docker
@@ -2,7 +2,7 @@
 # Cross compiler for cris system tests
 #
 
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:34
 ENV PACKAGES gcc-cris-linux-gnu
 RUN dnf install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index aad39dd97f..1b800921e8 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:34
 
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 9a224a619b..d4e12fbdfc 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:34
 
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [PATCH 5/6] docker: update 'python' dockerfile to use Fedora registry
  2021-11-03 14:48 [PATCH 0/6] tests/docker: Update Fedora containers John Snow
                   ` (3 preceding siblings ...)
  2021-11-03 14:48 ` [PATCH 4/6] docker: update Fedora-based cross-compiler containers " John Snow
@ 2021-11-03 14:48 ` John Snow
  2021-11-03 14:55   ` Philippe Mathieu-Daudé
  2021-11-03 16:57   ` Willian Rampazzo
  2021-11-03 14:48 ` [PATCH 6/6] docker: Add Fedora 35 container John Snow
  2021-11-24 12:19 ` [PATCH 0/6] tests/docker: Update Fedora containers Daniel P. Berrangé
  6 siblings, 2 replies; 24+ messages in thread
From: John Snow @ 2021-11-03 14:48 UTC (permalink / raw)
  To: qemu-devel
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Willian Rampazzo, John Snow,
	Gerd Hoffmann, Alex Bennée

Following the lead of 102cd5c294dc, switch from using Docker hub to the
Fedora registry itself.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/docker/dockerfiles/python.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/dockerfiles/python.docker b/tests/docker/dockerfiles/python.docker
index 56d88417df..ecefcc54c4 100644
--- a/tests/docker/dockerfiles/python.docker
+++ b/tests/docker/dockerfiles/python.docker
@@ -1,6 +1,6 @@
 # Python library testing environment
 
-FROM fedora:latest
+FROM registry.fedoraproject.org/fedora:latest
 MAINTAINER John Snow <jsnow@redhat.com>
 
 # Please keep this list sorted alphabetically
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [PATCH 6/6] docker: Add Fedora 35 container
  2021-11-03 14:48 [PATCH 0/6] tests/docker: Update Fedora containers John Snow
                   ` (4 preceding siblings ...)
  2021-11-03 14:48 ` [PATCH 5/6] docker: update 'python' dockerfile to use Fedora registry John Snow
@ 2021-11-03 14:48 ` John Snow
  2021-11-03 16:59   ` Daniel P. Berrangé
  2021-11-24 12:19 ` [PATCH 0/6] tests/docker: Update Fedora containers Daniel P. Berrangé
  6 siblings, 1 reply; 24+ messages in thread
From: John Snow @ 2021-11-03 14:48 UTC (permalink / raw)
  To: qemu-devel
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Willian Rampazzo, John Snow,
	Gerd Hoffmann, Alex Bennée

Or, more accurately, update our current Fedora container to Fedora 35,
and then add a new fedora34 container and build test.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 .gitlab-ci.d/buildtest.yml               |  16 ++++
 .gitlab-ci.d/container-core.yml          |   5 +
 tests/docker/dockerfiles/fedora.docker   |   2 +-
 tests/docker/dockerfiles/fedora34.docker | 117 +++++++++++++++++++++++
 4 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 tests/docker/dockerfiles/fedora34.docker

diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 5c378e35f9..9d9330b646 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -100,6 +100,22 @@ acceptance-system-debian:
     IMAGE: debian-amd64
     MAKE_CHECK_ARGS: check-acceptance
 
+build-system-fedora34:
+  extends: .native_build_job_template
+  needs:
+    job: amd64-fedora34-container
+  variables:
+    IMAGE: fedora34
+    CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs
+             --enable-fdt=system --enable-slirp=system --enable-capstone=system
+    TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu
+      xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu
+    MAKE_CHECK_ARGS: check-build
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - build
+
 build-system-fedora:
   extends: .native_build_job_template
   needs:
diff --git a/.gitlab-ci.d/container-core.yml b/.gitlab-ci.d/container-core.yml
index e8dd1f476a..96a71e88ff 100644
--- a/.gitlab-ci.d/container-core.yml
+++ b/.gitlab-ci.d/container-core.yml
@@ -6,6 +6,11 @@ amd64-centos8-container:
   variables:
     NAME: centos8
 
+amd64-fedora34-container:
+  extends: .container_job_template
+  variables:
+    NAME: fedora34
+
 amd64-fedora-container:
   extends: .container_job_template
   variables:
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 44d7f12110..24aca97cd7 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:34
+FROM registry.fedoraproject.org/fedora:35
 
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
diff --git a/tests/docker/dockerfiles/fedora34.docker b/tests/docker/dockerfiles/fedora34.docker
new file mode 100644
index 0000000000..44d7f12110
--- /dev/null
+++ b/tests/docker/dockerfiles/fedora34.docker
@@ -0,0 +1,117 @@
+FROM registry.fedoraproject.org/fedora:34
+
+# Please keep this list sorted alphabetically
+ENV PACKAGES \
+    SDL2-devel \
+    SDL2_image-devel \
+    alsa-lib-devel \
+    bc \
+    brlapi-devel \
+    bzip2 \
+    bzip2-devel \
+    ca-certificates \
+    capstone-devel \
+    ccache \
+    clang \
+    ctags \
+    cyrus-sasl-devel \
+    daxctl-devel \
+    dbus-daemon \
+    device-mapper-multipath-devel \
+    diffutils \
+    findutils \
+    gcc \
+    gcc-c++ \
+    gcovr \
+    genisoimage \
+    gettext \
+    git \
+    glib2-devel \
+    glibc-langpack-en \
+    glibc-static \
+    glusterfs-api-devel \
+    gnutls-devel \
+    gtk3-devel \
+    hostname \
+    jemalloc-devel \
+    libaio-devel \
+    libasan \
+    libattr-devel \
+    libbpf-devel \
+    libcacard-devel \
+    libcap-ng-devel \
+    libcurl-devel \
+    libdrm-devel \
+    libepoxy-devel \
+    libfdt-devel \
+    libffi-devel \
+    libgcrypt-devel \
+    libiscsi-devel \
+    libjpeg-devel \
+    libnfs-devel \
+    libpmem-devel \
+    libpng-devel \
+    librbd-devel \
+    libseccomp-devel \
+    libslirp-devel \
+    libssh-devel \
+    libtasn1-devel \
+    libubsan \
+    libudev-devel \
+    liburing-devel \
+    libusbx-devel \
+    libxml2-devel \
+    libzstd-devel \
+    llvm \
+    lttng-ust-devel \
+    lzo-devel \
+    make \
+    mesa-libgbm-devel \
+    meson \
+    ncurses-devel \
+    nettle-devel \
+    ninja-build \
+    nmap-ncat \
+    numactl-devel \
+    openssh-clients \
+    pam-devel \
+    perl-Test-Harness \
+    perl-base \
+    pixman-devel \
+    pkgconfig \
+    pulseaudio-libs-devel \
+    python3 \
+    python3-PyYAML \
+    python3-numpy \
+    python3-opencv \
+    python3-pillow \
+    python3-pip \
+    python3-sphinx \
+    python3-sphinx_rtd_theme \
+    python3-virtualenv \
+    rdma-core-devel \
+    rpm \
+    sed \
+    snappy-devel \
+    sparse \
+    spice-protocol \
+    spice-server-devel \
+    systemd-devel \
+    systemtap-sdt-devel \
+    tar \
+    tesseract \
+    tesseract-langpack-eng \
+    texinfo \
+    usbredir-devel \
+    util-linux \
+    virglrenderer-devel \
+    vte291-devel \
+    which \
+    xen-devel \
+    xfsprogs-devel \
+    zlib-devel
+ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
+
+RUN dnf install -y $PACKAGES
+RUN rpm -q $PACKAGES | sort > /packages.txt
+ENV PATH $PATH:/usr/libexec/python3-sphinx/
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* Re: [PATCH 3/6] docker: update fedora container to Fedora 34
  2021-11-03 14:48 ` [PATCH 3/6] docker: update fedora container to Fedora 34 John Snow
@ 2021-11-03 14:52   ` Philippe Mathieu-Daudé
  2021-11-03 16:55   ` Willian Rampazzo
  1 sibling, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-11-03 14:52 UTC (permalink / raw)
  To: John Snow, qemu-devel
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Willian Rampazzo, Gerd Hoffmann,
	Alex Bennée

On 11/3/21 15:48, John Snow wrote:
> Fedora 33 will be EOL 2021-11-23, before QEMU 6.2 will release. Upgrade
> the version we're testing as our minimum now.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/docker/dockerfiles/fedora.docker | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 4/6] docker: update Fedora-based cross-compiler containers to Fedora 34
  2021-11-03 14:48 ` [PATCH 4/6] docker: update Fedora-based cross-compiler containers " John Snow
@ 2021-11-03 14:52   ` Philippe Mathieu-Daudé
  2021-11-03 16:56   ` Willian Rampazzo
  1 sibling, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-11-03 14:52 UTC (permalink / raw)
  To: John Snow, qemu-devel
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Willian Rampazzo, Gerd Hoffmann,
	Alex Bennée

On 11/3/21 15:48, John Snow wrote:
> Similarly to the last patch, Fedora 33 will be EOL by the time QEMU 6.2

s/last/previous/ or squash?

> releases, so bump the version for all of the other Fedora containers,
> too.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/docker/dockerfiles/fedora-cris-cross.docker  | 2 +-
>  tests/docker/dockerfiles/fedora-win32-cross.docker | 2 +-
>  tests/docker/dockerfiles/fedora-win64-cross.docker | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>


^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 5/6] docker: update 'python' dockerfile to use Fedora registry
  2021-11-03 14:48 ` [PATCH 5/6] docker: update 'python' dockerfile to use Fedora registry John Snow
@ 2021-11-03 14:55   ` Philippe Mathieu-Daudé
  2021-11-03 16:57   ` Willian Rampazzo
  1 sibling, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-11-03 14:55 UTC (permalink / raw)
  To: John Snow, qemu-devel
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Willian Rampazzo, Gerd Hoffmann,
	Alex Bennée

On 11/3/21 15:48, John Snow wrote:
> Following the lead of 102cd5c294dc, switch from using Docker hub to the
> Fedora registry itself.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/docker/dockerfiles/python.docker | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 2/6] ui/clipboard: Don't use g_autoptr just to free a variable
  2021-11-03 14:48 ` [PATCH 2/6] ui/clipboard: Don't use g_autoptr just to free a variable John Snow
@ 2021-11-03 14:57   ` Marc-André Lureau
  2021-11-03 14:58   ` Daniel P. Berrangé
  1 sibling, 0 replies; 24+ messages in thread
From: Marc-André Lureau @ 2021-11-03 14:57 UTC (permalink / raw)
  To: John Snow
  Cc: Thomas Huth, Daniel Berrange, Alex Bennée, QEMU,
	Wainer dos Santos Moschetta, Philippe Mathieu-Daudé,
	Willian Rampazzo, Gerd Hoffmann, Philippe Mathieu-Daudé

[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]

Hi

On Wed, Nov 3, 2021 at 6:50 PM John Snow <jsnow@redhat.com> wrote:

> Clang doesn't recognize that the variable is being "used" and will emit
> a warning:
>
>   ../ui/clipboard.c:47:34: error: variable 'old' set but not used
> [-Werror,-Wunused-but-set-variable]
>       g_autoptr(QemuClipboardInfo) old = NULL;
>                                  ^
>   1 error generated.
>
> OK, fine. Just do things the old way.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  ui/clipboard.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/ui/clipboard.c b/ui/clipboard.c
> index d7b008d62a..d53576b0f6 100644
> --- a/ui/clipboard.c
> +++ b/ui/clipboard.c
> @@ -44,13 +44,14 @@ void qemu_clipboard_peer_release(QemuClipboardPeer
> *peer,
>
>  void qemu_clipboard_update(QemuClipboardInfo *info)
>  {
> -    g_autoptr(QemuClipboardInfo) old = NULL;
> +    QemuClipboardInfo *old = NULL;
>      assert(info->selection < QEMU_CLIPBOARD_SELECTION__COUNT);
>
>      notifier_list_notify(&clipboard_notifiers, info);
>
>      old = cbinfo[info->selection];
>      cbinfo[info->selection] = qemu_clipboard_info_ref(info);
> +    g_free(old);
>

qemu_clipboard_info_unref(cbinfo[info->selection]), don't need "old" either
then

thanks

 }
>
>  QemuClipboardInfo *qemu_clipboard_info(QemuClipboardSelection selection)
> --
> 2.31.1
>
>
>

-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 2233 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 2/6] ui/clipboard: Don't use g_autoptr just to free a variable
  2021-11-03 14:48 ` [PATCH 2/6] ui/clipboard: Don't use g_autoptr just to free a variable John Snow
  2021-11-03 14:57   ` Marc-André Lureau
@ 2021-11-03 14:58   ` Daniel P. Berrangé
  2021-11-03 15:30     ` John Snow
  1 sibling, 1 reply; 24+ messages in thread
From: Daniel P. Berrangé @ 2021-11-03 14:58 UTC (permalink / raw)
  To: John Snow
  Cc: Thomas Huth, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, qemu-devel, Willian Rampazzo,
	Gerd Hoffmann, Alex Bennée

On Wed, Nov 03, 2021 at 10:48:40AM -0400, John Snow wrote:
> Clang doesn't recognize that the variable is being "used" and will emit
> a warning:
> 
>   ../ui/clipboard.c:47:34: error: variable 'old' set but not used [-Werror,-Wunused-but-set-variable]
>       g_autoptr(QemuClipboardInfo) old = NULL;
>                                  ^
>   1 error generated.
> 
> OK, fine. Just do things the old way.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  ui/clipboard.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/ui/clipboard.c b/ui/clipboard.c
> index d7b008d62a..d53576b0f6 100644
> --- a/ui/clipboard.c
> +++ b/ui/clipboard.c
> @@ -44,13 +44,14 @@ void qemu_clipboard_peer_release(QemuClipboardPeer *peer,
>  
>  void qemu_clipboard_update(QemuClipboardInfo *info)
>  {
> -    g_autoptr(QemuClipboardInfo) old = NULL;
> +    QemuClipboardInfo *old = NULL;
>      assert(info->selection < QEMU_CLIPBOARD_SELECTION__COUNT);
>  
>      notifier_list_notify(&clipboard_notifiers, info);
>  
>      old = cbinfo[info->selection];
>      cbinfo[info->selection] = qemu_clipboard_info_ref(info);
> +    g_free(old);
>  }

Surely the right answer here is to get rid of the variable
entirely as it isn't adding value

   g_free(cbinfo[info->selection]);


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 :|



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 2/6] ui/clipboard: Don't use g_autoptr just to free a variable
  2021-11-03 14:58   ` Daniel P. Berrangé
@ 2021-11-03 15:30     ` John Snow
  0 siblings, 0 replies; 24+ messages in thread
From: John Snow @ 2021-11-03 15:30 UTC (permalink / raw)
  To: Daniel P. Berrangé
  Cc: Thomas Huth, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, qemu-devel, Willian Rampazzo,
	Gerd Hoffmann, Alex Bennée

[-- Attachment #1: Type: text/plain, Size: 1570 bytes --]

On Wed, Nov 3, 2021 at 10:59 AM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> On Wed, Nov 03, 2021 at 10:48:40AM -0400, John Snow wrote:
> > Clang doesn't recognize that the variable is being "used" and will emit
> > a warning:
> >
> >   ../ui/clipboard.c:47:34: error: variable 'old' set but not used
> [-Werror,-Wunused-but-set-variable]
> >       g_autoptr(QemuClipboardInfo) old = NULL;
> >                                  ^
> >   1 error generated.
> >
> > OK, fine. Just do things the old way.
> >
> > Signed-off-by: John Snow <jsnow@redhat.com>
> > ---
> >  ui/clipboard.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/ui/clipboard.c b/ui/clipboard.c
> > index d7b008d62a..d53576b0f6 100644
> > --- a/ui/clipboard.c
> > +++ b/ui/clipboard.c
> > @@ -44,13 +44,14 @@ void qemu_clipboard_peer_release(QemuClipboardPeer
> *peer,
> >
> >  void qemu_clipboard_update(QemuClipboardInfo *info)
> >  {
> > -    g_autoptr(QemuClipboardInfo) old = NULL;
> > +    QemuClipboardInfo *old = NULL;
> >      assert(info->selection < QEMU_CLIPBOARD_SELECTION__COUNT);
> >
> >      notifier_list_notify(&clipboard_notifiers, info);
> >
> >      old = cbinfo[info->selection];
> >      cbinfo[info->selection] = qemu_clipboard_info_ref(info);
> > +    g_free(old);
> >  }
>
> Surely the right answer here is to get rid of the variable
> entirely as it isn't adding value
>
>    g_free(cbinfo[info->selection]);
>

Alrighty, I'll clean it up.

Respin pending comments on 1/6 and 6/6.

--js

[-- Attachment #2: Type: text/html, Size: 2283 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 3/6] docker: update fedora container to Fedora 34
  2021-11-03 14:48 ` [PATCH 3/6] docker: update fedora container to Fedora 34 John Snow
  2021-11-03 14:52   ` Philippe Mathieu-Daudé
@ 2021-11-03 16:55   ` Willian Rampazzo
  1 sibling, 0 replies; 24+ messages in thread
From: Willian Rampazzo @ 2021-11-03 16:55 UTC (permalink / raw)
  To: John Snow
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, qemu-devel, Gerd Hoffmann,
	Alex Bennée

On Wed, Nov 3, 2021 at 11:50 AM John Snow <jsnow@redhat.com> wrote:
>
> Fedora 33 will be EOL 2021-11-23, before QEMU 6.2 will release. Upgrade
> the version we're testing as our minimum now.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/docker/dockerfiles/fedora.docker | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

Reviewed-by: Willian Rampazzo <willianr@redhat.com>



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 4/6] docker: update Fedora-based cross-compiler containers to Fedora 34
  2021-11-03 14:48 ` [PATCH 4/6] docker: update Fedora-based cross-compiler containers " John Snow
  2021-11-03 14:52   ` Philippe Mathieu-Daudé
@ 2021-11-03 16:56   ` Willian Rampazzo
  1 sibling, 0 replies; 24+ messages in thread
From: Willian Rampazzo @ 2021-11-03 16:56 UTC (permalink / raw)
  To: John Snow
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, qemu-devel, Gerd Hoffmann,
	Alex Bennée

On Wed, Nov 3, 2021 at 11:50 AM John Snow <jsnow@redhat.com> wrote:
>
> Similarly to the last patch, Fedora 33 will be EOL by the time QEMU 6.2
> releases, so bump the version for all of the other Fedora containers,
> too.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/docker/dockerfiles/fedora-cris-cross.docker  | 2 +-
>  tests/docker/dockerfiles/fedora-win32-cross.docker | 2 +-
>  tests/docker/dockerfiles/fedora-win64-cross.docker | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>

Reviewed-by: Willian Rampazzo <willianr@redhat.com>



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 5/6] docker: update 'python' dockerfile to use Fedora registry
  2021-11-03 14:48 ` [PATCH 5/6] docker: update 'python' dockerfile to use Fedora registry John Snow
  2021-11-03 14:55   ` Philippe Mathieu-Daudé
@ 2021-11-03 16:57   ` Willian Rampazzo
  1 sibling, 0 replies; 24+ messages in thread
From: Willian Rampazzo @ 2021-11-03 16:57 UTC (permalink / raw)
  To: John Snow
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, qemu-devel, Gerd Hoffmann,
	Alex Bennée

On Wed, Nov 3, 2021 at 11:50 AM John Snow <jsnow@redhat.com> wrote:
>
> Following the lead of 102cd5c294dc, switch from using Docker hub to the
> Fedora registry itself.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/docker/dockerfiles/python.docker | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

Reviewed-by: Willian Rampazzo <willianr@redhat.com>



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 6/6] docker: Add Fedora 35 container
  2021-11-03 14:48 ` [PATCH 6/6] docker: Add Fedora 35 container John Snow
@ 2021-11-03 16:59   ` Daniel P. Berrangé
  2021-11-03 17:51     ` John Snow
  0 siblings, 1 reply; 24+ messages in thread
From: Daniel P. Berrangé @ 2021-11-03 16:59 UTC (permalink / raw)
  To: John Snow
  Cc: Thomas Huth, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, qemu-devel, Willian Rampazzo,
	Gerd Hoffmann, Alex Bennée

On Wed, Nov 03, 2021 at 10:48:44AM -0400, John Snow wrote:
> Or, more accurately, update our current Fedora container to Fedora 35,
> and then add a new fedora34 container and build test.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  .gitlab-ci.d/buildtest.yml               |  16 ++++
>  .gitlab-ci.d/container-core.yml          |   5 +
>  tests/docker/dockerfiles/fedora.docker   |   2 +-
>  tests/docker/dockerfiles/fedora34.docker | 117 +++++++++++++++++++++++

We already struggle with having too much work in the CI pipeline
and will be in trouble when they start enforcing CI limits.

With that in mind I'm not sure that having both Fedora versions
brings large enough benefit to justify the CI CPU time burnt.

If we did want both versions though, we should be consistent
with file naming - ie fedora35.dockre, not fedora.docker
to match fedora34.docker.

>  4 files changed, 139 insertions(+), 1 deletion(-)
>  create mode 100644 tests/docker/dockerfiles/fedora34.docker
> 
> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
> index 5c378e35f9..9d9330b646 100644
> --- a/.gitlab-ci.d/buildtest.yml
> +++ b/.gitlab-ci.d/buildtest.yml
> @@ -100,6 +100,22 @@ acceptance-system-debian:
>      IMAGE: debian-amd64
>      MAKE_CHECK_ARGS: check-acceptance
>  
> +build-system-fedora34:
> +  extends: .native_build_job_template
> +  needs:
> +    job: amd64-fedora34-container
> +  variables:
> +    IMAGE: fedora34
> +    CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs
> +             --enable-fdt=system --enable-slirp=system --enable-capstone=system
> +    TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu
> +      xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu
> +    MAKE_CHECK_ARGS: check-build
> +  artifacts:
> +    expire_in: 2 days
> +    paths:
> +      - build
> +
>  build-system-fedora:
>    extends: .native_build_job_template
>    needs:
> diff --git a/.gitlab-ci.d/container-core.yml b/.gitlab-ci.d/container-core.yml
> index e8dd1f476a..96a71e88ff 100644
> --- a/.gitlab-ci.d/container-core.yml
> +++ b/.gitlab-ci.d/container-core.yml
> @@ -6,6 +6,11 @@ amd64-centos8-container:
>    variables:
>      NAME: centos8
>  
> +amd64-fedora34-container:
> +  extends: .container_job_template
> +  variables:
> +    NAME: fedora34
> +
>  amd64-fedora-container:
>    extends: .container_job_template
>    variables:
> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
> index 44d7f12110..24aca97cd7 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -1,4 +1,4 @@
> -FROM registry.fedoraproject.org/fedora:34
> +FROM registry.fedoraproject.org/fedora:35
>  
>  # Please keep this list sorted alphabetically
>  ENV PACKAGES \
> diff --git a/tests/docker/dockerfiles/fedora34.docker b/tests/docker/dockerfiles/fedora34.docker
> new file mode 100644
> index 0000000000..44d7f12110
> --- /dev/null
> +++ b/tests/docker/dockerfiles/fedora34.docker
> @@ -0,0 +1,117 @@
> +FROM registry.fedoraproject.org/fedora:34
> +
> +# Please keep this list sorted alphabetically
> +ENV PACKAGES \
> +    SDL2-devel \
> +    SDL2_image-devel \
> +    alsa-lib-devel \
> +    bc \
> +    brlapi-devel \
> +    bzip2 \
> +    bzip2-devel \
> +    ca-certificates \
> +    capstone-devel \
> +    ccache \
> +    clang \
> +    ctags \
> +    cyrus-sasl-devel \
> +    daxctl-devel \
> +    dbus-daemon \
> +    device-mapper-multipath-devel \
> +    diffutils \
> +    findutils \
> +    gcc \
> +    gcc-c++ \
> +    gcovr \
> +    genisoimage \
> +    gettext \
> +    git \
> +    glib2-devel \
> +    glibc-langpack-en \
> +    glibc-static \
> +    glusterfs-api-devel \
> +    gnutls-devel \
> +    gtk3-devel \
> +    hostname \
> +    jemalloc-devel \
> +    libaio-devel \
> +    libasan \
> +    libattr-devel \
> +    libbpf-devel \
> +    libcacard-devel \
> +    libcap-ng-devel \
> +    libcurl-devel \
> +    libdrm-devel \
> +    libepoxy-devel \
> +    libfdt-devel \
> +    libffi-devel \
> +    libgcrypt-devel \
> +    libiscsi-devel \
> +    libjpeg-devel \
> +    libnfs-devel \
> +    libpmem-devel \
> +    libpng-devel \
> +    librbd-devel \
> +    libseccomp-devel \
> +    libslirp-devel \
> +    libssh-devel \
> +    libtasn1-devel \
> +    libubsan \
> +    libudev-devel \
> +    liburing-devel \
> +    libusbx-devel \
> +    libxml2-devel \
> +    libzstd-devel \
> +    llvm \
> +    lttng-ust-devel \
> +    lzo-devel \
> +    make \
> +    mesa-libgbm-devel \
> +    meson \
> +    ncurses-devel \
> +    nettle-devel \
> +    ninja-build \
> +    nmap-ncat \
> +    numactl-devel \
> +    openssh-clients \
> +    pam-devel \
> +    perl-Test-Harness \
> +    perl-base \
> +    pixman-devel \
> +    pkgconfig \
> +    pulseaudio-libs-devel \
> +    python3 \
> +    python3-PyYAML \
> +    python3-numpy \
> +    python3-opencv \
> +    python3-pillow \
> +    python3-pip \
> +    python3-sphinx \
> +    python3-sphinx_rtd_theme \
> +    python3-virtualenv \
> +    rdma-core-devel \
> +    rpm \
> +    sed \
> +    snappy-devel \
> +    sparse \
> +    spice-protocol \
> +    spice-server-devel \
> +    systemd-devel \
> +    systemtap-sdt-devel \
> +    tar \
> +    tesseract \
> +    tesseract-langpack-eng \
> +    texinfo \
> +    usbredir-devel \
> +    util-linux \
> +    virglrenderer-devel \
> +    vte291-devel \
> +    which \
> +    xen-devel \
> +    xfsprogs-devel \
> +    zlib-devel
> +ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
> +
> +RUN dnf install -y $PACKAGES
> +RUN rpm -q $PACKAGES | sort > /packages.txt
> +ENV PATH $PATH:/usr/libexec/python3-sphinx/
> -- 
> 2.31.1
> 

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 :|



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 6/6] docker: Add Fedora 35 container
  2021-11-03 16:59   ` Daniel P. Berrangé
@ 2021-11-03 17:51     ` John Snow
  2021-11-03 18:53       ` Philippe Mathieu-Daudé
  0 siblings, 1 reply; 24+ messages in thread
From: John Snow @ 2021-11-03 17:51 UTC (permalink / raw)
  To: Daniel P. Berrangé
  Cc: Thomas Huth, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, qemu-devel, Willian Rampazzo,
	Gerd Hoffmann, Alex Bennée

[-- Attachment #1: Type: text/plain, Size: 7550 bytes --]

On Wed, Nov 3, 2021 at 1:01 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> On Wed, Nov 03, 2021 at 10:48:44AM -0400, John Snow wrote:
> > Or, more accurately, update our current Fedora container to Fedora 35,
> > and then add a new fedora34 container and build test.
> >
> > Signed-off-by: John Snow <jsnow@redhat.com>
> > ---
> >  .gitlab-ci.d/buildtest.yml               |  16 ++++
> >  .gitlab-ci.d/container-core.yml          |   5 +
> >  tests/docker/dockerfiles/fedora.docker   |   2 +-
> >  tests/docker/dockerfiles/fedora34.docker | 117 +++++++++++++++++++++++
>
> We already struggle with having too much work in the CI pipeline
> and will be in trouble when they start enforcing CI limits.
>
> With that in mind I'm not sure that having both Fedora versions
> brings large enough benefit to justify the CI CPU time burnt.
>
>
Fair. I'd say having stuff like ubuntu21.10 is more important than having
both f34/f35. I have a keen interest on pushing forward into bleeding edge
releases to identify potential issues sooner rather than later; and can
generally trust that the older releases are well traveled through
developer's personal machines.


> If we did want both versions though, we should be consistent
> with file naming - ie fedora35.dockre, not fedora.docker
> to match fedora34.docker.
>
>
OK. I was originally considering the "unversioned" file to be the "most
recent one" that would update on a rolling schedule. On IRC you made a good
point that when we fork a stable branch, we actually don't want this
behavior. Explicit naming is therefore the best policy.

I am still somewhat interested in having the F34 image, but we don't need
it on the CI platform right now. Maybe it could be included later on as a
target of lesser value to only be run occasionally, but I can worry about
that a little later.


> >  4 files changed, 139 insertions(+), 1 deletion(-)
> >  create mode 100644 tests/docker/dockerfiles/fedora34.docker
> >
> > diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
> > index 5c378e35f9..9d9330b646 100644
> > --- a/.gitlab-ci.d/buildtest.yml
> > +++ b/.gitlab-ci.d/buildtest.yml
> > @@ -100,6 +100,22 @@ acceptance-system-debian:
> >      IMAGE: debian-amd64
> >      MAKE_CHECK_ARGS: check-acceptance
> >
> > +build-system-fedora34:
> > +  extends: .native_build_job_template
> > +  needs:
> > +    job: amd64-fedora34-container
> > +  variables:
> > +    IMAGE: fedora34
> > +    CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs
> > +             --enable-fdt=system --enable-slirp=system
> --enable-capstone=system
> > +    TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu
> > +      xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu
> sparc64-softmmu
> > +    MAKE_CHECK_ARGS: check-build
> > +  artifacts:
> > +    expire_in: 2 days
> > +    paths:
> > +      - build
> > +
> >  build-system-fedora:
> >    extends: .native_build_job_template
> >    needs:
> > diff --git a/.gitlab-ci.d/container-core.yml
> b/.gitlab-ci.d/container-core.yml
> > index e8dd1f476a..96a71e88ff 100644
> > --- a/.gitlab-ci.d/container-core.yml
> > +++ b/.gitlab-ci.d/container-core.yml
> > @@ -6,6 +6,11 @@ amd64-centos8-container:
> >    variables:
> >      NAME: centos8
> >
> > +amd64-fedora34-container:
> > +  extends: .container_job_template
> > +  variables:
> > +    NAME: fedora34
> > +
> >  amd64-fedora-container:
> >    extends: .container_job_template
> >    variables:
> > diff --git a/tests/docker/dockerfiles/fedora.docker
> b/tests/docker/dockerfiles/fedora.docker
> > index 44d7f12110..24aca97cd7 100644
> > --- a/tests/docker/dockerfiles/fedora.docker
> > +++ b/tests/docker/dockerfiles/fedora.docker
> > @@ -1,4 +1,4 @@
> > -FROM registry.fedoraproject.org/fedora:34
> > +FROM registry.fedoraproject.org/fedora:35
> >
> >  # Please keep this list sorted alphabetically
> >  ENV PACKAGES \
> > diff --git a/tests/docker/dockerfiles/fedora34.docker
> b/tests/docker/dockerfiles/fedora34.docker
> > new file mode 100644
> > index 0000000000..44d7f12110
> > --- /dev/null
> > +++ b/tests/docker/dockerfiles/fedora34.docker
> > @@ -0,0 +1,117 @@
> > +FROM registry.fedoraproject.org/fedora:34
> > +
> > +# Please keep this list sorted alphabetically
> > +ENV PACKAGES \
> > +    SDL2-devel \
> > +    SDL2_image-devel \
> > +    alsa-lib-devel \
> > +    bc \
> > +    brlapi-devel \
> > +    bzip2 \
> > +    bzip2-devel \
> > +    ca-certificates \
> > +    capstone-devel \
> > +    ccache \
> > +    clang \
> > +    ctags \
> > +    cyrus-sasl-devel \
> > +    daxctl-devel \
> > +    dbus-daemon \
> > +    device-mapper-multipath-devel \
> > +    diffutils \
> > +    findutils \
> > +    gcc \
> > +    gcc-c++ \
> > +    gcovr \
> > +    genisoimage \
> > +    gettext \
> > +    git \
> > +    glib2-devel \
> > +    glibc-langpack-en \
> > +    glibc-static \
> > +    glusterfs-api-devel \
> > +    gnutls-devel \
> > +    gtk3-devel \
> > +    hostname \
> > +    jemalloc-devel \
> > +    libaio-devel \
> > +    libasan \
> > +    libattr-devel \
> > +    libbpf-devel \
> > +    libcacard-devel \
> > +    libcap-ng-devel \
> > +    libcurl-devel \
> > +    libdrm-devel \
> > +    libepoxy-devel \
> > +    libfdt-devel \
> > +    libffi-devel \
> > +    libgcrypt-devel \
> > +    libiscsi-devel \
> > +    libjpeg-devel \
> > +    libnfs-devel \
> > +    libpmem-devel \
> > +    libpng-devel \
> > +    librbd-devel \
> > +    libseccomp-devel \
> > +    libslirp-devel \
> > +    libssh-devel \
> > +    libtasn1-devel \
> > +    libubsan \
> > +    libudev-devel \
> > +    liburing-devel \
> > +    libusbx-devel \
> > +    libxml2-devel \
> > +    libzstd-devel \
> > +    llvm \
> > +    lttng-ust-devel \
> > +    lzo-devel \
> > +    make \
> > +    mesa-libgbm-devel \
> > +    meson \
> > +    ncurses-devel \
> > +    nettle-devel \
> > +    ninja-build \
> > +    nmap-ncat \
> > +    numactl-devel \
> > +    openssh-clients \
> > +    pam-devel \
> > +    perl-Test-Harness \
> > +    perl-base \
> > +    pixman-devel \
> > +    pkgconfig \
> > +    pulseaudio-libs-devel \
> > +    python3 \
> > +    python3-PyYAML \
> > +    python3-numpy \
> > +    python3-opencv \
> > +    python3-pillow \
> > +    python3-pip \
> > +    python3-sphinx \
> > +    python3-sphinx_rtd_theme \
> > +    python3-virtualenv \
> > +    rdma-core-devel \
> > +    rpm \
> > +    sed \
> > +    snappy-devel \
> > +    sparse \
> > +    spice-protocol \
> > +    spice-server-devel \
> > +    systemd-devel \
> > +    systemtap-sdt-devel \
> > +    tar \
> > +    tesseract \
> > +    tesseract-langpack-eng \
> > +    texinfo \
> > +    usbredir-devel \
> > +    util-linux \
> > +    virglrenderer-devel \
> > +    vte291-devel \
> > +    which \
> > +    xen-devel \
> > +    xfsprogs-devel \
> > +    zlib-devel
> > +ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
> > +
> > +RUN dnf install -y $PACKAGES
> > +RUN rpm -q $PACKAGES | sort > /packages.txt
> > +ENV PATH $PATH:/usr/libexec/python3-sphinx/
> > --
> > 2.31.1
> >
>
> 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 :|
>
>

[-- Attachment #2: Type: text/html, Size: 10425 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 6/6] docker: Add Fedora 35 container
  2021-11-03 17:51     ` John Snow
@ 2021-11-03 18:53       ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-11-03 18:53 UTC (permalink / raw)
  To: John Snow, Daniel P. Berrangé
  Cc: Thomas Huth, Alex Bennée, qemu-devel,
	Wainer dos Santos Moschetta, Willian Rampazzo, Gerd Hoffmann,
	Philippe Mathieu-Daudé

On 11/3/21 18:51, John Snow wrote:> On Wed, Nov 3, 2021 at 1:01 PM
Daniel P. Berrangé <berrange@redhat.com
> <mailto:berrange@redhat.com>> wrote:
> 
>     On Wed, Nov 03, 2021 at 10:48:44AM -0400, John Snow wrote:
>     > Or, more accurately, update our current Fedora container to Fedora 35,
>     > and then add a new fedora34 container and build test.
>     >
>     > Signed-off-by: John Snow <jsnow@redhat.com <mailto:jsnow@redhat.com>>
>     > ---
>     >  .gitlab-ci.d/buildtest.yml               |  16 ++++
>     >  .gitlab-ci.d/container-core.yml          |   5 +
>     >  tests/docker/dockerfiles/fedora.docker   |   2 +-
>     >  tests/docker/dockerfiles/fedora34.docker | 117
>     +++++++++++++++++++++++
> 
>     We already struggle with having too much work in the CI pipeline
>     and will be in trouble when they start enforcing CI limits.
> 
>     With that in mind I'm not sure that having both Fedora versions
>     brings large enough benefit to justify the CI CPU time burnt.
> 
> 
> Fair. I'd say having stuff like ubuntu21.10 is more important than
> having both f34/f35. I have a keen interest on pushing forward into
> bleeding edge releases to identify potential issues sooner rather than
> later; and can generally trust that the older releases are well traveled
> through developer's personal machines.
>  
> 
>     If we did want both versions though, we should be consistent
>     with file naming - ie fedora35.dockre, not fedora.docker
>     to match fedora34.docker.
> 
> 
> OK. I was originally considering the "unversioned" file to be the "most
> recent one" that would update on a rolling schedule. On IRC you made a
> good point that when we fork a stable branch, we actually don't want
> this behavior. Explicit naming is therefore the best policy.
> 
> I am still somewhat interested in having the F34 image, but we don't
> need it on the CI platform right now. Maybe it could be included later
> on as a target of lesser value to only be run occasionally, but I can
> worry about that a little later.

I agree with Daniel, this is not ideal on mainstream CI.

However you can add it to your fork, see commit 8b185c815ce
("gitlab: Document how forks can use different set of jobs"):

+# To use a different set of jobs than the mainstream QEMU project,
+# you need to set the location of your custom yml file at "custom CI/CD
+# configuration path", on your GitLab CI namespace:
+#
https://docs.gitlab.com/ee/ci/pipelines/settings.html#custom-cicd-configuration-path



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 1/6] spice: Update QXLInterface for spice >= 0.15.0
  2021-11-03 14:48 ` [PATCH 1/6] spice: Update QXLInterface for spice >= 0.15.0 John Snow
@ 2021-11-04  6:47   ` Gerd Hoffmann
  0 siblings, 0 replies; 24+ messages in thread
From: Gerd Hoffmann @ 2021-11-04  6:47 UTC (permalink / raw)
  To: John Snow
  Cc: Thomas Huth, Daniel Berrange, Philippe Mathieu-Daudé,
	qemu-devel, Wainer dos Santos Moschetta,
	Philippe Mathieu-Daudé,
	Willian Rampazzo, Alex Bennée

On Wed, Nov 03, 2021 at 10:48:39AM -0400, John Snow wrote:
> spice updated the spelling (and arguments) of "attache_worker" in
> 0.15.0. Update QEMU to match, preventing -Wdeprecated-declarations
> compilations from reporting build errors.
> 
> See also:
> https://gitlab.freedesktop.org/spice/spice/-/commit/974692bda1e77af92b71ed43b022439448492cb9

Hmm, quite alot of #ifdef for a relatively simple change.
I don't see a simpler / better way though.

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

take care,
  Gerd



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 0/6] tests/docker: Update Fedora containers
  2021-11-03 14:48 [PATCH 0/6] tests/docker: Update Fedora containers John Snow
                   ` (5 preceding siblings ...)
  2021-11-03 14:48 ` [PATCH 6/6] docker: Add Fedora 35 container John Snow
@ 2021-11-24 12:19 ` Daniel P. Berrangé
  2021-11-24 12:34   ` Philippe Mathieu-Daudé
  6 siblings, 1 reply; 24+ messages in thread
From: Daniel P. Berrangé @ 2021-11-24 12:19 UTC (permalink / raw)
  To: John Snow
  Cc: Thomas Huth, Philippe Mathieu-Daudé,
	Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, qemu-devel, Willian Rampazzo,
	Gerd Hoffmann, Alex Bennée

On Wed, Nov 03, 2021 at 10:48:38AM -0400, John Snow wrote:
> Fedora 33 will be EOL before 6.2 ships; Fedora 35 was just
> released. Update our various containers to test on F34 and F35.
> 
> Fix a minor code warning issue that surfaces in a new version of Clang,
> and fix a small deprecation issue for the latest version of spice.
> 
> In testing, I found that oss-fuzz was more likely to time out on GitLab;
> it's unclear if this is a performance regression or just getting unlucky
> with when I test.

For me it times out every time on Fedora 35. In fact if I run it
locally, it doesnn't even finish after 24 hours ! There's a real
bug in there somewhere.


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 :|



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 0/6] tests/docker: Update Fedora containers
  2021-11-24 12:19 ` [PATCH 0/6] tests/docker: Update Fedora containers Daniel P. Berrangé
@ 2021-11-24 12:34   ` Philippe Mathieu-Daudé
  2021-11-24 12:51     ` Alex Bennée
  0 siblings, 1 reply; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-11-24 12:34 UTC (permalink / raw)
  To: Daniel P. Berrangé, Alexander Bulekov
  Cc: Thomas Huth, John Snow, qemu-devel, Wainer dos Santos Moschetta,
	Philippe Mathieu-Daudé,
	Willian Rampazzo, Gerd Hoffmann, Alex Bennée

Cc'ing Alex.

On 11/24/21 13:19, Daniel P. Berrangé wrote:
> On Wed, Nov 03, 2021 at 10:48:38AM -0400, John Snow wrote:
>> Fedora 33 will be EOL before 6.2 ships; Fedora 35 was just
>> released. Update our various containers to test on F34 and F35.
>>
>> Fix a minor code warning issue that surfaces in a new version of Clang,
>> and fix a small deprecation issue for the latest version of spice.
>>
>> In testing, I found that oss-fuzz was more likely to time out on GitLab;
>> it's unclear if this is a performance regression or just getting unlucky
>> with when I test.
> 
> For me it times out every time on Fedora 35. In fact if I run it
> locally, it doesnn't even finish after 24 hours ! There's a real
> bug in there somewhere.
> 
> 
> Regards,
> Daniel
> 



^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 0/6] tests/docker: Update Fedora containers
  2021-11-24 12:34   ` Philippe Mathieu-Daudé
@ 2021-11-24 12:51     ` Alex Bennée
  2021-11-24 12:59       ` Philippe Mathieu-Daudé
  0 siblings, 1 reply; 24+ messages in thread
From: Alex Bennée @ 2021-11-24 12:51 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé
  Cc: Thomas Huth, Daniel P. Berrangé,
	qemu-devel, Wainer dos Santos Moschetta, Willian Rampazzo,
	Alexander Bulekov, Gerd Hoffmann, John Snow


Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> Cc'ing Alex.
>
> On 11/24/21 13:19, Daniel P. Berrangé wrote:
>> On Wed, Nov 03, 2021 at 10:48:38AM -0400, John Snow wrote:
>>> Fedora 33 will be EOL before 6.2 ships; Fedora 35 was just
>>> released. Update our various containers to test on F34 and F35.
>>>
>>> Fix a minor code warning issue that surfaces in a new version of Clang,
>>> and fix a small deprecation issue for the latest version of spice.
>>>
>>> In testing, I found that oss-fuzz was more likely to time out on GitLab;
>>> it's unclear if this is a performance regression or just getting unlucky
>>> with when I test.
>> 
>> For me it times out every time on Fedora 35. In fact if I run it
>> locally, it doesnn't even finish after 24 hours ! There's a real
>> bug in there somewhere.

Is there an other spin of this series coming? I saw there were some
comments to address so I didn't look in detail myself.

-- 
Alex Bennée


^ permalink raw reply	[flat|nested] 24+ messages in thread
* Re: [PATCH 0/6] tests/docker: Update Fedora containers
  2021-11-24 12:51     ` Alex Bennée
@ 2021-11-24 12:59       ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-11-24 12:59 UTC (permalink / raw)
  To: Alex Bennée
  Cc: Thomas Huth, Daniel P. Berrangé,
	qemu-devel, Wainer dos Santos Moschetta, Willian Rampazzo,
	Alexander Bulekov, Gerd Hoffmann, John Snow

On 11/24/21 13:51, Alex Bennée wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> 
>> Cc'ing Alex.
>>
>> On 11/24/21 13:19, Daniel P. Berrangé wrote:
>>> On Wed, Nov 03, 2021 at 10:48:38AM -0400, John Snow wrote:
>>>> Fedora 33 will be EOL before 6.2 ships; Fedora 35 was just
>>>> released. Update our various containers to test on F34 and F35.
>>>>
>>>> Fix a minor code warning issue that surfaces in a new version of Clang,
>>>> and fix a small deprecation issue for the latest version of spice.
>>>>
>>>> In testing, I found that oss-fuzz was more likely to time out on GitLab;
>>>> it's unclear if this is a performance regression or just getting unlucky
>>>> with when I test.
>>>
>>> For me it times out every time on Fedora 35. In fact if I run it
>>> locally, it doesnn't even finish after 24 hours ! There's a real
>>> bug in there somewhere.
> 
> Is there an other spin of this series coming? I saw there were some
> comments to address so I didn't look in detail myself.

I meant Alexander Bulekov for oss-fuzz :)



^ permalink raw reply	[flat|nested] 24+ messages in thread
end of thread, other threads:[~2021-11-24 13:01 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-03 14:48 [PATCH 0/6] tests/docker: Update Fedora containers John Snow
2021-11-03 14:48 ` [PATCH 1/6] spice: Update QXLInterface for spice >= 0.15.0 John Snow
2021-11-04  6:47   ` Gerd Hoffmann
2021-11-03 14:48 ` [PATCH 2/6] ui/clipboard: Don't use g_autoptr just to free a variable John Snow
2021-11-03 14:57   ` Marc-André Lureau
2021-11-03 14:58   ` Daniel P. Berrangé
2021-11-03 15:30     ` John Snow
2021-11-03 14:48 ` [PATCH 3/6] docker: update fedora container to Fedora 34 John Snow
2021-11-03 14:52   ` Philippe Mathieu-Daudé
2021-11-03 16:55   ` Willian Rampazzo
2021-11-03 14:48 ` [PATCH 4/6] docker: update Fedora-based cross-compiler containers " John Snow
2021-11-03 14:52   ` Philippe Mathieu-Daudé
2021-11-03 16:56   ` Willian Rampazzo
2021-11-03 14:48 ` [PATCH 5/6] docker: update 'python' dockerfile to use Fedora registry John Snow
2021-11-03 14:55   ` Philippe Mathieu-Daudé
2021-11-03 16:57   ` Willian Rampazzo
2021-11-03 14:48 ` [PATCH 6/6] docker: Add Fedora 35 container John Snow
2021-11-03 16:59   ` Daniel P. Berrangé
2021-11-03 17:51     ` John Snow
2021-11-03 18:53       ` Philippe Mathieu-Daudé
2021-11-24 12:19 ` [PATCH 0/6] tests/docker: Update Fedora containers Daniel P. Berrangé
2021-11-24 12:34   ` Philippe Mathieu-Daudé
2021-11-24 12:51     ` Alex Bennée
2021-11-24 12:59       ` Philippe Mathieu-Daudé

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.