yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
ae23c9
From 747643ced0f1950360a2af103bb2490849aa3abf Mon Sep 17 00:00:00 2001
ae23c9
From: Miroslav Rezanina <mrezanin@redhat.com>
ae23c9
Date: Thu, 7 Jun 2018 07:43:14 +0200
ae23c9
Subject: [PATCH 262/268] Disable new pvrdma device
ae23c9
ae23c9
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
ae23c9
Message-id: <5d290e25879e3ac42c247ff3c3a524001ceb0be1.1528355911.git.mrezanin@redhat.com>
ae23c9
Patchwork-id: 80597
ae23c9
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 6/7] Disable new pvrdma device
ae23c9
Bugzilla: 1586357
ae23c9
RH-Acked-by: Thomas Huth <thuth@redhat.com>
ae23c9
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
ae23c9
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
ae23c9
ae23c9
From: Miroslav Rezanina <mrezanin@redhat.com>
ae23c9
ae23c9
New pvrdma device was introduced in rebase to QEMU 2.12. We do not want to
ae23c9
support this device.
ae23c9
ae23c9
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
ae23c9
---
ae23c9
 hw/rdma/Makefile.objs | 3 ++-
ae23c9
 1 file changed, 2 insertions(+), 1 deletion(-)
ae23c9
ae23c9
diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs
ae23c9
index 3504c39..02ca2a9 100644
ae23c9
--- a/hw/rdma/Makefile.objs
ae23c9
+++ b/hw/rdma/Makefile.objs
ae23c9
@@ -1,5 +1,6 @@
ae23c9
 ifeq ($(CONFIG_RDMA),y)
ae23c9
 obj-$(CONFIG_PCI) += rdma_utils.o rdma_backend.o rdma_rm.o
ae23c9
 obj-$(CONFIG_PCI) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \
ae23c9
-                     vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o
ae23c9
+                     vmw/pvrdma_qp_ops.o
ae23c9
+#obj-$(CONFIG_PCI) += vmw/pvrdma_main.o
ae23c9
 endif
ae23c9
-- 
ae23c9
1.8.3.1
ae23c9