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