51d9a2
From 1a2abd15b50c99659fe850673d95a2edd75f19a1 Mon Sep 17 00:00:00 2001
51d9a2
Message-Id: <1a2abd15b50c99659fe850673d95a2edd75f19a1@dist-git>
38f2fd
From: Martin Kletzander <mkletzan@redhat.com>
38f2fd
Date: Mon, 23 Nov 2015 12:46:36 +0100
6ae9ed
Subject: [PATCH] RHEL: qemu: Support vhost-user-multiqueue with QEMU 2.3
38f2fd
38f2fd
RHEL-only
38f2fd
38f2fd
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1207692
38f2fd
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1284416
38f2fd
38f2fd
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
38f2fd
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
38f2fd
---
38f2fd
 src/qemu/qemu_capabilities.c | 7 +++++--
38f2fd
 1 file changed, 5 insertions(+), 2 deletions(-)
38f2fd
38f2fd
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
51d9a2
index 0d79780f25..fc1cf53066 100644
38f2fd
--- a/src/qemu/qemu_capabilities.c
38f2fd
+++ b/src/qemu/qemu_capabilities.c
51d9a2
@@ -4000,8 +4000,11 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
38f2fd
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF);
38f2fd
 
38f2fd
     /* vhost-user supports multi-queue from v2.4.0 onwards,
38f2fd
-     * but there is no way to query for that capability */
38f2fd
-    if (qemuCaps->version >= 2004000)
38f2fd
+     * but there is no way to query for that capability
38f2fd
+     *
38f2fd
+     * RHEL-only: The change was back-ported to earlier QEMU version,
38f2fd
+     * particularly 2.3, in BZ 1276100 */
38f2fd
+    if (qemuCaps->version >= 2003000)
38f2fd
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
38f2fd
 
3e5111
     /* smm option is supported from v2.4.0 */
38f2fd
-- 
51d9a2
2.18.0
38f2fd