[Xen-changelog] [xen-unstable] [VTD] dynamically determines whether to link with libpci or not in QEMU.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1190277649 -3600
# Node ID fdabc0af58524fe38a4552624eb75abce57c6026
# Parent  177ebf350b4c37a5ed83ac1475d2ebd1f482f926
[VTD] dynamically determines whether to link with libpci or not in QEMU.

This patch to ioemu/Makefile.target dynamically decides whether to
link with libpci or not base on the existence of /usr/include/pci
directory.

If /usr/include/pci exists, PCI passthrough is enabled.  Otherwise, it
is disabled.

Signed-off-by: Allen Kay <allen.m.kay@xxxxxxxxx>
---
 tools/ioemu/Makefile.target |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff -r 177ebf350b4c -r fdabc0af5852 tools/ioemu/Makefile.target
--- a/tools/ioemu/Makefile.target       Wed Sep 19 15:42:56 2007 +0100
+++ b/tools/ioemu/Makefile.target       Thu Sep 20 09:40:49 2007 +0100
@@ -197,9 +197,6 @@ LIBS+=-lm
 LIBS+=-lm
 LIBS+=-L../../libxc -lxenctrl -lxenguest
 LIBS+=-L../../xenstore -lxenstore
-ifdef CONFIG_PASSTHROUGH
-LIBS+=-lpci
-endif
 ifndef CONFIG_USER_ONLY
 LIBS+=-lz
 endif
@@ -351,6 +348,16 @@ VL_OBJS+=tap-win32.o
 VL_OBJS+=tap-win32.o
 endif
 
+ifeq (,$(wildcard /usr/include/pci))
+$(warning *** pciutils-devl package not found - missing /usr/include/pci)
+$(warning *** PCI passthrough capability has been disabled)
+else
+LIBS+=-lpci
+VL_OBJS+= pass-through.o
+CFLAGS += -DCONFIG_PASSTHROUGH
+$(info *** PCI passthrough capability has been enabled ***)
+endif
+
 SOUND_HW = sb16.o es1370.o
 AUDIODRV = audio.o noaudio.o wavaudio.o
 ifdef CONFIG_SDL
@@ -403,9 +410,6 @@ VL_OBJS+= xenstore.o
 VL_OBJS+= xenstore.o
 VL_OBJS+= xen_platform.o
 VL_OBJS+= tpm_tis.o
-ifdef CONFIG_PASSTHROUGH
-VL_OBJS+= pass-through.o
-endif
 CPPFLAGS += -DHAS_AUDIO
 endif
 ifeq ($(TARGET_BASE_ARCH), ppc)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog