diff --git a/block-qdict-Fix-Werror-maybe-uninitializ.patch b/block-qdict-Fix-Werror-maybe-uninitializ.patch new file mode 100644 index 00000000..6162064b --- /dev/null +++ b/block-qdict-Fix-Werror-maybe-uninitializ.patch @@ -0,0 +1,64 @@ +From: Murilo Opsfelder Araujo +Date: Fri, 11 Mar 2022 19:16:34 -0300 +Subject: block-qdict: Fix -Werror=maybe-uninitialized build failure +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Git-commit: 79854b95446396c8e7f397800c5d86c3d9a7540d +References: bsc#1199625 + +Building QEMU on Fedora 37 (Rawhide Prerelease) ppc64le failed with the +following error: + + $ ../configure --prefix=/usr/local/qemu-disabletcg --target-list=ppc-softmmu,ppc64-softmmu --disable-tcg --disable-linux-user + ... + $ make -j$(nproc) + ... + In file included from /root/qemu/include/qapi/qmp/qdict.h:16, + from /root/qemu/include/block/qdict.h:13, + from ../qobject/block-qdict.c:11: + /root/qemu/include/qapi/qmp/qobject.h: In function ‘qdict_array_split’: + /root/qemu/include/qapi/qmp/qobject.h:49:17: error: ‘subqdict’ may be used uninitialized [-Werror=maybe-uninitialized] + 49 | typeof(obj) _obj = (obj); \ + | ^~~~ + ../qobject/block-qdict.c:227:16: note: ‘subqdict’ declared here + 227 | QDict *subqdict; + | ^~~~~~~~ + cc1: all warnings being treated as errors + +Fix build failure by expanding the ternary operation. +Tested with `make check-unit` (the check-block-qdict test passed). + +Signed-off-by: Murilo Opsfelder Araujo +Cc: Kevin Wolf +Cc: Hanna Reitz +Cc: Markus Armbruster +Message-Id: <20220311221634.58288-1-muriloo@linux.ibm.com> +Reviewed-by: Markus Armbruster +Signed-off-by: Markus Armbruster +Tested-by: Philippe Mathieu-Daudé +Signed-off-by: Dario Faggioli +--- + qobject/block-qdict.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c +index 1487cc5dd8b1cfbd50b9f354bcfa..4a83bda2c3be54994ae6a704b20b 100644 +--- a/qobject/block-qdict.c ++++ b/qobject/block-qdict.c +@@ -251,12 +251,12 @@ void qdict_array_split(QDict *src, QList **dst) + if (is_subqdict) { + qdict_extract_subqdict(src, &subqdict, prefix); + assert(qdict_size(subqdict) > 0); ++ qlist_append_obj(*dst, QOBJECT(subqdict)); + } else { + qobject_ref(subqobj); + qdict_del(src, indexstr); ++ qlist_append_obj(*dst, subqobj); + } +- +- qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict)); + } + } + diff --git a/bundles.tar.xz b/bundles.tar.xz index 23016b2f..bc595ff0 100644 --- a/bundles.tar.xz +++ b/bundles.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ecf0e91f78b91cabf0df72e0dd9c54c9d2d016e581abd8364eea6cc6103df94 -size 135948 +oid sha256:c205305cd9e7d29be6220fe76cab04d5a7be4019e998cfeb643ac6a4e31de0a3 +size 136912 diff --git a/qemu.changes b/qemu.changes index 65e4b92e..54f9dafe 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 23 12:15:45 UTC 2022 - Dario Faggioli + +- Backport a GCC 12 aarch64 build fix +* Patches added: + block-qdict-Fix-Werror-maybe-uninitializ.patch + ------------------------------------------------------------------- Wed May 11 10:30:34 UTC 2022 - Martin Liška diff --git a/qemu.spec b/qemu.spec index bee1889a..9083b476 100644 --- a/qemu.spec +++ b/qemu.spec @@ -247,6 +247,7 @@ Patch00103: python-aqmp-stop-the-server-during-disco.patch Patch00104: python-aqmp-add-start_server-and-accept-.patch Patch00105: python-aqmp-fix-race-condition-in-legacy.patch Patch00106: python-aqmp-drop-_bind_hack.patch +Patch00107: block-qdict-Fix-Werror-maybe-uninitializ.patch # Patches applied in roms/seabios/: Patch01000: seabios-use-python2-explicitly-as-needed.patch Patch01001: seabios-switch-to-python3-as-needed.patch @@ -1276,6 +1277,7 @@ This package records qemu testsuite results and represents successful testing. %patch00104 -p1 %patch00105 -p1 %patch00106 -p1 +%patch00107 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1