Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2020-08-23 09:20:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Sun Aug 23 09:20:45 2020 rev:179 rq:828230 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2020-08-14 09:32:27.932371863 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new.3399/qemu.changes 2020-08-23 09:20:56.742677351 +0200 @@ -1,0 +2,27 @@ +Thu Aug 20 13:19:12 UTC 2020 - Bruce Rogers <[email protected]> + +- Fix compilation errors seen with pre-release gcc 11 + qht-Revert-some-constification-in-qht.c.patch + Revert-qht-constify-qht_statistics_init.patch + help-compiler-out-by-initializing-array.patch + s390x-Fix-stringop-truncation-issue-repo.patch +- Add Split-Provides mechanism, using doc files which were moved + in v5.1.0. This allows for the new subpackages to be selected for + install when the v5.0.0 qemu is updated. These new subpackages are + not marked as "Required" by any packages, in an effort to reduce + the dependencies of the core qemu components (boo#1175320) + v5.0.0 qemu file mapping is provided as follows: + subpackage continuity file provided (files are dummies) + ========== ============================================ + qemu-chardev-baum /usr/share/doc/packages/qemu/qemu-ga-ref.html + qemu-hw-display-qxl /usr/share/doc/packages/qemu/qemu-ga-ref.txt + qemu-hw-usb-redirect /usr/share/doc/packages/qemu/qemu-qmp-ref.html + qemu-hw-usb-smartcard /usr/share/doc/packages/qemu/qemu-qmp-ref.txt + +------------------------------------------------------------------- +Tue Aug 18 15:29:41 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Fix wrong usage of %{_libexecdir} for systemd owned paths below + %{_prefix}/lib. + +------------------------------------------------------------------- New: ---- Revert-qht-constify-qht_statistics_init.patch help-compiler-out-by-initializing-array.patch qemu-ga-ref.html qemu-ga-ref.txt qemu-qmp-ref.html qemu-qmp-ref.txt qht-Revert-some-constification-in-qht.c.patch s390x-Fix-stringop-truncation-issue-repo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.cxsCwq/_old 2020-08-23 09:20:58.818678502 +0200 +++ /var/tmp/diff_new_pack.cxsCwq/_new 2020-08-23 09:20:58.822678504 +0200 @@ -125,6 +125,10 @@ Source14: 50-seabios-256k.json Source15: 60-seabios-128k.json Source200: qemu-rpmlintrc +Source201: qemu-ga-ref.html +Source202: qemu-ga-ref.txt +Source203: qemu-qmp-ref.html +Source204: qemu-qmp-ref.txt Source300: bundles.tar.xz Source301: update_git.sh Source302: config.sh @@ -176,6 +180,9 @@ Patch00040: roms-Makefile-enable-cross-compile-for-b.patch Patch00041: configure-remove-pkgversion-from-CONFIG_.patch Patch00042: docs-add-SUSE-support-statements-to-html.patch +Patch00043: s390x-Fix-stringop-truncation-issue-repo.patch +Patch00044: Revert-qht-constify-qht_statistics_init.patch +Patch00045: qht-Revert-some-constification-in-qht.c.patch # Patches applied in roms/seabios/: Patch01000: seabios-use-python2-explicitly-as-needed.patch Patch01001: seabios-switch-to-python3-as-needed.patch @@ -189,6 +196,7 @@ Patch02005: stub-out-the-SAN-req-s-in-int13.patch Patch02006: ipxe-Makefile-fix-issues-of-build-reprod.patch Patch02007: Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch +Patch02008: help-compiler-out-by-initializing-array.patch # Patches applied in roms/sgabios/: Patch03000: sgabios-Makefile-fix-issues-of-build-rep.patch Patch03001: roms-sgabios-Fix-csum8-to-be-built-by-ho.patch @@ -723,6 +731,7 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 +Provides: %name:%_docdir/%name/qemu-ga-ref.html %{qemu_module_conflicts} %description chardev-baum @@ -733,6 +742,7 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 +Provides: %name:%_docdir/%name/qemu-ga-ref.txt %{qemu_module_conflicts} %description hw-display-qxl @@ -743,20 +753,24 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 +Provides: %name:%_docdir/%name/qemu-qmp-ref.html %{qemu_module_conflicts} %description hw-usb-redirect This package contains a module for USB redirection support. +%if 0%{?is_opensuse} %package hw-usb-smartcard Summary: USB smartcard support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 +Provides: %name:%_docdir/%name/qemu-qmp-ref.txt %{qemu_module_conflicts} %description hw-usb-smartcard This package contains a modules for USB smartcard support. +%endif %package ui-curses Summary: Curses based UI support for QEMU @@ -989,6 +1003,9 @@ %if %{legacy_qemu_kvm} && 0%{?is_opensuse} == 0 %patch00042 -p1 %endif +%patch00043 -p1 +%patch00044 -p1 +%patch00045 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1 @@ -1006,6 +1023,7 @@ %ifarch aarch64 %patch02007 -p1 %endif +%patch02008 -p1 %patch03000 -p1 %patch03001 -p1 %patch08000 -p1 @@ -1670,7 +1688,13 @@ install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service %endif %ifarch s390x -install -D -m 0644 %{SOURCE2} %{buildroot}%_libexecdir/modules-load.d/kvm.conf +install -D -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/modules-load.d/kvm.conf +%endif +install -D -m 0644 %{SOURCE201} %{buildroot}%_docdir/%name/qemu-ga-ref.html +install -D -m 0644 %{SOURCE202} %{buildroot}%_docdir/%name/qemu-ga-ref.txt +install -D -m 0644 %{SOURCE203} %{buildroot}%_docdir/%name/qemu-qmp-ref.html +%if 0%{?is_opensuse} +install -D -m 0644 %{SOURCE204} %{buildroot}%_docdir/%name/qemu-qmp-ref.txt %endif %fdupes -s %{buildroot} @@ -1915,7 +1939,7 @@ %dir %_sysconfdir/%name/firmware %if %{kvm_available} %ifarch s390x -%_libexecdir/modules-load.d/kvm.conf +%{_prefix}/lib/modules-load.d/kvm.conf %endif /usr/lib/udev/rules.d/80-kvm.rules %endif @@ -2086,24 +2110,32 @@ %files chardev-baum %defattr(-, root, root) +%dir %_docdir/%name %dir %_libdir/%name %_libdir/%name/chardev-baum.so +%_docdir/%name/qemu-ga-ref.html %files hw-display-qxl %defattr(-, root, root) +%dir %_docdir/%name %dir %_libdir/%name %_libdir/%name/hw-display-qxl.so +%_docdir/%name/qemu-ga-ref.txt %files hw-usb-redirect %defattr(-, root, root) +%dir %_docdir/%name %dir %_libdir/%name %_libdir/%name/hw-usb-redirect.so +%_docdir/%name/qemu-qmp-ref.html %if 0%{?is_opensuse} %files hw-usb-smartcard %defattr(-, root, root) +%dir %_docdir/%name %dir %_libdir/%name %_libdir/%name/hw-usb-smartcard.so +%_docdir/%name/qemu-qmp-ref.txt %endif %files ui-curses ++++++ Revert-qht-constify-qht_statistics_init.patch ++++++ From: Bruce Rogers <[email protected]> Date: Thu, 13 Aug 2020 13:07:56 -0600 Subject: Revert "qht: constify qht_statistics_init" This reverts commit 6579f10779b5b5ed2e978e7b8cae7bcbf8665254. This change partially addresses https://bugs.launchpad.net/qemu/+bug/1886155 where a pre-release gcc 11 warns about const qualifier abuse. Signed-off-by: Bruce Rogers <[email protected]> --- include/qemu/qht.h | 2 +- util/qht.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/qemu/qht.h b/include/qemu/qht.h index 758c7ac6c89978ee762e9d946584..2e2d6bca932c83bea993850b60f8 100644 --- a/include/qemu/qht.h +++ b/include/qemu/qht.h @@ -211,7 +211,7 @@ void qht_iter_remove(struct qht *ht, qht_iter_bool_func_t func, void *userp); * When done with @stats, pass the struct to qht_statistics_destroy(). * Failing to do this will leak memory. */ -void qht_statistics_init(const struct qht *ht, struct qht_stats *stats); +void qht_statistics_init(struct qht *ht, struct qht_stats *stats); /** * qht_statistics_destroy - Destroy a &struct qht_stats diff --git a/util/qht.c b/util/qht.c index 67e5d5b9163f5f33e41f76a7cd26..a5a332d98998209875a47ebfdeee 100644 --- a/util/qht.c +++ b/util/qht.c @@ -900,9 +900,9 @@ bool qht_resize(struct qht *ht, size_t n_elems) } /* pass @stats to qht_statistics_destroy() when done */ -void qht_statistics_init(const struct qht *ht, struct qht_stats *stats) +void qht_statistics_init(struct qht *ht, struct qht_stats *stats) { - const struct qht_map *map; + struct qht_map *map; int i; map = atomic_rcu_read(&ht->map); @@ -919,8 +919,8 @@ void qht_statistics_init(const struct qht *ht, struct qht_stats *stats) stats->head_buckets = map->n_buckets; for (i = 0; i < map->n_buckets; i++) { - const struct qht_bucket *head = &map->buckets[i]; - const struct qht_bucket *b; + struct qht_bucket *head = &map->buckets[i]; + struct qht_bucket *b; unsigned int version; size_t buckets; size_t entries; ++++++ bundles.tar.xz ++++++ Binary files old/d0ed6a69d399ae193959225cdeaa9382746c91cc.bundle and new/d0ed6a69d399ae193959225cdeaa9382746c91cc.bundle differ Binary files old/e1d322c40524d2c544d1fcd37b267d106d16d328.bundle and new/e1d322c40524d2c544d1fcd37b267d106d16d328.bundle differ Binary files old/roms/ipxe/de4565cbe76ea9f7913a01f331be3ee901bb6e17.bundle and new/roms/ipxe/de4565cbe76ea9f7913a01f331be3ee901bb6e17.bundle differ Binary files old/roms/seabios/d9c812dda519a1a73e8370e1b81ddf46eb22ed16.bundle and new/roms/seabios/d9c812dda519a1a73e8370e1b81ddf46eb22ed16.bundle differ Binary files old/roms/sgabios/cbaee52287e5f32373181cff50a00b6c4ac9015a.bundle and new/roms/sgabios/cbaee52287e5f32373181cff50a00b6c4ac9015a.bundle differ ++++++ help-compiler-out-by-initializing-array.patch ++++++ From: Bruce Rogers <[email protected]> Date: Thu, 13 Aug 2020 18:23:35 -0600 Subject: help compiler out by initializing array The pre-release gcc 11 compiler is complaining that result_raw in bigint_test_exec is flagged as possibly being uninitialized when used (-Werror=maybe-uninitialized). Help the compiler by initializing the array. Signed-off-by: Bruce Rogers <[email protected]> --- src/tests/bigint_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roms/ipxe/src/tests/bigint_test.c b/roms/ipxe/src/tests/bigint_test.c index 8d40c3188784a693e83a2a9d3217..dfcd393c413b1c66ab2e9988c472 100644 --- a/roms/ipxe/src/tests/bigint_test.c +++ b/roms/ipxe/src/tests/bigint_test.c @@ -210,7 +210,7 @@ void bigint_mod_exp_sample ( const bigint_element_t *base0, static const uint8_t addend_raw[] = addend; \ static const uint8_t value_raw[] = value; \ static const uint8_t expected_raw[] = expected; \ - uint8_t result_raw[ sizeof ( expected_raw ) ]; \ + uint8_t result_raw[ sizeof ( expected_raw ) ] = {0}; \ unsigned int size = \ bigint_required_size ( sizeof ( value_raw ) ); \ bigint_t ( size ) addend_temp; \ ++++++ qemu-ga-ref.html ++++++ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <meta http-equiv="content-type" content="text/html; charset=utf-8"/> <title></title> <meta name="generator" content="LibreOffice 7.0.0.3 (Linux)"/> <meta name="created" content="2020-08-19T17:43:30.234250115"/> <meta name="changed" content="2020-08-19T17:47:24.726661339"/> <style type="text/css"> @page { size: 8.5in 11in; margin: 0.79in } p { margin-bottom: 0.1in; line-height: 115%; background: transparent } </style> </head> <body lang="en-US" link="#000080" vlink="#800000" dir="ltr"><p style="margin-bottom: 0in; line-height: 100%"> If you are looking for the QEMU Guest Agent protocol reference, see:</p> <p style="margin-bottom: 0in; line-height: 100%">/usr/share/doc/packages/qemu/interop/qemu-ga-ref.html</p> <p style="margin-bottom: 0in; line-height: 100%"><br/> </p> <p style="margin-bottom: 0in; line-height: 100%">The file you are reading is now provided simply to support a packaging</p> <p style="margin-bottom: 0in; line-height: 100%">"Split-Provides", in order to maintain prior-release functionality. The</p> <p style="margin-bottom: 0in; line-height: 100%">new package has split that functionality into another package which may</p> <p style="margin-bottom: 0in; line-height: 100%">be optional going forward. If you find the package providing this file</p> <p style="margin-bottom: 0in; line-height: 100%">is not needed, you may uninstall it.</p> </body> </html> ++++++ qemu-ga-ref.txt ++++++ If you are looking for the QEMU Guest Agent protocol reference, see: /usr/share/doc/packages/qemu/interop/qemu-ga-ref.txt The file you are reading is now provided simply to support a packaging "Split-Provides", in order to maintain prior-release functionality. The new package has split that functionality into another package which may be optional going forward. If you find the package providing this file is not needed, you may uninstall it. ++++++ qemu-qmp-ref.html ++++++ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <meta http-equiv="content-type" content="text/html; charset=utf-8"/> <title></title> <meta name="generator" content="LibreOffice 7.0.0.3 (Linux)"/> <meta name="created" content="2020-08-19T17:49:34.681944218"/> <meta name="changed" content="2020-08-19T17:50:19.834682696"/> <style type="text/css"> @page { size: 8.5in 11in; margin: 0.79in } p { margin-bottom: 0.1in; line-height: 115%; background: transparent } </style> </head> <body lang="en-US" link="#000080" vlink="#800000" dir="ltr"><p style="margin-bottom: 0in; line-height: 100%"> If you are looking for the QEMU QMP reference, see:</p> <p style="margin-bottom: 0in; line-height: 100%">/usr/share/doc/packages/qemu/interop/qemu-qmp-ref.html</p> <p style="margin-bottom: 0in; line-height: 100%"><br/> </p> <p style="margin-bottom: 0in; line-height: 100%">The file you are reading is now provided simply to support a packaging</p> <p style="margin-bottom: 0in; line-height: 100%">"Split-Provides", in order to maintain prior-release functionality. The</p> <p style="margin-bottom: 0in; line-height: 100%">new package has split that functionality into another package which may</p> <p style="margin-bottom: 0in; line-height: 100%">be optional going forward. If you find the package providing this file</p> <p style="margin-bottom: 0in; line-height: 100%">is not needed, you may uninstall it.</p> </body> </html> ++++++ qemu-qmp-ref.txt ++++++ If you are looking for the QEMU QMP reference, see: /usr/share/doc/packages/qemu/interop/qemu-qmp-ref.txt The file you are reading is now provided simply to support a packaging "Split-Provides", in order to maintain prior-release functionality. The new package has split that functionality into another package which may be optional going forward. If you find the package providing this file is not needed, you may uninstall it. ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.cxsCwq/_old 2020-08-23 09:20:59.302678770 +0200 +++ /var/tmp/diff_new_pack.cxsCwq/_new 2020-08-23 09:20:59.302678770 +0200 @@ -122,6 +122,10 @@ Source14: 50-seabios-256k.json Source15: 60-seabios-128k.json Source200: qemu-rpmlintrc +Source201: qemu-ga-ref.html +Source202: qemu-ga-ref.txt +Source203: qemu-qmp-ref.html +Source204: qemu-qmp-ref.txt Source300: bundles.tar.xz Source301: update_git.sh Source302: config.sh @@ -656,6 +660,7 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 +Provides: %name:%_docdir/%name/qemu-ga-ref.html %{qemu_module_conflicts} %description chardev-baum @@ -666,6 +671,7 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 +Provides: %name:%_docdir/%name/qemu-ga-ref.txt %{qemu_module_conflicts} %description hw-display-qxl @@ -676,20 +682,24 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 +Provides: %name:%_docdir/%name/qemu-qmp-ref.html %{qemu_module_conflicts} %description hw-usb-redirect This package contains a module for USB redirection support. +%if 0%{?is_opensuse} %package hw-usb-smartcard Summary: USB smartcard support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 +Provides: %name:%_docdir/%name/qemu-qmp-ref.txt %{qemu_module_conflicts} %description hw-usb-smartcard This package contains a modules for USB smartcard support. +%endif %package ui-curses Summary: Curses based UI support for QEMU @@ -1535,7 +1545,13 @@ install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service %endif %ifarch s390x -install -D -m 0644 %{SOURCE2} %{buildroot}%_libexecdir/modules-load.d/kvm.conf +install -D -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/modules-load.d/kvm.conf +%endif +install -D -m 0644 %{SOURCE201} %{buildroot}%_docdir/%name/qemu-ga-ref.html +install -D -m 0644 %{SOURCE202} %{buildroot}%_docdir/%name/qemu-ga-ref.txt +install -D -m 0644 %{SOURCE203} %{buildroot}%_docdir/%name/qemu-qmp-ref.html +%if 0%{?is_opensuse} +install -D -m 0644 %{SOURCE204} %{buildroot}%_docdir/%name/qemu-qmp-ref.txt %endif %fdupes -s %{buildroot} @@ -1780,7 +1796,7 @@ %dir %_sysconfdir/%name/firmware %if %{kvm_available} %ifarch s390x -%_libexecdir/modules-load.d/kvm.conf +%{_prefix}/lib/modules-load.d/kvm.conf %endif /usr/lib/udev/rules.d/80-kvm.rules %endif @@ -1951,24 +1967,32 @@ %files chardev-baum %defattr(-, root, root) +%dir %_docdir/%name %dir %_libdir/%name %_libdir/%name/chardev-baum.so +%_docdir/%name/qemu-ga-ref.html %files hw-display-qxl %defattr(-, root, root) +%dir %_docdir/%name %dir %_libdir/%name %_libdir/%name/hw-display-qxl.so +%_docdir/%name/qemu-ga-ref.txt %files hw-usb-redirect %defattr(-, root, root) +%dir %_docdir/%name %dir %_libdir/%name %_libdir/%name/hw-usb-redirect.so +%_docdir/%name/qemu-qmp-ref.html %if 0%{?is_opensuse} %files hw-usb-smartcard %defattr(-, root, root) +%dir %_docdir/%name %dir %_libdir/%name %_libdir/%name/hw-usb-smartcard.so +%_docdir/%name/qemu-qmp-ref.txt %endif %files ui-curses ++++++ qht-Revert-some-constification-in-qht.c.patch ++++++ From: Bruce Rogers <[email protected]> Date: Thu, 13 Aug 2020 13:16:13 -0600 Subject: qht: Revert some constification in qht.c This change partially addresses https://bugs.launchpad.net/qemu/+bug/1886155 where a pre-release gcc 11 warns about const qualifier abuse. Signed-off-by: Bruce Rogers <[email protected]> --- include/qemu/qht.h | 4 ++-- util/qht.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/qemu/qht.h b/include/qemu/qht.h index 2e2d6bca932c83bea993850b60f8..6484837487b012cbfc63b6c6e39e 100644 --- a/include/qemu/qht.h +++ b/include/qemu/qht.h @@ -104,7 +104,7 @@ bool qht_insert(struct qht *ht, void *p, uint32_t hash, void **existing); * Returns the corresponding pointer when a match is found. * Returns NULL otherwise. */ -void *qht_lookup_custom(const struct qht *ht, const void *userp, uint32_t hash, +void *qht_lookup_custom(struct qht *ht, const void *userp, uint32_t hash, qht_lookup_func_t func); /** @@ -115,7 +115,7 @@ void *qht_lookup_custom(const struct qht *ht, const void *userp, uint32_t hash, * * Calls qht_lookup_custom() using @ht's default comparison function. */ -void *qht_lookup(const struct qht *ht, const void *userp, uint32_t hash); +void *qht_lookup(struct qht *ht, const void *userp, uint32_t hash); /** * qht_remove - remove a pointer from the hash table diff --git a/util/qht.c b/util/qht.c index a5a332d98998209875a47ebfdeee..9515bf7506d351230739e1bdb588 100644 --- a/util/qht.c +++ b/util/qht.c @@ -484,10 +484,10 @@ bool qht_reset_size(struct qht *ht, size_t n_elems) } static inline -void *qht_do_lookup(const struct qht_bucket *head, qht_lookup_func_t func, +void *qht_do_lookup(struct qht_bucket *head, qht_lookup_func_t func, const void *userp, uint32_t hash) { - const struct qht_bucket *b = head; + struct qht_bucket *b = head; int i; do { @@ -511,7 +511,7 @@ void *qht_do_lookup(const struct qht_bucket *head, qht_lookup_func_t func, } static __attribute__((noinline)) -void *qht_lookup__slowpath(const struct qht_bucket *b, qht_lookup_func_t func, +void *qht_lookup__slowpath(struct qht_bucket *b, qht_lookup_func_t func, const void *userp, uint32_t hash) { unsigned int version; @@ -524,10 +524,10 @@ void *qht_lookup__slowpath(const struct qht_bucket *b, qht_lookup_func_t func, return ret; } -void *qht_lookup_custom(const struct qht *ht, const void *userp, uint32_t hash, +void *qht_lookup_custom(struct qht *ht, const void *userp, uint32_t hash, qht_lookup_func_t func) { - const struct qht_bucket *b; + struct qht_bucket *b; const struct qht_map *map; unsigned int version; void *ret; @@ -547,7 +547,7 @@ void *qht_lookup_custom(const struct qht *ht, const void *userp, uint32_t hash, return qht_lookup__slowpath(b, func, userp, hash); } -void *qht_lookup(const struct qht *ht, const void *userp, uint32_t hash) +void *qht_lookup(struct qht *ht, const void *userp, uint32_t hash) { return qht_lookup_custom(ht, userp, hash, ht->cmp); } ++++++ s390x-Fix-stringop-truncation-issue-repo.patch ++++++ From: Bruce Rogers <[email protected]> Date: Thu, 13 Aug 2020 14:03:29 -0600 Subject: s390x: Fix stringop-truncation issue reported by gcc 11 Signed-off-by: Bruce Rogers <[email protected]> --- target/s390x/misc_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 58dbc023eb5495ec5da0321651ad..d8e18c0d4617c333fcd4cc1c5c8c 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -370,7 +370,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, uint64_t r0, uint64_t r1) MIN(sizeof(sysib.sysib_322.vm[0].name), strlen(qemu_name))); strncpy((char *)sysib.sysib_322.ext_names[0], qemu_name, - sizeof(sysib.sysib_322.ext_names[0])); + sizeof(sysib.sysib_322.ext_names[0] - 1)); } else { ebcdic_put(sysib.sysib_322.vm[0].name, "TCGguest", 8); strcpy((char *)sysib.sysib_322.ext_names[0], "TCGguest"); ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.cxsCwq/_old 2020-08-23 09:20:59.450678852 +0200 +++ /var/tmp/diff_new_pack.cxsCwq/_new 2020-08-23 09:20:59.450678852 +0200 @@ -706,10 +706,14 @@ fi else SOURCE_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$X - if [ "$NEXT_RELEASE_IS_MAJOR" = "0" ]; then - GIT_BRANCH=opensuse-$MAJOR_VERSION.$[$MINOR_VERSION+1] + if [ "$X" = "0" ]; then + GIT_BRANCH=opensuse-$MAJOR_VERSION.$[$MINOR_VERSION] else - GIT_BRANCH=opensuse-$[MAJOR_VERSION+1].0 + if [ "$NEXT_RELEASE_IS_MAJOR" = "0" ]; then + GIT_BRANCH=opensuse-$MAJOR_VERSION.$[$MINOR_VERSION+1] + else + GIT_BRANCH=opensuse-$[MAJOR_VERSION+1].0 + fi fi fi WRITE_LOG=0
