Accepting request 701423 from home:bfrogers:branches:Virtualization

A couple more post v4.0 tweaks.

OBS-URL: https://build.opensuse.org/request/show/701423
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=465
This commit is contained in:
Bruce Rogers 2019-05-07 21:38:21 +00:00 committed by Git OBS Bridge
parent f6d7884ea7
commit 34e4704186
18 changed files with 552 additions and 88 deletions

View File

@ -0,0 +1,44 @@
From: Alistair Francis <Alistair.Francis@wdc.com>
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 <alistair.francis@wdc.com>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
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 {

View File

@ -0,0 +1,41 @@
From: Alistair Francis <Alistair.Francis@wdc.com>
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=]
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]
3339 | snprintf(port->name, sizeof(port->name), "usb2 port #%d", i+1);
| ^~~~~~~~~~~~~~~
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
67 | return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
68 | __bos (__s), __fmt, __va_arg_pack ());
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
hw/usb/hcd-xhci.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index ec28bee319..2b061772b2 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -3322,6 +3322,7 @@ static void usb_xhci_init(XHCIState *xhci)
usb_bus_new(&xhci->bus, sizeof(xhci->bus), &xhci_bus_ops, dev);
for (i = 0; i < usbports; i++) {
+ g_assert(i < MAX(MAXPORTS_2, MAXPORTS_3));
speedmask = 0;
if (i < xhci->numports_2) {
if (xhci_get_flag(xhci, XHCI_FLAG_SS_FIRST)) {

View File

@ -0,0 +1,45 @@
From: Alistair Francis <Alistair.Francis@wdc.com>
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 <anonymous>’ may result in an unaligned pointer value [-Werror=address-of-packed-member]
1715 | dataset->filename);
| ~~~~~~~^~~~~~~~~~
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
hw/usb/dev-mtp.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 99548b012d..8233beacab 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -1711,9 +1711,22 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen)
assert(!s->write_pending);
assert(p != NULL);
+/*
+ * We are about to access a packed struct. We are confident that the pointer
+ * address won't be unaligned, so we ignore GCC warnings.
+ */
+#if defined(CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE) && QEMU_GNUC_PREREQ(9, 0)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+#endif
+
filename = utf16_to_str(MIN(dataset->length, filename_chars),
dataset->filename);
+#if defined(CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE) && QEMU_GNUC_PREREQ(9, 0)
+#pragma GCC diagnostic pop
+#endif
+
if (strchr(filename, '/')) {
usb_mtp_queue_result(s, RES_PARAMETER_NOT_SUPPORTED, d->trans,
0, 0, 0, 0);

View File

@ -0,0 +1,33 @@
From: Alistair Francis <Alistair.Francis@wdc.com>
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 <alistair.francis@wdc.com>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
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)

View File

@ -0,0 +1,35 @@
From: Alistair Francis <Alistair.Francis@wdc.com>
Date: Sat, 4 May 2019 07:59:23 -0600
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]
106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
linux-user/elfload.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index c1a26021f8..d08fe23466 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2872,7 +2872,7 @@ struct target_elf_prpsinfo {
target_gid_t pr_gid;
target_pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid;
/* Lots missing */
- char pr_fname[16]; /* filename of executable */
+ char pr_fname[16] QEMU_NONSTRING; /* filename of executable */
char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
};

View File

@ -0,0 +1,188 @@
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Sat, 4 May 2019 07:59:35 -0600
Subject: qxl: fix -Waddress-of-packed-member
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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]
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’
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]
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’
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]
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’
795 | SPICE_RING_PROD_ITEM(qxl, ring, item);
| ^~~~~~~~~~~~~~~~~~~~
Replace pointer usage by direct structure/array access instead.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
hw/display/qxl.c | 83 +++++++++++++++++++++++++++++-------------------
1 file changed, 50 insertions(+), 33 deletions(-)
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index c8ce5781e0..12d83dd6f1 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -39,29 +39,49 @@
* abort we just qxl_set_guest_bug and set the return to NULL. Still
* it may happen as a result of emulator bug as well.
*/
-#undef SPICE_RING_PROD_ITEM
-#define SPICE_RING_PROD_ITEM(qxl, r, ret) { \
- uint32_t prod = (r)->prod & SPICE_RING_INDEX_MASK(r); \
- if (prod >= ARRAY_SIZE((r)->items)) { \
- qxl_set_guest_bug(qxl, "SPICE_RING_PROD_ITEM indices mismatch " \
- "%u >= %zu", prod, ARRAY_SIZE((r)->items)); \
- ret = NULL; \
- } else { \
- ret = &(r)->items[prod].el; \
- } \
+#define SPICE_RING_GET_CHECK(qxl, r, field) ({ \
+ field = (r)->field & SPICE_RING_INDEX_MASK(r); \
+ bool mismatch = field >= ARRAY_SIZE((r)->items); \
+ if (mismatch) { \
+ qxl_set_guest_bug(qxl, "SPICE_RING_GET %s indices mismatch " \
+ "%u >= %zu", stringify(field), field, \
+ ARRAY_SIZE((r)->items)); \
+ } \
+ !mismatch; \
+})
+
+static inline uint64_t
+qxl_release_ring_get_prod(PCIQXLDevice *qxl)
+{
+ struct QXLReleaseRing *ring = &qxl->ram->release_ring;
+ uint32_t prod;
+ bool ok = SPICE_RING_GET_CHECK(qxl, ring, prod);
+ assert(ok);
+
+ return ring->items[prod].el;
+}
+
+static inline bool
+qxl_release_ring_set_prod(PCIQXLDevice *qxl, uint64_t val)
+{
+ struct QXLReleaseRing *ring = &qxl->ram->release_ring;
+ uint32_t prod;
+ bool ok = SPICE_RING_GET_CHECK(qxl, ring, prod);
+ if (ok) {
+ ring->items[prod].el = val;
}
+ return ok;
+}
#undef SPICE_RING_CONS_ITEM
-#define SPICE_RING_CONS_ITEM(qxl, r, ret) { \
- uint32_t cons = (r)->cons & SPICE_RING_INDEX_MASK(r); \
- if (cons >= ARRAY_SIZE((r)->items)) { \
- qxl_set_guest_bug(qxl, "SPICE_RING_CONS_ITEM indices mismatch " \
- "%u >= %zu", cons, ARRAY_SIZE((r)->items)); \
- ret = NULL; \
- } else { \
- ret = &(r)->items[cons].el; \
- } \
- }
+#define SPICE_RING_CONS_ITEM(qxl, r, ret) { \
+ uint32_t cons; \
+ if (!SPICE_RING_GET_CHECK(qxl, r, cons)) { \
+ ret = NULL; \
+ } else { \
+ ret = &(r)->items[cons].el; \
+ } \
+}
#undef ALIGN
#define ALIGN(a, b) (((a) + ((b) - 1)) & ~((b) - 1))
@@ -414,7 +434,6 @@ static void init_qxl_rom(PCIQXLDevice *d)
static void init_qxl_ram(PCIQXLDevice *d)
{
uint8_t *buf;
- uint64_t *item;
buf = d->vga.vram_ptr;
d->ram = (QXLRam *)(buf + le32_to_cpu(d->shadow_rom.ram_header_offset));
@@ -426,9 +445,9 @@ static void init_qxl_ram(PCIQXLDevice *d)
SPICE_RING_INIT(&d->ram->cmd_ring);
SPICE_RING_INIT(&d->ram->cursor_ring);
SPICE_RING_INIT(&d->ram->release_ring);
- SPICE_RING_PROD_ITEM(d, &d->ram->release_ring, item);
- assert(item);
- *item = 0;
+ if (!qxl_release_ring_set_prod(d, 0)) {
+ g_assert_not_reached();
+ }
qxl_ring_set_dirty(d);
}
@@ -732,7 +751,6 @@ static int interface_req_cmd_notification(QXLInstance *sin)
static inline void qxl_push_free_res(PCIQXLDevice *d, int flush)
{
QXLReleaseRing *ring = &d->ram->release_ring;
- uint64_t *item;
int notify;
#define QXL_FREE_BUNCH_SIZE 32
@@ -759,11 +777,9 @@ static inline void qxl_push_free_res(PCIQXLDevice *d, int flush)
if (notify) {
qxl_send_events(d, QXL_INTERRUPT_DISPLAY);
}
- SPICE_RING_PROD_ITEM(d, ring, item);
- if (!item) {
+ if (!qxl_release_ring_set_prod(d, 0)) {
return;
}
- *item = 0;
d->num_free_res = 0;
d->last_release = NULL;
qxl_ring_set_dirty(d);
@@ -775,7 +791,8 @@ static void interface_release_resource(QXLInstance *sin,
{
PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
QXLReleaseRing *ring;
- uint64_t *item, id;
+ uint32_t prod;
+ uint64_t id;
if (ext.group_id == MEMSLOT_GROUP_HOST) {
/* host group -> vga mode update request */
@@ -792,16 +809,16 @@ static void interface_release_resource(QXLInstance *sin,
* pci bar 0, $command.release_info
*/
ring = &qxl->ram->release_ring;
- SPICE_RING_PROD_ITEM(qxl, ring, item);
- if (!item) {
+
+ if (!SPICE_RING_GET_CHECK(qxl, ring, prod)) {
return;
}
- if (*item == 0) {
+ if (qxl_release_ring_get_prod(qxl) == 0) {
/* stick head into the ring */
id = ext.info->id;
ext.info->next = 0;
qxl_ram_set_dirty(qxl, &ext.info->next);
- *item = id;
+ qxl_release_ring_set_prod(qxl, id);
qxl_ring_set_dirty(qxl);
} else {
/* append item to the list */

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon May 6 21:36:25 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Disable LTO as suggested by Martin Liska (boo#1133281)
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.0
* Patches added:
0036-util-qemu-sockets-Fix-GCC-9-build-w.patch
0037-hw-usb-hcd-xhci-Fix-GCC-9-build-war.patch
0038-hw-usb-dev-mtp-Fix-GCC-9-build-warn.patch
0039-linux-user-uname-Fix-GCC-9-build-wa.patch
0040-linux-user-elfload-Fix-GCC-9-build-.patch
0041-qxl-fix-Waddress-of-packed-member.patch
-------------------------------------------------------------------
Wed May 1 19:29:22 UTC 2019 - Bruce Rogers <brogers@suse.com>

View File

@ -69,6 +69,12 @@ 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
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
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.
# Run update_git.sh to regenerate this queue.
ExcludeArch: s390
@ -134,8 +140,15 @@ syscall layer occurs on the native hardware and operating system.
%patch0033 -p1
%patch0034 -p1
%patch0035 -p1
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
%build
%define _lto_cflags %{nil}
%if %build_in_tree
%define mybuilddir %{_builddir}/%buildsubdir

View File

@ -65,6 +65,7 @@ syscall layer occurs on the native hardware and operating system.
PATCH_EXEC
%build
%define _lto_cflags %{nil}
%if %build_in_tree
%define mybuilddir %{_builddir}/%buildsubdir

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon May 6 21:36:24 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Disable LTO as suggested by Martin Liska (boo#1133281)
- Remove and obsolete qemu-oss-audio subpackage. OSS audio is very
old, and we didn't really even configure the package properly for
it for a very long time, so presumably there can't be any users
of it as far as qemu is concerned
- Avoid warnings which gcc9 complains about
0036-util-qemu-sockets-Fix-GCC-9-build-w.patch
0037-hw-usb-hcd-xhci-Fix-GCC-9-build-war.patch
0038-hw-usb-dev-mtp-Fix-GCC-9-build-warn.patch
0039-linux-user-uname-Fix-GCC-9-build-wa.patch
0040-linux-user-elfload-Fix-GCC-9-build-.patch
0041-qxl-fix-Waddress-of-packed-member.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.0
-------------------------------------------------------------------
Wed May 1 19:29:10 UTC 2019 - Bruce Rogers <brogers@suse.com>
@ -58,7 +75,7 @@ Wed May 1 19:29:10 UTC 2019 - Bruce Rogers <brogers@suse.com>
--bitmap, --list, --tls-authz options for qemu-nbd
* virtio-blk now supports DISCARD and WRITE_ZEROES
* qemu-test-suite output is now in TAP format
* Sphinx now used for much of qemu documentation
* Sphinx now used for part of qemu documentation
* A few more configure features are enabled: iconv, lzfse (for openSUSE)
* Provide better logo icons
- Made these package building changes:

View File

@ -179,6 +179,12 @@ 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
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
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.
# Run update_git.sh to regenerate this queue.
@ -365,7 +371,6 @@ BuildRequires: python-base
BuildRequires: bc
BuildRequires: qemu-arm = %{qemuver}
BuildRequires: qemu-audio-alsa = %{qemuver}
BuildRequires: qemu-audio-oss = %{qemuver}
BuildRequires: qemu-audio-pa = %{qemuver}
%if 0%{?suse_version} >= 1320 && 0%{?is_opensuse}
BuildRequires: qemu-audio-sdl = %{qemuver}
@ -457,6 +462,8 @@ Suggests: qemu-lang
%if 0%{?is_opensuse}
Recommends: qemu-ksm = %{qemuver}
%endif
Provides: qemu-audio-oss = %{qemuver}
Obsoletes: qemu-audio-oss < %{qemuver}
# for the record, this set of firmware files is installed, but we don't
# build (yet): bamboo.dtb canyonlands.dtb hppa-firmware.img openbios-ppc openbios-sparc32
@ -814,16 +821,6 @@ Release: 0
%description audio-alsa
This package contains a module for ALSA based audio support for QEMU.
%package audio-oss
Summary: OSS based audio support for QEMU
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
%{qemu_module_conflicts}
%description audio-oss
This package contains a module for OSS based audio support for QEMU.
%package audio-pa
Summary: Pulse Audio based audio support for QEMU
Group: System/Emulators/PC
@ -990,6 +987,12 @@ This package provides a service file for starting and stopping KSM.
%patch0033 -p1
%patch0034 -p1
%patch0035 -p1
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
pushd roms/seabios
%patch1100 -p1
@ -1040,6 +1043,7 @@ do
done
%build
%define _lto_cflags %{nil}
%if %build_in_tree
%define mybuilddir %{_builddir}/%buildsubdir
@ -1073,9 +1077,9 @@ cd %mybuilddir
--enable-pie \
--enable-docs \
%if 0%{?suse_version} >= 1320 && 0%{?is_opensuse}
--audio-drv-list="pa alsa sdl oss" \
--audio-drv-list="pa alsa sdl" \
%else
--audio-drv-list="pa alsa oss" \
--audio-drv-list="pa alsa" \
%endif
--enable-attr \
--disable-auth-pam \
@ -1541,13 +1545,13 @@ fi
%_docdir/%name/interop/_static/down-pressed.png
%_docdir/%name/interop/_static/down.png
%_docdir/%name/interop/_static/file.png
%if 0%{?sle_version} == 150000
%_docdir/%name/interop/_static/jquery-3.1.0.js
%else
%if 0%{?sle_version} != 150000
%_docdir/%name/interop/_static/jquery-3.2.1.js
%else
%_docdir/%name/interop/_static/jquery-3.1.0.js
%endif
%_docdir/%name/interop/_static/jquery.js
%if 0%{?sle_version} != 150000
%if 0%{?sle_version} != 150000 && 0%{?sle_version} != 150100
%_docdir/%name/interop/_static/language_data.js
%endif
%_docdir/%name/interop/_static/minus.png
@ -1773,11 +1777,6 @@ fi
%dir %_libdir/%name
%_libdir/%name/audio-alsa.so
%files audio-oss
%defattr(-, root, root)
%dir %_libdir/%name
%_libdir/%name/audio-oss.so
%files audio-pa
%defattr(-, root, root)
%dir %_libdir/%name

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon May 6 21:36:24 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Disable LTO as suggested by Martin Liska (boo#1133281)
- Remove and obsolete qemu-oss-audio subpackage. OSS audio is very
old, and we didn't really even configure the package properly for
it for a very long time, so presumably there can't be any users
of it as far as qemu is concerned
- Avoid warnings which gcc9 complains about
0036-util-qemu-sockets-Fix-GCC-9-build-w.patch
0037-hw-usb-hcd-xhci-Fix-GCC-9-build-war.patch
0038-hw-usb-dev-mtp-Fix-GCC-9-build-warn.patch
0039-linux-user-uname-Fix-GCC-9-build-wa.patch
0040-linux-user-elfload-Fix-GCC-9-build-.patch
0041-qxl-fix-Waddress-of-packed-member.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.0
-------------------------------------------------------------------
Wed May 1 19:29:10 UTC 2019 - Bruce Rogers <brogers@suse.com>
@ -58,7 +75,7 @@ Wed May 1 19:29:10 UTC 2019 - Bruce Rogers <brogers@suse.com>
--bitmap, --list, --tls-authz options for qemu-nbd
* virtio-blk now supports DISCARD and WRITE_ZEROES
* qemu-test-suite output is now in TAP format
* Sphinx now used for much of qemu documentation
* Sphinx now used for part of qemu documentation
* A few more configure features are enabled: iconv, lzfse (for openSUSE)
* Provide better logo icons
- Made these package building changes:

View File

@ -179,6 +179,12 @@ 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
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
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.
# Run update_git.sh to regenerate this queue.
@ -365,7 +371,6 @@ BuildRequires: python-base
BuildRequires: bc
BuildRequires: qemu-arm = %{qemuver}
BuildRequires: qemu-audio-alsa = %{qemuver}
BuildRequires: qemu-audio-oss = %{qemuver}
BuildRequires: qemu-audio-pa = %{qemuver}
%if 0%{?suse_version} >= 1320 && 0%{?is_opensuse}
BuildRequires: qemu-audio-sdl = %{qemuver}
@ -457,6 +462,8 @@ Suggests: qemu-lang
%if 0%{?is_opensuse}
Recommends: qemu-ksm = %{qemuver}
%endif
Provides: qemu-audio-oss = %{qemuver}
Obsoletes: qemu-audio-oss < %{qemuver}
# for the record, this set of firmware files is installed, but we don't
# build (yet): bamboo.dtb canyonlands.dtb hppa-firmware.img openbios-ppc openbios-sparc32
@ -814,16 +821,6 @@ Release: 0
%description audio-alsa
This package contains a module for ALSA based audio support for QEMU.
%package audio-oss
Summary: OSS based audio support for QEMU
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
%{qemu_module_conflicts}
%description audio-oss
This package contains a module for OSS based audio support for QEMU.
%package audio-pa
Summary: Pulse Audio based audio support for QEMU
Group: System/Emulators/PC
@ -990,6 +987,12 @@ This package provides a service file for starting and stopping KSM.
%patch0033 -p1
%patch0034 -p1
%patch0035 -p1
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
pushd roms/seabios
%patch1100 -p1
@ -1040,6 +1043,7 @@ do
done
%build
%define _lto_cflags %{nil}
%if %build_in_tree
%define mybuilddir %{_builddir}/%buildsubdir
@ -1073,9 +1077,9 @@ cd %mybuilddir
--enable-pie \
--enable-docs \
%if 0%{?suse_version} >= 1320 && 0%{?is_opensuse}
--audio-drv-list="pa alsa sdl oss" \
--audio-drv-list="pa alsa sdl" \
%else
--audio-drv-list="pa alsa oss" \
--audio-drv-list="pa alsa" \
%endif
--enable-attr \
--disable-auth-pam \
@ -1541,13 +1545,13 @@ fi
%_docdir/%name/interop/_static/down-pressed.png
%_docdir/%name/interop/_static/down.png
%_docdir/%name/interop/_static/file.png
%if 0%{?sle_version} == 150000
%_docdir/%name/interop/_static/jquery-3.1.0.js
%else
%if 0%{?sle_version} != 150000
%_docdir/%name/interop/_static/jquery-3.2.1.js
%else
%_docdir/%name/interop/_static/jquery-3.1.0.js
%endif
%_docdir/%name/interop/_static/jquery.js
%if 0%{?sle_version} != 150000
%if 0%{?sle_version} != 150000 && 0%{?sle_version} != 150100
%_docdir/%name/interop/_static/language_data.js
%endif
%_docdir/%name/interop/_static/minus.png
@ -1773,11 +1777,6 @@ fi
%dir %_libdir/%name
%_libdir/%name/audio-alsa.so
%files audio-oss
%defattr(-, root, root)
%dir %_libdir/%name
%_libdir/%name/audio-oss.so
%files audio-pa
%defattr(-, root, root)
%dir %_libdir/%name

View File

@ -328,7 +328,6 @@ BuildRequires: python-base
BuildRequires: bc
BuildRequires: qemu-arm = %{qemuver}
BuildRequires: qemu-audio-alsa = %{qemuver}
BuildRequires: qemu-audio-oss = %{qemuver}
BuildRequires: qemu-audio-pa = %{qemuver}
%if 0%{?suse_version} >= 1320 && 0%{?is_opensuse}
BuildRequires: qemu-audio-sdl = %{qemuver}
@ -420,6 +419,8 @@ Suggests: qemu-lang
%if 0%{?is_opensuse}
Recommends: qemu-ksm = %{qemuver}
%endif
Provides: qemu-audio-oss = %{qemuver}
Obsoletes: qemu-audio-oss < %{qemuver}
# for the record, this set of firmware files is installed, but we don't
# build (yet): bamboo.dtb canyonlands.dtb hppa-firmware.img openbios-ppc openbios-sparc32
@ -777,16 +778,6 @@ Release: 0
%description audio-alsa
This package contains a module for ALSA based audio support for QEMU.
%package audio-oss
Summary: OSS based audio support for QEMU
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
%{qemu_module_conflicts}
%description audio-oss
This package contains a module for OSS based audio support for QEMU.
%package audio-pa
Summary: Pulse Audio based audio support for QEMU
Group: System/Emulators/PC
@ -969,6 +960,7 @@ do
done
%build
%define _lto_cflags %{nil}
%if %build_in_tree
%define mybuilddir %{_builddir}/%buildsubdir
@ -1002,9 +994,9 @@ cd %mybuilddir
--enable-pie \
--enable-docs \
%if 0%{?suse_version} >= 1320 && 0%{?is_opensuse}
--audio-drv-list="pa alsa sdl oss" \
--audio-drv-list="pa alsa sdl" \
%else
--audio-drv-list="pa alsa oss" \
--audio-drv-list="pa alsa" \
%endif
--enable-attr \
--disable-auth-pam \
@ -1470,13 +1462,13 @@ fi
%_docdir/%name/interop/_static/down-pressed.png
%_docdir/%name/interop/_static/down.png
%_docdir/%name/interop/_static/file.png
%if 0%{?sle_version} == 150000
%_docdir/%name/interop/_static/jquery-3.1.0.js
%else
%if 0%{?sle_version} != 150000
%_docdir/%name/interop/_static/jquery-3.2.1.js
%else
%_docdir/%name/interop/_static/jquery-3.1.0.js
%endif
%_docdir/%name/interop/_static/jquery.js
%if 0%{?sle_version} != 150000
%if 0%{?sle_version} != 150000 && 0%{?sle_version} != 150100
%_docdir/%name/interop/_static/language_data.js
%endif
%_docdir/%name/interop/_static/minus.png
@ -1702,11 +1694,6 @@ fi
%dir %_libdir/%name
%_libdir/%name/audio-alsa.so
%files audio-oss
%defattr(-, root, root)
%dir %_libdir/%name
%_libdir/%name/audio-oss.so
%files audio-pa
%defattr(-, root, root)
%dir %_libdir/%name

View File

@ -230,9 +230,16 @@ Deprecated, Superseded, Modified and Dropped Features
host_net_add
host_net_remove
- This previously unsupported QMP command is now supported under a new name:
- These previously unsupported QMP command is now supported under a new name:
x-block-dirty-bitmap-disable (use block-dirty-bitmap-disable instead)
x-block-dirty-bitmap-enable (use block-dirty-bitmap-enable instead)
x-block-dirty-bitmap-merge (use block-dirty-bitmap-merge instead)
x-block-latency-histogram-set (use block-latency-histogram-set instead)
x-blockdev-create (use blockdev-create instead)
- This previously unsupported QMP command is no longer recognized:
x-nbd-server-add-bitmap
- Due to upstream's decision to no longer fully support the qed storage format
going forward (since it really provides no benefit over qcow2 and is now no
longer actively maintained upstream), creating qed storage images is no longer
@ -472,6 +479,9 @@ QEMU Command-Line and Monitor Syntax and Support
block-commit
block-dirty-bitmap-add
block-dirty-bitmap-clear
block-dirty-bitmap-disable
block-dirty-bitmap-enable
block-dirty-bitmap-merge
block-dirty-bitmap-remove
block_passwd
block_resize
@ -541,6 +551,7 @@ QEMU Command-Line and Monitor Syntax and Support
query-cpu-model-expansion
query-cpus
query-cpus-fast
query-current-machine
query-display-options
query-dump
query-dump-guest-memory-capability
@ -799,16 +810,13 @@ QEMU Command-Line and Monitor Syntax and Support
query-colo-status
query-sev
query-sev-launch-measure
x-block-dirty-bitmap-disable
x-block-dirty-bitmap-enable
x-block-dirty-bitmap-merge
x-blockdev-change
x-blockdev-insert-medium
x-blockdev-remove-medium
x-blockdev-reopen
x-colo-lost-heartbeat
x-debug-block-dirty-bitmap-sha256
x-exit-preconfig
x-nbd-server-add-bitmap
xen-colo-do-checkpoint
xen-load-devices-state
xen-save-devices-state

View File

@ -232,9 +232,16 @@ Deprecated, Superseded, Modified and Dropped Features
host_net_add
host_net_remove
- This previously unsupported QMP command is now supported under a new name:
- These previously unsupported QMP command is now supported under a new name:
x-block-dirty-bitmap-disable (use block-dirty-bitmap-disable instead)
x-block-dirty-bitmap-enable (use block-dirty-bitmap-enable instead)
x-block-dirty-bitmap-merge (use block-dirty-bitmap-merge instead)
x-block-latency-histogram-set (use block-latency-histogram-set instead)
x-blockdev-create (use blockdev-create instead)
- This previously unsupported QMP command is no longer recognized:
x-nbd-server-add-bitmap
- Due to upstream's decision to no longer fully support the qed storage format
going forward (since it really provides no benefit over qcow2 and is now no
longer actively maintained upstream), creating qed storage images is no longer
@ -467,6 +474,9 @@ QEMU Command-Line and Monitor Syntax and Support
block-commit
block-dirty-bitmap-add
block-dirty-bitmap-clear
block-dirty-bitmap-disable
block-dirty-bitmap-enable
block-dirty-bitmap-merge
block-dirty-bitmap-remove
block_passwd
block_resize
@ -534,6 +544,7 @@ QEMU Command-Line and Monitor Syntax and Support
query-cpu-model-expansion
query-cpus
query-cpus-fast
query-current-machine
query-display-options
query-dump
query-dump-guest-memory-capability
@ -740,16 +751,13 @@ QEMU Command-Line and Monitor Syntax and Support
query-colo-status
query-sev
query-sev-launch-measure
x-block-dirty-bitmap-disable
x-block-dirty-bitmap-enable
x-block-dirty-bitmap-merge
x-blockdev-change
x-blockdev-insert-medium
x-blockdev-remove-medium
x-blockdev-reopen
x-colo-lost-heartbeat
x-exit-preconfig
x-debug-block-dirty-bitmap-sha256
x-nbd-server-add-bitmap
xen-colo-do-checkpoint
xen-load-devices-state
xen-save-devices-state

View File

@ -227,9 +227,16 @@ Deprecated, Superseded, Modified and Dropped Features
usb_add
usb_del
- This previously unsupported QMP command is now supported under a new name:
- These previously unsupported QMP command is now supported under a new name:
x-block-dirty-bitmap-disable (use block-dirty-bitmap-disable instead)
x-block-dirty-bitmap-enable (use block-dirty-bitmap-enable instead)
x-block-dirty-bitmap-merge (use block-dirty-bitmap-merge instead)
x-block-latency-histogram-set (use block-latency-histogram-set instead)
x-blockdev-create (use blockdev-create instead)
- This previously unsupported QMP command is no longer recognized:
x-nbd-server-add-bitmap
- Due to upstream's decision to no longer fully support the qed storage format
going forward (since it really provides no benefit over qcow2 and is now no
longer actively maintained upstream), creating qed storage images is no longer
@ -463,6 +470,9 @@ QEMU Command-Line and Monitor Syntax and Support
block-commit
block-dirty-bitmap-add
block-dirty-bitmap-clear
block-dirty-bitmap-disable
block-dirty-bitmap-enable
block-dirty-bitmap-merge
block-dirty-bitmap-remove
block_passwd
block_resize
@ -532,6 +542,7 @@ QEMU Command-Line and Monitor Syntax and Support
query-cpu-model-expansion
query-cpus
query-cpus-fast
query-current-machine
query-display-options
query-dump
query-dump-guest-memory-capability
@ -755,16 +766,13 @@ QEMU Command-Line and Monitor Syntax and Support
query-tpm
query-tpm-models
query-tpm-types
x-block-dirty-bitmap-disable
x-block-dirty-bitmap-enable
x-block-dirty-bitmap-merge
x-blockdev-change
x-blockdev-insert-medium
x-blockdev-remove-medium
x-blockdev-reopen
x-colo-lost-heartbeat
x-debug-block-dirty-bitmap-sha256
x-exit-preconfig
x-nbd-server-add-bitmap
xen-colo-do-checkpoint
xen-load-devices-state
xen-save-devices-state

View File

@ -311,10 +311,17 @@ Deprecated, Superseded, Modified and Dropped Features
host_net_add
host_net_remove
- This previously unsupported QMP command is now supported under a new name:
- These previously unsupported QMP command is now supported under a new name:
x-block-dirty-bitmap-disable (use block-dirty-bitmap-disable instead)
x-block-dirty-bitmap-enable (use block-dirty-bitmap-enable instead)
x-block-dirty-bitmap-merge (use block-dirty-bitmap-merge instead)
x-block-latency-histogram-set (use block-latency-histogram-set instead)
x-blockdev-create (use blockdev-create instead)
x-input-send-event (use input-send-event instead)
- This previously unsupported QMP command is no longer recognized:
x-nbd-server-add-bitmap
- Due to the lack of migration support (mainly due to ahci interface issues)
and other unstable interface issues, earlier versions of the q35 machine type
are not supported in this release. The current q35 machine type is however now
@ -586,6 +593,9 @@ QEMU Command-Line and Monitor Syntax and Support
block-commit
block-dirty-bitmap-add
block-dirty-bitmap-clear
block-dirty-bitmap-disable
block-dirty-bitmap-enable
block-dirty-bitmap-merge
block-dirty-bitmap-remove
block_passwd
block_resize
@ -655,6 +665,7 @@ QEMU Command-Line and Monitor Syntax and Support
query-cpu-model-expansion
query-cpus
query-cpus-fast
query-current-machine
query-display-options
query-dump
query-dump-guest-memory-capability
@ -847,15 +858,12 @@ QEMU Command-Line and Monitor Syntax and Support
query-colo-status
query-sev
query-sev-launch-measure
x-block-dirty-bitmap-disable
x-block-dirty-bitmap-enable
x-block-dirty-bitmap-merge
x-blockdev-change
x-blockdev-insert-medium
x-blockdev-remove-medium
x-blockdev-reopen
x-colo-lost-heartbeat
x-debug-block-dirty-bitmap-sha256
x-exit-preconfig
x-nbd-server-add-bitmap
xen-colo-do-checkpoint
xen-set-replication