Accepting request 899990 from home:jziviani:branches:Virtualization

- Improve compatibility with gcc 11: target-sh4-Return-error-if-CPUClass-get_.patch tcg-arm-Fix-tcg_out_op-function-signatur.patch - Enable zstd compression option to qcow2 OBS-URL: https://build.opensuse.org/request/show/899990 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=655
2021-06-14 20:25:17 +00:00 · 2021-06-14 20:25:17 +00:00 · 3eae454a42
commit 3eae454a42
parent 9e49deb609
7 changed files with 110 additions and 2 deletions
--- a/bundles.tar.xz
+++ b/bundles.tar.xz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09f26a3085d3c590edd7686b07b2b616cf634538ca073bba97a28323140081f5
-size 51544
+oid sha256:92179c1084cef7f446d3acd5274a99c1da46b7de3456c1603a7f6cf488a1e662
+size 52608
--- a/qemu.changes
+++ b/qemu.changes
@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Jun 11 18:15:25 UTC 2021 - José Ricardo Ziviani <jose.ziviani@suse.com>
+
+- Improve compatibility with gcc 11:
+  target-sh4-Return-error-if-CPUClass-get_.patch
+  tcg-arm-Fix-tcg_out_op-function-signatur.patch
+
+-------------------------------------------------------------------
+Wed Jun  9 13:23:54 UTC 2021 - José Ricardo Ziviani <jose.ziviani@suse.com>
+
+- Enable zstd compression option to qcow2
+
 -------------------------------------------------------------------
 Mon Jun  7 18:13:50 UTC 2021 - José Ricardo Ziviani <jose.ziviani@suse.com>

--- a/qemu.spec
+++ b/qemu.spec
@ -200,6 +200,8 @@ Patch00064:     vhost-user-gpu-fix-leak-in-virgl_cmd_res.patch
 Patch00065:     vhost-user-gpu-fix-leak-in-virgl_resourc.patch
 Patch00066:     vhost-user-gpu-fix-OOB-write-in-virgl_cm.patch
 Patch00067:     vhost-user-gpu-abstract-vg_cleanup_mappi.patch
+Patch00068:     target-sh4-Return-error-if-CPUClass-get_.patch
+Patch00069:     tcg-arm-Fix-tcg_out_op-function-signatur.patch
 # Patches applied in roms/seabios/:
 Patch01000:     seabios-use-python2-explicitly-as-needed.patch
 Patch01001:     seabios-switch-to-python3-as-needed.patch
@ -344,6 +346,7 @@ BuildRequires:  xfsprogs-devel
 %if %{build_x86_firmware_from_source}
 BuildRequires:  pkgconfig(liblzma)
 %endif
+BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(zlib)
 %if "%{name}" == "qemu"
 Requires:       group(kvm)
@ -1100,6 +1103,8 @@ This package records qemu testsuite results and represents successful testing.
 %patch00065 -p1
 %patch00066 -p1
 %patch00067 -p1
+%patch00068 -p1
+%patch00069 -p1
 %patch01000 -p1
 %patch01001 -p1
 %patch01002 -p1
@ -1366,6 +1371,7 @@ cd %blddir
 	--enable-vvfat \
 	--enable-werror \
 	--disable-whpx \
+	--enable-zstd \
 %ifarch x86_64
 	--enable-xen \
 	--enable-xen-pci-passthrough \
--- a/qemu.spec.in
+++ b/qemu.spec.in
@ -257,6 +257,7 @@ BuildRequires:  xfsprogs-devel
 BuildRequires:  pkgconfig(liblzma)
 %endif
 BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libzstd)
 %if "%{name}" == "qemu"
 Requires:       group(kvm)
 Requires:       group(qemu)
@ -1191,6 +1192,7 @@ cd %blddir
 	--enable-vvfat \
 	--enable-werror \
 	--disable-whpx \
+	--enable-zstd \
 %ifarch x86_64
 	--enable-xen \
 	--enable-xen-pci-passthrough \
--- a/target-sh4-Return-error-if-CPUClass-get_.patch
+++ b/target-sh4-Return-error-if-CPUClass-get_.patch
@ -0,0 +1,51 @@
+From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
+Date: Wed, 5 May 2021 18:10:46 +0200
+Subject: target/sh4: Return error if CPUClass::get_phys_page_debug() fails
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Git-commit: 52a1c621f9d56d18212273c64b4119513a2db1f1
+
+If the get_physical_address() call fails, the SH4 get_phys_page_debug()
+handler returns an uninitialized address. Instead return -1, which
+correspond to "no page found" (see cpu_get_phys_page_debug() doc
+string).
+
+This fixes a warning emitted when building with CFLAGS=-O3
+(using GCC 10.2.1 20201125):
+
+  target/sh4/helper.c: In function ‘superh_cpu_get_phys_page_debug’:
+  target/sh4/helper.c:446:12: warning: ‘physical’ may be used uninitialized in this function [-Wmaybe-uninitialized]
+    446 |     return physical;
+        |            ^~~~~~~~
+
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
+Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
+Message-Id: <20210505161046.1397608-1-f4bug@amsat.org>
+Signed-off-by: Laurent Vivier <laurent@vivier.eu>
+Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
+---
+ target/sh4/helper.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/target/sh4/helper.c b/target/sh4/helper.c
+index bd8e034f174d530354913acb7fa1..2d622081e85afec6e40034c24508 100644
+--- a/target/sh4/helper.c
+++ b/target/sh4/helper.c
+@@ -441,9 +441,12 @@ hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
+     target_ulong physical;
+     int prot;
+ 
+-    get_physical_address(&cpu->env, &physical, &prot, addr, MMU_DATA_LOAD);
+    if (get_physical_address(&cpu->env, &physical, &prot, addr, MMU_DATA_LOAD)
+            == MMU_OK) {
+        return physical;
+    }
+ 
+-    return physical;
+    return -1;
+ }
+ 
+ void cpu_load_tlb(CPUSH4State * env)
--- a/tcg-arm-Fix-tcg_out_op-function-signatur.patch
+++ b/tcg-arm-Fix-tcg_out_op-function-signatur.patch
@ -0,0 +1,31 @@
+From: "Jose R. Ziviani" <jziviani@suse.de>
+Date: Thu, 10 Jun 2021 19:44:50 -0300
+Subject: tcg/arm: Fix tcg_out_op function signature
+
+Git-commit: c372565d08e278d6e65a54c8b5ab082bd63234ea
+
+Commit 5e8892db93 fixed several function signatures but tcg_out_op for
+arm is missing. This patch fixes it as well.
+
+Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
+Message-Id: <20210610224450.23425-1-jziviani@suse.de>
+Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
+Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
+---
+ tcg/arm/tcg-target.c.inc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc
+index 8457108a87a17c2628f5a5c83115..cd9ae20037f30c2075cd0bfa5ff5 100644
+--- a/tcg/arm/tcg-target.c.inc
+++ b/tcg/arm/tcg-target.c.inc
+@@ -1710,7 +1710,8 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is64)
+ static void tcg_out_epilogue(TCGContext *s);
+ 
+ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
+-                const TCGArg *args, const int *const_args)
+                const TCGArg args[TCG_MAX_OP_ARGS],
+                const int const_args[TCG_MAX_OP_ARGS])
+ {
+     TCGArg a0, a1, a2, a3, a4, a5;
+     int c;
--- a/update_git.sh
+++ b/update_git.sh
@ -237,6 +237,12 @@ for (( i=0; i <$REPO_COUNT; i++ )); do
                    git -C $GIT_DIR/$SUBDIR bundle create $BUN_DIR/$SUBDIR$GITREPO_COMMIT_ISH.bundle $GITREPO_COMMIT_ISH..FETCH_HEAD
 #TODO: post-process repo info to avoid un-needed diffs (eg git vs https)
                    git -C $(readlink -f ${LOCAL_REPO_MAP[$PATCH_RANGE_INDEX]}) remote get-url origin >$BUN_DIR/$SUBDIR/repo
+                else
+                    local localbundle="$BUN_DIR/$SUBDIR$GITREPO_COMMIT_ISH.bundle"
+                    if [[ -f "$localbundle" ]]; then
+                        echo "Removing existing $localbundle"
+                        rm "$localbundle"
+                    fi
                fi
            fi
        fi