diff --git a/0036-sockets-avoid-string-truncation-war.patch b/0036-sockets-avoid-string-truncation-war.patch new file mode 100644 index 00000000..fa0c6625 --- /dev/null +++ b/0036-sockets-avoid-string-truncation-war.patch @@ -0,0 +1,94 @@ +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Wed, 1 May 2019 15:50:52 +0100 +Subject: sockets: avoid string truncation warnings when copying UNIX path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In file included from /usr/include/string.h:494, + from include/qemu/osdep.h:101, + from util/qemu-sockets.c:18: +In function ‘strncpy’, + inlined from ‘unix_connect_saddr.isra.0’ at util/qemu-sockets.c:925:5: +/usr/include/bits/string_fortified.h:106:10: warning: ‘__builtin_strncpy’ specified bound 108 equals destination size [-Wstringop-truncation] + 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In function ‘strncpy’, + inlined from ‘unix_listen_saddr.isra.0’ at util/qemu-sockets.c:880:5: +/usr/include/bits/string_fortified.h:106:10: warning: ‘__builtin_strncpy’ specified bound 108 equals destination size [-Wstringop-truncation] + 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +We are already validating the UNIX socket path length earlier in +the functions. If we save this string length when we first check +it, then we can simply use memcpy instead of strcpy later, avoiding +the gcc truncation warnings. + +Signed-off-by: Daniel P. Berrangé +Reviewed-by: Eric Blake +Reviewed-by: Stefano Garzarella +Message-Id: <20190501145052.12579-1-berrange@redhat.com> +Signed-off-by: Laurent Vivier +Signed-off-by: Bruce Rogers +--- + util/qemu-sockets.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c +index 9705051690..ba6335e71a 100644 +--- a/util/qemu-sockets.c ++++ b/util/qemu-sockets.c +@@ -830,6 +830,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, + int sock, fd; + char *pathbuf = NULL; + const char *path; ++ size_t pathlen; + + sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); + if (sock < 0) { +@@ -845,7 +846,8 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, + path = pathbuf = g_strdup_printf("%s/qemu-socket-XXXXXX", tmpdir); + } + +- if (strlen(path) > sizeof(un.sun_path)) { ++ pathlen = strlen(path); ++ if (pathlen > sizeof(un.sun_path)) { + error_setg(errp, "UNIX socket path '%s' is too long", path); + error_append_hint(errp, "Path must be less than %zu bytes\n", + sizeof(un.sun_path)); +@@ -877,7 +879,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, + + memset(&un, 0, sizeof(un)); + un.sun_family = AF_UNIX; +- strncpy(un.sun_path, path, sizeof(un.sun_path)); ++ memcpy(un.sun_path, path, pathlen); + + if (bind(sock, (struct sockaddr*) &un, sizeof(un)) < 0) { + error_setg_errno(errp, errno, "Failed to bind socket to %s", path); +@@ -901,6 +903,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp) + { + struct sockaddr_un un; + int sock, rc; ++ size_t pathlen; + + if (saddr->path == NULL) { + error_setg(errp, "unix connect: no path specified"); +@@ -913,7 +916,8 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp) + return -1; + } + +- if (strlen(saddr->path) > sizeof(un.sun_path)) { ++ pathlen = strlen(saddr->path); ++ if (pathlen > sizeof(un.sun_path)) { + error_setg(errp, "UNIX socket path '%s' is too long", saddr->path); + error_append_hint(errp, "Path must be less than %zu bytes\n", + sizeof(un.sun_path)); +@@ -922,7 +926,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp) + + memset(&un, 0, sizeof(un)); + un.sun_family = AF_UNIX; +- strncpy(un.sun_path, saddr->path, sizeof(un.sun_path)); ++ memcpy(un.sun_path, saddr->path, pathlen); + + /* connect to peer */ + do { diff --git a/0036-util-qemu-sockets-Fix-GCC-9-build-w.patch b/0036-util-qemu-sockets-Fix-GCC-9-build-w.patch deleted file mode 100644 index e6a1849a..00000000 --- a/0036-util-qemu-sockets-Fix-GCC-9-build-w.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Alistair Francis -Date: Sat, 4 May 2019 07:57:32 -0600 -Subject: util/qemu-sockets: Fix GCC 9 build warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix this warning when building with GCC9 on Fedora 30: -In function ‘strncpy’, - inlined from ‘unix_connect_saddr.isra.0’ at util/qemu-sockets.c:925:5: -/usr/include/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 108 equals destination size [-Werror=stringop-truncation] - 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In function ‘strncpy’, - inlined from ‘unix_listen_saddr.isra.0’ at util/qemu-sockets.c:880:5: - -Signed-off-by: Alistair Francis -Signed-off-by: Bruce Rogers ---- - util/qemu-sockets.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c -index 9705051690..8c3322958f 100644 ---- a/util/qemu-sockets.c -+++ b/util/qemu-sockets.c -@@ -829,7 +829,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, - struct sockaddr_un un; - int sock, fd; - char *pathbuf = NULL; -- const char *path; -+ const char *path QEMU_NONSTRING; - - sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); - if (sock < 0) { -@@ -922,7 +922,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp) - - memset(&un, 0, sizeof(un)); - un.sun_family = AF_UNIX; -- strncpy(un.sun_path, saddr->path, sizeof(un.sun_path)); -+ memcpy(un.sun_path, saddr->path, MIN(strlen(saddr->path), sizeof(un.sun_path))); - - /* connect to peer */ - do { diff --git a/0037-hw-usb-hcd-xhci-Fix-GCC-9-build-war.patch b/0037-hw-usb-hcd-xhci-Fix-GCC-9-build-war.patch index 98c55e49..043ae789 100644 --- a/0037-hw-usb-hcd-xhci-Fix-GCC-9-build-war.patch +++ b/0037-hw-usb-hcd-xhci-Fix-GCC-9-build-war.patch @@ -1,12 +1,9 @@ From: Alistair Francis Date: Sat, 4 May 2019 07:58:35 -0600 Subject: hw/usb/hcd-xhci: Fix GCC 9 build warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit Fix this build warning with GCC 9 on Fedora 30: -hw/usb/hcd-xhci.c:3339:66: error: ‘%d’ directive output may be truncated writing between 1 and 10 bytes into a region of size 5 [-Werror=format-truncation=] +hw/usb/hcd-xhci.c:3339:66: error: '%d' directive output may be truncated writing between 1 and 10 bytes into a region of size 5 [-Werror=format-truncation=] 3339 | snprintf(port->name, sizeof(port->name), "usb2 port #%d", i+1); | ^~ hw/usb/hcd-xhci.c:3339:54: note: directive argument in the range [1, 2147483647] @@ -15,7 +12,7 @@ hw/usb/hcd-xhci.c:3339:54: note: directive argument in the range [1, 2147483647] In file included from /usr/include/stdio.h:867, from /home/alistair/qemu/include/qemu/osdep.h:99, from hw/usb/hcd-xhci.c:21: -/usr/include/bits/stdio2.h:67:10: note: ‘__builtin___snprintf_chk’ output between 13 and 22 bytes into a destination of size 16 +/usr/include/bits/stdio2.h:67:10: note: '__builtin___snprintf_chk' output between 13 and 22 bytes into a destination of size 16 67 | return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 68 | __bos (__s), __fmt, __va_arg_pack ()); diff --git a/0038-hw-usb-dev-mtp-Fix-GCC-9-build-warn.patch b/0038-hw-usb-dev-mtp-Fix-GCC-9-build-warn.patch index 7bf70680..ea91ddd7 100644 --- a/0038-hw-usb-dev-mtp-Fix-GCC-9-build-warn.patch +++ b/0038-hw-usb-dev-mtp-Fix-GCC-9-build-warn.patch @@ -1,12 +1,9 @@ From: Alistair Francis Date: Sat, 4 May 2019 07:58:55 -0600 Subject: hw/usb/dev-mtp: Fix GCC 9 build warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit Fix this warning with GCC 9 on Fedora 30: -hw/usb/dev-mtp.c:1715:36: error: taking address of packed member of ‘struct ’ may result in an unaligned pointer value [-Werror=address-of-packed-member] +hw/usb/dev-mtp.c:1715:36: error: taking address of packed member of 'struct ' may result in an unaligned pointer value [-Werror=address-of-packed-member] 1715 | dataset->filename); | ~~~~~~~^~~~~~~~~~ diff --git a/0039-linux-user-avoid-string-truncation-.patch b/0039-linux-user-avoid-string-truncation-.patch new file mode 100644 index 00000000..6454b5d9 --- /dev/null +++ b/0039-linux-user-avoid-string-truncation-.patch @@ -0,0 +1,46 @@ +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Wed, 1 May 2019 15:46:46 +0100 +Subject: linux-user: avoid string truncation warnings in uname field copying +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In file included from /usr/include/string.h:494, + from include/qemu/osdep.h:101, + from linux-user/uname.c:20: +In function ‘strncpy’, + inlined from ‘sys_uname’ at linux-user/uname.c:94:3: +/usr/include/bits/string_fortified.h:106:10: warning: ‘__builtin_strncpy’ output may be truncated copying 64 bytes from a string of length 64 [-Wstringop-truncation] + 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +We don't care where the NUL terminator in the original uname +field was. It suffices to copy the entire original field and +simply force a NUL terminator at the end of the new field. + +Signed-off-by: Daniel P. Berrangé +Reviewed-by: Philippe Mathieu-Daudé +Message-Id: <20190501144646.4851-1-berrange@redhat.com> +Signed-off-by: Laurent Vivier +[BR: Played with indent to avoid error from checkpatch.pl] +Signed-off-by: Bruce Rogers +--- + linux-user/uname.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/linux-user/uname.c b/linux-user/uname.c +index 313b79dbad..0c6ddf2ad9 100644 +--- a/linux-user/uname.c ++++ b/linux-user/uname.c +@@ -72,9 +72,8 @@ const char *cpu_to_uname_machine(void *cpu_env) + + #define COPY_UTSNAME_FIELD(dest, src) \ + do { \ +- /* __NEW_UTS_LEN doesn't include terminating null */ \ +- (void) strncpy((dest), (src), __NEW_UTS_LEN); \ +- (dest)[__NEW_UTS_LEN] = '\0'; \ ++ memcpy((dest), (src), MIN(sizeof(src), sizeof(dest))); \ ++ (dest)[sizeof(dest) - 1] = '\0'; \ + } while (0) + + int sys_uname(struct new_utsname *buf) diff --git a/0039-linux-user-uname-Fix-GCC-9-build-wa.patch b/0039-linux-user-uname-Fix-GCC-9-build-wa.patch deleted file mode 100644 index b8ed84a2..00000000 --- a/0039-linux-user-uname-Fix-GCC-9-build-wa.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Alistair Francis -Date: Sat, 4 May 2019 07:59:09 -0600 -Subject: linux-user/uname: Fix GCC 9 build warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix this warning when building with GCC9 on Fedora 30: -In function ‘strncpy’, - inlined from ‘sys_uname’ at /home/alistair/qemu/linux-user/uname.c:94:3: -/usr/include/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ output may be truncated copying 64 bytes from a string of length 64 [-Werror=stringop-truncation] - 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Alistair Francis -Signed-off-by: Bruce Rogers ---- - linux-user/uname.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux-user/uname.c b/linux-user/uname.c -index 313b79dbad..2fc6096a5b 100644 ---- a/linux-user/uname.c -+++ b/linux-user/uname.c -@@ -73,7 +73,7 @@ const char *cpu_to_uname_machine(void *cpu_env) - #define COPY_UTSNAME_FIELD(dest, src) \ - do { \ - /* __NEW_UTS_LEN doesn't include terminating null */ \ -- (void) strncpy((dest), (src), __NEW_UTS_LEN); \ -+ (void) memcpy((dest), (src), MIN(strlen(src), __NEW_UTS_LEN)); \ - (dest)[__NEW_UTS_LEN] = '\0'; \ - } while (0) - diff --git a/0040-linux-user-elfload-Fix-GCC-9-build-.patch b/0040-linux-user-elfload-Fix-GCC-9-build-.patch index 6242a8b6..aa56126b 100644 --- a/0040-linux-user-elfload-Fix-GCC-9-build-.patch +++ b/0040-linux-user-elfload-Fix-GCC-9-build-.patch @@ -1,20 +1,24 @@ From: Alistair Francis -Date: Sat, 4 May 2019 07:59:23 -0600 +Date: Tue, 30 Apr 2019 23:29:01 +0000 Subject: linux-user/elfload: Fix GCC 9 build warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix this warning when building with GCC9 on Fedora 30: -In function ‘strncpy’, - inlined from ‘fill_psinfo’ at /home/alistair/qemu/linux-user/elfload.c:3208:12, - inlined from ‘fill_note_info’ at /home/alistair/qemu/linux-user/elfload.c:3390:5, - inlined from ‘elf_core_dump’ at /home/alistair/qemu/linux-user/elfload.c:3539:9: -/usr/include/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 16 equals destination size [-Werror=stringop-truncation] +In function ‘strncpy’, + inlined from ‘fill_psinfo’ at /home/alistair/qemu/linux-user/elfload.c:3208:12, + inlined from ‘fill_note_info’ at /home/alistair/qemu/linux-user/elfload.c:3390:5, + inlined from ‘elf_core_dump’ at /home/alistair/qemu/linux-user/elfload.c:3539:9: +/usr/include/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 16 equals destination size [-Werror=stringop-truncation] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Alistair Francis +Reviewed-by: Laurent Vivier +Reviewed-by: Richard Henderson +Message-Id: +Signed-off-by: Laurent Vivier Signed-off-by: Bruce Rogers --- linux-user/elfload.c | 2 +- diff --git a/0041-qxl-fix-Waddress-of-packed-member.patch b/0041-qxl-fix-Waddress-of-packed-member.patch index a599610e..9d13e889 100644 --- a/0041-qxl-fix-Waddress-of-packed-member.patch +++ b/0041-qxl-fix-Waddress-of-packed-member.patch @@ -9,25 +9,25 @@ The GCC9 compiler complains about QXL code that takes the address of members of the 'struct QXLReleaseRing' which is marked packed: CC hw/display/qxl.o -/home/elmarco/src/qemu/hw/display/qxl.c: In function ‘init_qxl_ram’: -/home/elmarco/src/qemu/hw/display/qxl.c:50:19: warning: taking address of packed member of ‘struct QXLReleaseRing_ring_el’ may result in an unaligned pointer value [-Waddress-of-packed-member] +/home/elmarco/src/qemu/hw/display/qxl.c: In function 'init_qxl_ram': +/home/elmarco/src/qemu/hw/display/qxl.c:50:19: warning: taking address of packed member of 'struct QXLReleaseRing_ring_el' may result in an unaligned pointer value [-Waddress-of-packed-member] 50 | ret = &(r)->items[prod].el; \ | ^~~~~~~~~~~~~~~~~~~~ -/home/elmarco/src/qemu/hw/display/qxl.c:429:5: note: in expansion of macro ‘SPICE_RING_PROD_ITEM’ +/home/elmarco/src/qemu/hw/display/qxl.c:429:5: note: in expansion of macro 'SPICE_RING_PROD_ITEM' 429 | SPICE_RING_PROD_ITEM(d, &d->ram->release_ring, item); | ^~~~~~~~~~~~~~~~~~~~ -/home/elmarco/src/qemu/hw/display/qxl.c: In function ‘qxl_push_free_res’: -/home/elmarco/src/qemu/hw/display/qxl.c:50:19: warning: taking address of packed member of ‘struct QXLReleaseRing_ring_el’ may result in an unaligned pointer value [-Waddress-of-packed-member] +/home/elmarco/src/qemu/hw/display/qxl.c: In function 'qxl_push_free_res': +/home/elmarco/src/qemu/hw/display/qxl.c:50:19: warning: taking address of packed member of 'struct QXLReleaseRing_ring_el' may result in an unaligned pointer value [-Waddress-of-packed-member] 50 | ret = &(r)->items[prod].el; \ | ^~~~~~~~~~~~~~~~~~~~ -/home/elmarco/src/qemu/hw/display/qxl.c:762:5: note: in expansion of macro ‘SPICE_RING_PROD_ITEM’ +/home/elmarco/src/qemu/hw/display/qxl.c:762:5: note: in expansion of macro 'SPICE_RING_PROD_ITEM' 762 | SPICE_RING_PROD_ITEM(d, ring, item); | ^~~~~~~~~~~~~~~~~~~~ -/home/elmarco/src/qemu/hw/display/qxl.c: In function ‘interface_release_resource’: -/home/elmarco/src/qemu/hw/display/qxl.c:50:19: warning: taking address of packed member of ‘struct QXLReleaseRing_ring_el’ may result in an unaligned pointer value [-Waddress-of-packed-member] +/home/elmarco/src/qemu/hw/display/qxl.c: In function 'interface_release_resource': +/home/elmarco/src/qemu/hw/display/qxl.c:50:19: warning: taking address of packed member of 'struct QXLReleaseRing_ring_el' may result in an unaligned pointer value [-Waddress-of-packed-member] 50 | ret = &(r)->items[prod].el; \ | ^~~~~~~~~~~~~~~~~~~~ -/home/elmarco/src/qemu/hw/display/qxl.c:795:5: note: in expansion of macro ‘SPICE_RING_PROD_ITEM’ +/home/elmarco/src/qemu/hw/display/qxl.c:795:5: note: in expansion of macro 'SPICE_RING_PROD_ITEM' 795 | SPICE_RING_PROD_ITEM(qxl, ring, item); | ^~~~~~~~~~~~~~~~~~~~ diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 2110bb98..b7271af6 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri May 10 19:14:02 UTC 2019 - Bruce Rogers + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.0 +* Patches renamed: + 0036-util-qemu-sockets-Fix-GCC-9-build-w.patch + -> 0036-sockets-avoid-string-truncation-war.patch + 0039-linux-user-uname-Fix-GCC-9-build-wa.patch + -> 0039-linux-user-avoid-string-truncation-.patch + ------------------------------------------------------------------- Mon May 6 21:36:25 UTC 2019 - Bruce Rogers diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index 45647bd7..759b5f6f 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -69,10 +69,10 @@ Patch0032: 0032-tests-Fix-Makefile-handling-of-chec.patch Patch0033: 0033-Conditionalize-ui-bitmap-installati.patch Patch0034: 0034-Revert-target-i386-kvm-add-VMX-migr.patch Patch0035: 0035-tests-change-error-message-in-test-.patch -Patch0036: 0036-util-qemu-sockets-Fix-GCC-9-build-w.patch +Patch0036: 0036-sockets-avoid-string-truncation-war.patch Patch0037: 0037-hw-usb-hcd-xhci-Fix-GCC-9-build-war.patch Patch0038: 0038-hw-usb-dev-mtp-Fix-GCC-9-build-warn.patch -Patch0039: 0039-linux-user-uname-Fix-GCC-9-build-wa.patch +Patch0039: 0039-linux-user-avoid-string-truncation-.patch Patch0040: 0040-linux-user-elfload-Fix-GCC-9-build-.patch Patch0041: 0041-qxl-fix-Waddress-of-packed-member.patch # Please do not add QEMU patches manually here. diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 7f1d3aeb..539db842 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Sat May 11 14:58:50 UTC 2019 - Bruce Rogers + +- Correct logic of which ipxe patches get included based on + suse_version. We were wrongly excluding a gcc9 related patch for + example + +------------------------------------------------------------------- +Fri May 10 19:14:01 UTC 2019 - Bruce Rogers + +- Switch to now upstreamed version of some patches +* Patches renamed: + 0036-util-qemu-sockets-Fix-GCC-9-build-w.patch + -> 0036-sockets-avoid-string-truncation-war.patch + 0039-linux-user-uname-Fix-GCC-9-build-wa.patch + -> 0039-linux-user-avoid-string-truncation-.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.0 + +------------------------------------------------------------------- +Thu May 9 14:51:24 UTC 2019 - Bruce Rogers + +- Create /usr/share/qemu/firmware and /etc/qemu/firmware directories + in support of the firmware descriptor feature now in use as of + libvirt v5.2 + ------------------------------------------------------------------- Mon May 6 21:36:24 UTC 2019 - Bruce Rogers diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 79234a31..374d3529 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -179,10 +179,10 @@ Patch0032: 0032-tests-Fix-Makefile-handling-of-chec.patch Patch0033: 0033-Conditionalize-ui-bitmap-installati.patch Patch0034: 0034-Revert-target-i386-kvm-add-VMX-migr.patch Patch0035: 0035-tests-change-error-message-in-test-.patch -Patch0036: 0036-util-qemu-sockets-Fix-GCC-9-build-w.patch +Patch0036: 0036-sockets-avoid-string-truncation-war.patch Patch0037: 0037-hw-usb-hcd-xhci-Fix-GCC-9-build-war.patch Patch0038: 0038-hw-usb-dev-mtp-Fix-GCC-9-build-warn.patch -Patch0039: 0039-linux-user-uname-Fix-GCC-9-build-wa.patch +Patch0039: 0039-linux-user-avoid-string-truncation-.patch Patch0040: 0040-linux-user-elfload-Fix-GCC-9-build-.patch Patch0041: 0041-qxl-fix-Waddress-of-packed-member.patch # Please do not add QEMU patches manually here. @@ -1006,9 +1006,9 @@ pushd roms/ipxe %patch1200 -p1 %if 0%{?suse_version} <= 1320 %patch1201 -p1 +%endif %patch1202 -p1 %patch1203 -p1 -%endif %ifarch aarch64 %patch1204 -p1 %endif @@ -1583,9 +1583,10 @@ fi %_mandir/man7/qemu-qmp-ref.7.gz %_mandir/man7/qemu-ga-ref.7.gz %dir %_datadir/%name +%dir %_datadir/%name/firmware %_datadir/%name/keymaps %_datadir/%name/trace-events-all -%dir %_sysconfdir/%name +%dir %_sysconfdir/%name/firmware %_datadir/%name/qemu-ifup %dir %_libexecdir/supportconfig %dir %_libexecdir/supportconfig/plugins diff --git a/qemu.changes b/qemu.changes index 7f1d3aeb..539db842 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Sat May 11 14:58:50 UTC 2019 - Bruce Rogers + +- Correct logic of which ipxe patches get included based on + suse_version. We were wrongly excluding a gcc9 related patch for + example + +------------------------------------------------------------------- +Fri May 10 19:14:01 UTC 2019 - Bruce Rogers + +- Switch to now upstreamed version of some patches +* Patches renamed: + 0036-util-qemu-sockets-Fix-GCC-9-build-w.patch + -> 0036-sockets-avoid-string-truncation-war.patch + 0039-linux-user-uname-Fix-GCC-9-build-wa.patch + -> 0039-linux-user-avoid-string-truncation-.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.0 + +------------------------------------------------------------------- +Thu May 9 14:51:24 UTC 2019 - Bruce Rogers + +- Create /usr/share/qemu/firmware and /etc/qemu/firmware directories + in support of the firmware descriptor feature now in use as of + libvirt v5.2 + ------------------------------------------------------------------- Mon May 6 21:36:24 UTC 2019 - Bruce Rogers diff --git a/qemu.spec b/qemu.spec index 07ae0ce1..ad6ea060 100644 --- a/qemu.spec +++ b/qemu.spec @@ -179,10 +179,10 @@ Patch0032: 0032-tests-Fix-Makefile-handling-of-chec.patch Patch0033: 0033-Conditionalize-ui-bitmap-installati.patch Patch0034: 0034-Revert-target-i386-kvm-add-VMX-migr.patch Patch0035: 0035-tests-change-error-message-in-test-.patch -Patch0036: 0036-util-qemu-sockets-Fix-GCC-9-build-w.patch +Patch0036: 0036-sockets-avoid-string-truncation-war.patch Patch0037: 0037-hw-usb-hcd-xhci-Fix-GCC-9-build-war.patch Patch0038: 0038-hw-usb-dev-mtp-Fix-GCC-9-build-warn.patch -Patch0039: 0039-linux-user-uname-Fix-GCC-9-build-wa.patch +Patch0039: 0039-linux-user-avoid-string-truncation-.patch Patch0040: 0040-linux-user-elfload-Fix-GCC-9-build-.patch Patch0041: 0041-qxl-fix-Waddress-of-packed-member.patch # Please do not add QEMU patches manually here. @@ -1006,9 +1006,9 @@ pushd roms/ipxe %patch1200 -p1 %if 0%{?suse_version} <= 1320 %patch1201 -p1 +%endif %patch1202 -p1 %patch1203 -p1 -%endif %ifarch aarch64 %patch1204 -p1 %endif @@ -1583,9 +1583,10 @@ fi %_mandir/man7/qemu-qmp-ref.7.gz %_mandir/man7/qemu-ga-ref.7.gz %dir %_datadir/%name +%dir %_datadir/%name/firmware %_datadir/%name/keymaps %_datadir/%name/trace-events-all -%dir %_sysconfdir/%name +%dir %_sysconfdir/%name/firmware %_datadir/%name/qemu-ifup %dir %_libexecdir/supportconfig %dir %_libexecdir/supportconfig/plugins diff --git a/qemu.spec.in b/qemu.spec.in index d8c12100..1aaef0df 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -923,9 +923,9 @@ pushd roms/ipxe %patch1200 -p1 %if 0%{?suse_version} <= 1320 %patch1201 -p1 +%endif %patch1202 -p1 %patch1203 -p1 -%endif %ifarch aarch64 %patch1204 -p1 %endif @@ -1500,9 +1500,10 @@ fi %_mandir/man7/qemu-qmp-ref.7.gz %_mandir/man7/qemu-ga-ref.7.gz %dir %_datadir/%name +%dir %_datadir/%name/firmware %_datadir/%name/keymaps %_datadir/%name/trace-events-all -%dir %_sysconfdir/%name +%dir %_sysconfdir/%name/firmware %_datadir/%name/qemu-ifup %dir %_libexecdir/supportconfig %dir %_libexecdir/supportconfig/plugins