yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From 987638b1d627c7f7234210c1dff1f7e795f3aae3 Mon Sep 17 00:00:00 2001
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
Date: Sat, 2 Nov 2013 16:09:08 +0100
218e99
Subject: [PATCH 13/29] rhel: Drop "ivshmem" device
218e99
218e99
RH-Author: Markus Armbruster <armbru@redhat.com>
218e99
Message-id: <1383408548-7760-2-git-send-email-armbru@redhat.com>
218e99
Patchwork-id: 55277
218e99
O-Subject: [PATCH 7.0 qemu-kvm 1/1] rhel: Drop "ivshmem" device
218e99
Bugzilla: 787463
218e99
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
218e99
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
218e99
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
218e99
We can drop a device from the build only when it isn't referenced from
218e99
code we build.  References come in two forms: extern symbols, and qdev
218e99
driver names.
218e99
218e99
Unresolved extern symbols pose no real danger, because they fail
218e99
safely at link time.  But the dropped code doesn't define any extern
218e99
symbols anyway.
218e99
218e99
Unresolved driver names get detected only at runtime, so we better be
218e99
extra careful.  The only occurences of the driver name outside the
218e99
code dropped by this patch is in machine type compat properties
218e99
(safe), and those aren't even compiled for RHEL (extra safe).
218e99
218e99
Since there's no CONFIG_IVSHMEM, we need to hack the Makefile
218e99
directly.  Creating CONFIG_IVSHMEM upstream would be nice, but we're
218e99
out of time.
218e99
218e99
Signed-off-by: Markus Armbruster <armbru@redhat.com>
218e99
---
218e99
 hw/misc/Makefile.objs | 3 ++-
218e99
 1 file changed, 2 insertions(+), 1 deletion(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 hw/misc/Makefile.objs |    3 ++-
218e99
 1 files changed, 2 insertions(+), 1 deletions(-)
218e99
218e99
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
218e99
index 2578e29..cd3123b 100644
218e99
--- a/hw/misc/Makefile.objs
218e99
+++ b/hw/misc/Makefile.objs
218e99
@@ -17,7 +17,8 @@ common-obj-$(CONFIG_PUV3) += puv3_pm.o
218e99
 common-obj-$(CONFIG_MACIO) += macio/
218e99
 
218e99
 ifeq ($(CONFIG_PCI), y)
218e99
-obj-$(CONFIG_KVM) += ivshmem.o
218e99
+# Disabled for Red Hat Enterprise Linux:
218e99
+# obj-$(CONFIG_KVM) += ivshmem.o
218e99
 obj-$(CONFIG_LINUX) += vfio.o
218e99
 endif
218e99
 
218e99
-- 
218e99
1.7.1
218e99