diff --git a/tools/packaging/qemu/patches/7.2.x/no_patches.txt b/tools/packaging/qemu/patches/7.2.x/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/packaging/qemu/patches/tag_patches/v7.2.0/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/v7.2.0/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh index 04a48c72d5..61e479237c 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -242,7 +242,9 @@ generate_qemu_options() { # Disable graphical network access qemu_options+=(size:--disable-vnc) qemu_options+=(size:--disable-vnc-jpeg) - qemu_options+=(size:--disable-vnc-png) + if ! gt_eq "${qemu_version}" "7.2.0" ; then + qemu_options+=(size:--disable-vnc-png) + fi qemu_options+=(size:--disable-vnc-sasl) # Disable PAM authentication: it's a feature used together with VNC access @@ -330,13 +332,16 @@ generate_qemu_options() { # building QEMU. case "$arch" in aarch64) + qemu_options+=(functionality:--disable-virtiofsd) ;; x86_64) + qemu_options+=(functionality:--disable-virtiofsd) ;; ppc64le) qemu_options+=(functionality:--enable-virtiofsd) ;; s390x) + qemu_options+=(functionality:--disable-virtiofsd) ;; esac @@ -353,8 +358,10 @@ generate_qemu_options() { qemu_options+=(size:--disable-vde) # Don't build other options which can't be depent on build server. - qemu_options+=(size:--disable-xfsctl) - qemu_options+=(size:--disable-libxml2) + if ! gt_eq "${qemu_version}" "7.2.0" ; then + qemu_options+=(size:--disable-xfsctl) + qemu_options+=(size:--disable-libxml2) + fi qemu_options+=(size:--disable-nettle) # Disable XEN driver diff --git a/versions.yaml b/versions.yaml index 900aed35dd..8b6b53c908 100644 --- a/versions.yaml +++ b/versions.yaml @@ -88,8 +88,8 @@ assets: qemu: description: "VMM that uses KVM" url: "https://github.com/qemu/qemu" - version: "v6.2.0" - tag: "v6.2.0" + version: "v7.2.0" + tag: "v7.2.0" # Do not include any non-full release versions # Break the line *without CR or space being appended*, to appease # yamllint, and note the deliberate ' ' at the end of the expression.