rpms/qemu
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Workaround libvirt 3.2 CPU issues (bz #1467599)

Browse Source
This commit is contained in:
Cole Robinson 2017-07-13 16:31:33 -04:00
parent 61973ed6f5
commit d6538fef33
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0105-Disable-qmp-cpu-commands-bug-1467599.patch Normal file
View File

@ -0,0 +1,31 @@
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 13 Jul 2017 16:28:46 -0400
Subject: [PATCH] Disable qmp cpu commands (bug #1467599)
Not for upstream. Emergency workaround for this bug right before
the fedora release:
https://bugzilla.redhat.com/show_bug.cgi?id=1467599
---
monitor.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/monitor.c b/monitor.c
index be282ecb80..7a668ee42f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -983,10 +983,12 @@ static void qmp_unregister_commands_hack(void)
#ifndef TARGET_ARM
qmp_unregister_command(&qmp_commands, "query-gic-capabilities");
#endif
-#if !defined(TARGET_S390X) && !defined(TARGET_I386)
+#if 1 || !defined(TARGET_S390X) && !defined(TARGET_I386)
+ /*XXX emergency workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1467599 */
qmp_unregister_command(&qmp_commands, "query-cpu-model-expansion");
#endif
-#if !defined(TARGET_S390X)
+#if 1 || !defined(TARGET_S390X)
+ /*XXX emergency workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1467599 */
qmp_unregister_command(&qmp_commands, "query-cpu-model-baseline");
qmp_unregister_command(&qmp_commands, "query-cpu-model-comparison");
#endif

7
qemu.spec
View File

@ -92,7 +92,7 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 2.9.0
Release: 2%{?rcrel}%{?dist}
Release: 3%{?rcrel}%{?dist}
Epoch: 2
License: GPLv2+ and LGPLv2+ and BSD
Group: Development/Tools
@ -156,6 +156,8 @@ Patch0103: 0103-nbd-Fix-regression-on-resiliency-to-port-scan.patch
# CVE-2017-10664: qemu-nbd: server breaks with SIGPIPE upon client abort (bz
# #1466192)
Patch0104: 0104-qemu-nbd-Ignore-SIGPIPE.patch
# Workaround libvirt 3.2 CPU issues (bz #1467599)
Patch0105: 0105-Disable-qmp-cpu-commands-bug-1467599.patch
# documentation deps
BuildRequires: texinfo
@ -2030,6 +2032,9 @@ getent passwd qemu >/dev/null || \
%changelog
* Thu Jul 13 2017 Cole Robinson <crobinso@redhat.com> - 2:2.9.0-3
- Workaround libvirt 3.2 CPU issues (bz #1467599)
* Wed Jul 12 2017 Cole Robinson <crobinso@redhat.com> - 2:2.9.0-2
- CVE-2017-8112: vmw_pvscsi: infinite loop in pvscsi_log2 (bz #1445622)
- CVE-2017-8309: audio: host memory lekage via capture buffer (bz #1446520)