Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2019-06-12 13:05:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Wed Jun 12 13:05:14 2019 rev:156 rq:706381 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2019-05-17 23:41:32.421966299 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new.4811/qemu-linux-user.changes 2019-06-12 13:05:19.261208238 +0200 @@ -1,0 +2,16 @@ +Wed May 29 16:03:58 UTC 2019 - Bruce Rogers <[email protected]> + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.0 +* Patches added: + 0048-pc-bios-s390-ccw-net-avoid-warning-.patch + 0046-target-ppc-ensure-we-get-null-termi.patch + 0047-configure-only-populate-roms-if-sof.patch + +------------------------------------------------------------------- +Fri May 17 19:05:11 UTC 2019 - Bruce Rogers <[email protected]> + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.0 +* Patches added: + 0045-kbd-state-fix-autorepeat-handling.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/qemu/qemu-testsuite.changes 2019-05-17 23:41:32.469966272 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new.4811/qemu-testsuite.changes 2019-06-12 13:05:19.597208098 +0200 @@ -1,0 +2,28 @@ +Wed May 29 16:03:57 UTC 2019 - Bruce Rogers <[email protected]> + +- Fix a number of compatibility issues with the stricter gcc9 checks +* Disable warning for taking address of packed structure members + 0048-pc-bios-s390-ccw-net-avoid-warning-.patch +* Fix case of strncpy where null terminated string not guaranteed + 0046-target-ppc-ensure-we-get-null-termi.patch +* Disable warning for taking address of packed structure members + and fix case of passing null pointer as "%s" format parameter + skiboot-gcc9-compat.patch +- Fix configure script which caused firmware to be built in + linux-user only build. + 0047-configure-only-populate-roms-if-sof.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.0 + +------------------------------------------------------------------- +Fri May 17 19:05:10 UTC 2019 - Bruce Rogers <[email protected]> + +- Fix regression in autorepeat key handling + 0045-kbd-state-fix-autorepeat-handling.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.0 + +------------------------------------------------------------------- +Fri May 17 15:44:17 UTC 2019 - Andreas Schwab <[email protected]> + +- Fix file list + +------------------------------------------------------------------- qemu.changes: same change New: ---- 0045-kbd-state-fix-autorepeat-handling.patch 0046-target-ppc-ensure-we-get-null-termi.patch 0047-configure-only-populate-roms-if-sof.patch 0048-pc-bios-s390-ccw-net-avoid-warning-.patch skiboot-gcc9-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu-linux-user.spec ++++++ --- /var/tmp/diff_new_pack.Q5Kabc/_old 2019-06-12 13:05:21.705207212 +0200 +++ /var/tmp/diff_new_pack.Q5Kabc/_new 2019-06-12 13:05:21.705207212 +0200 @@ -78,6 +78,10 @@ Patch0042: 0042-libvhost-user-fix-Waddress-of-packe.patch Patch0043: 0043-target-i386-define-md-clear-bit.patch Patch0044: 0044-hw-intc-exynos4210_gic-provide-more.patch +Patch0045: 0045-kbd-state-fix-autorepeat-handling.patch +Patch0046: 0046-target-ppc-ensure-we-get-null-termi.patch +Patch0047: 0047-configure-only-populate-roms-if-sof.patch +Patch0048: 0048-pc-bios-s390-ccw-net-avoid-warning-.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. ExcludeArch: s390 @@ -152,6 +156,10 @@ %patch0042 -p1 %patch0043 -p1 %patch0044 -p1 +%patch0045 -p1 +%patch0046 -p1 +%patch0047 -p1 +%patch0048 -p1 %build %define _lto_cflags %{nil} ++++++ qemu-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.Q5Kabc/_old 2019-06-12 13:05:21.761207188 +0200 +++ /var/tmp/diff_new_pack.Q5Kabc/_new 2019-06-12 13:05:21.765207186 +0200 @@ -188,6 +188,10 @@ Patch0042: 0042-libvhost-user-fix-Waddress-of-packe.patch Patch0043: 0043-target-i386-define-md-clear-bit.patch Patch0044: 0044-hw-intc-exynos4210_gic-provide-more.patch +Patch0045: 0045-kbd-state-fix-autorepeat-handling.patch +Patch0046: 0046-target-ppc-ensure-we-get-null-termi.patch +Patch0047: 0047-configure-only-populate-roms-if-sof.patch +Patch0048: 0048-pc-bios-s390-ccw-net-avoid-warning-.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -210,6 +214,7 @@ # SLOF - path: roms/SLOF (patch range 1400-1499) (Currently no patches) # skiboot - path: roms/skiboot (patch range 1500-1599) (Currently no patches) +Patch1500: skiboot-gcc9-compat.patch # keycodemapdb - path: ui/keycodemapdb (patch range 1600-1699) (Currently no patches) @@ -999,6 +1004,10 @@ %patch0042 -p1 %patch0043 -p1 %patch0044 -p1 +%patch0045 -p1 +%patch0046 -p1 +%patch0047 -p1 +%patch0048 -p1 pushd roms/seabios %patch1100 -p1 @@ -1029,6 +1038,7 @@ popd pushd roms/skiboot +%patch1500 -p1 popd pushd ui/keycodemapdb @@ -1605,6 +1615,7 @@ %ifarch s390x %_libexecdir/modules-load.d/kvm.conf %endif +%endif %dir %_datadir/icons/hicolor %dir %_datadir/icons/hicolor/*/ %dir %_datadir/icons/hicolor/*/apps @@ -1619,7 +1630,6 @@ %_datadir/icons/hicolor/512x512/apps/qemu.png %_datadir/icons/hicolor/scalable/apps/qemu.svg %_datadir/applications/qemu.desktop -%endif %files x86 %defattr(-, root, root) ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.Q5Kabc/_old 2019-06-12 13:05:21.789207176 +0200 +++ /var/tmp/diff_new_pack.Q5Kabc/_new 2019-06-12 13:05:21.789207176 +0200 @@ -188,6 +188,10 @@ Patch0042: 0042-libvhost-user-fix-Waddress-of-packe.patch Patch0043: 0043-target-i386-define-md-clear-bit.patch Patch0044: 0044-hw-intc-exynos4210_gic-provide-more.patch +Patch0045: 0045-kbd-state-fix-autorepeat-handling.patch +Patch0046: 0046-target-ppc-ensure-we-get-null-termi.patch +Patch0047: 0047-configure-only-populate-roms-if-sof.patch +Patch0048: 0048-pc-bios-s390-ccw-net-avoid-warning-.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -210,6 +214,7 @@ # SLOF - path: roms/SLOF (patch range 1400-1499) (Currently no patches) # skiboot - path: roms/skiboot (patch range 1500-1599) (Currently no patches) +Patch1500: skiboot-gcc9-compat.patch # keycodemapdb - path: ui/keycodemapdb (patch range 1600-1699) (Currently no patches) @@ -999,6 +1004,10 @@ %patch0042 -p1 %patch0043 -p1 %patch0044 -p1 +%patch0045 -p1 +%patch0046 -p1 +%patch0047 -p1 +%patch0048 -p1 pushd roms/seabios %patch1100 -p1 @@ -1029,6 +1038,7 @@ popd pushd roms/skiboot +%patch1500 -p1 popd pushd ui/keycodemapdb @@ -1605,6 +1615,7 @@ %ifarch s390x %_libexecdir/modules-load.d/kvm.conf %endif +%endif %dir %_datadir/icons/hicolor %dir %_datadir/icons/hicolor/*/ %dir %_datadir/icons/hicolor/*/apps @@ -1619,7 +1630,6 @@ %_datadir/icons/hicolor/512x512/apps/qemu.png %_datadir/icons/hicolor/scalable/apps/qemu.svg %_datadir/applications/qemu.desktop -%endif %files x86 %defattr(-, root, root) ++++++ 0045-kbd-state-fix-autorepeat-handling.patch ++++++ From: Gerd Hoffmann <[email protected]> Date: Tue, 14 May 2019 06:24:43 +0200 Subject: kbd-state: fix autorepeat handling When allowing multiple down-events in a row (key autorepeat) we can't use change_bit() any more to update the state, because autorepeat events don't change the key state. We have to explicitly use set_bit() and clear_bit() instead. Cc: [email protected] Fixes: 35921860156e kbd-state: don't block auto-repeat events Buglink: https://bugs.launchpad.net/qemu/+bug/1828272 Signed-off-by: Gerd Hoffmann <[email protected]> Message-id: [email protected] Signed-off-by: Bruce Rogers <[email protected]> --- ui/kbd-state.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/kbd-state.c b/ui/kbd-state.c index f3ab2d7a66..1668d17dda 100644 --- a/ui/kbd-state.c +++ b/ui/kbd-state.c @@ -59,7 +59,11 @@ void qkbd_state_key_event(QKbdState *kbd, QKeyCode qcode, bool down) } /* update key and modifier state */ - change_bit(qcode, kbd->keys); + if (down) { + set_bit(qcode, kbd->keys); + } else { + clear_bit(qcode, kbd->keys); + } switch (qcode) { case Q_KEY_CODE_SHIFT: case Q_KEY_CODE_SHIFT_R: ++++++ 0046-target-ppc-ensure-we-get-null-termi.patch ++++++ From: Bruce Rogers <[email protected]> Date: Tue, 28 May 2019 13:35:39 -0600 Subject: target/ppc: ensure we get null terminated rtas token name Leave room for null termination of the string when doing strncpy. Signed-off-by: Bruce Rogers <[email protected]> --- target/ppc/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 2427c8ee13..7885de2d7c 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2605,7 +2605,7 @@ int kvmppc_define_rtas_kernel_token(uint32_t token, const char *function) return -ENOENT; } - strncpy(args.name, function, sizeof(args.name)); + strncpy(args.name, function, sizeof(args.name) - 1); return kvm_vm_ioctl(kvm_state, KVM_PPC_RTAS_DEFINE_TOKEN, &args); } ++++++ 0047-configure-only-populate-roms-if-sof.patch ++++++ From: Bruce Rogers <[email protected]> Date: Tue, 28 May 2019 14:23:37 -0600 Subject: configure: only populate roms if softmmu Currently roms are mistakenly getting built in a linux-user only configuration. Add check for softmmu in all places where our list of roms is being added to. Signed-off-by: Bruce Rogers <[email protected]> --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 5df1b9a285..cf261e9cc5 100755 --- a/configure +++ b/configure @@ -6166,12 +6166,13 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ fi done fi -if test "$cpu" = "ppc64" && test "$targetos" != "Darwin" ; then +if test "$cpu" = "ppc64" && test "$targetos" != "Darwin" && \ + test "$softmmu" = yes ; then roms="$roms spapr-rtas" fi # Only build s390-ccw bios if we're on s390x and the compiler has -march=z900 -if test "$cpu" = "s390x" ; then +if test "$cpu" = "s390x" && test "$softmmu" = yes ; then write_c_skeleton if compile_prog "-march=z900" ""; then roms="$roms s390-ccw" ++++++ 0048-pc-bios-s390-ccw-net-avoid-warning-.patch ++++++ From: Bruce Rogers <[email protected]> Date: Wed, 29 May 2019 09:59:02 -0600 Subject: pc-bios/s390-ccw/net: avoid warning about packed structure members This is hopefully temporary. Simply disable the warning about taking the address of packed structure members which is new in gcc9. Signed-off-by: Bruce Rogers <[email protected]> --- pc-bios/s390-ccw/netboot.mak | 1 + 1 file changed, 1 insertion(+) diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak index 14e96b2aa6..c965a4cfd4 100644 --- a/pc-bios/s390-ccw/netboot.mak +++ b/pc-bios/s390-ccw/netboot.mak @@ -53,6 +53,7 @@ libc.a: $(LIBCOBJS) LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \ dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o LIBNETCFLAGS := $(QEMU_CFLAGS) $(CFLAGS) -DDHCPARCH=0x1F $(LIBC_INC) $(LIBNET_INC) +LIBNETCFLAGS += -Wno-address-of-packed-member %.o : $(SLOF_DIR)/lib/libnet/%.c $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.Q5Kabc/_old 2019-06-12 13:05:22.149207025 +0200 +++ /var/tmp/diff_new_pack.Q5Kabc/_new 2019-06-12 13:05:22.153207023 +0200 @@ -164,6 +164,7 @@ # SLOF - path: roms/SLOF (patch range 1400-1499) (Currently no patches) # skiboot - path: roms/skiboot (patch range 1500-1599) (Currently no patches) +Patch1500: skiboot-gcc9-compat.patch # keycodemapdb - path: ui/keycodemapdb (patch range 1600-1699) (Currently no patches) @@ -940,6 +941,7 @@ popd pushd roms/skiboot +%patch1500 -p1 popd pushd ui/keycodemapdb @@ -1516,6 +1518,7 @@ %ifarch s390x %_libexecdir/modules-load.d/kvm.conf %endif +%endif %dir %_datadir/icons/hicolor %dir %_datadir/icons/hicolor/*/ %dir %_datadir/icons/hicolor/*/apps @@ -1530,7 +1533,6 @@ %_datadir/icons/hicolor/512x512/apps/qemu.png %_datadir/icons/hicolor/scalable/apps/qemu.svg %_datadir/applications/qemu.desktop -%endif %files x86 %defattr(-, root, root) ++++++ skiboot-gcc9-compat.patch ++++++ diff --git a/Makefile.main b/Makefile.main index 19378789..bbfc552a 100644 --- a/Makefile.main +++ b/Makefile.main @@ -75,6 +75,7 @@ CPPFLAGS += -DDEBUG -DCCAN_LIST_DEBUG endif CFLAGS := -fno-strict-aliasing -pie -fpie -fno-pic -mbig-endian -m64 +CFLAGS += -Wno-address-of-packed-member CFLAGS += -mcpu=power7 CFLAGS += -Wl,--oformat,elf64-powerpc CFLAGS += $(call try-cflag,$(CC),-ffixed-r13) diff --git a/hdata/vpd.c b/hdata/vpd.c index 129b5062..ce17c1dc 100644 --- a/hdata/vpd.c +++ b/hdata/vpd.c @@ -388,8 +388,7 @@ static void vpd_vini_parse(struct dt_node *node, } else { dt_add_property_string(node, "description", "Unknown"); prlog(PR_WARNING, - "VPD: CCIN desc not available for: %s\n", - (char *)kw); + "VPD: CCIN desc not available for: NULL\n"); } } }
