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