From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Tue, 16 Feb 2010 17:48:20 +0000 (+0000)
Subject: passthrough: magic protocol passthrough fix no-passthrough compile
X-Git-Tag: xen-4.0.0-rc4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f187eeb8546405d57eb421cdd329d804ee734d23;p=qemu-xen-4.1-testing.git

passthrough: magic protocol passthrough fix no-passthrough compile

Changeset 60b80e3ee319e908069d1603e5b73f815acdffac broke the build
when CONFIG_PASSTHROUGH was not set.

It also failed to #include a necessary header file, generating a
compiler warning.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/hw/pci.c b/hw/pci.c
index a1c1f161b..b07e5ea2d 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -31,6 +31,10 @@
 #include "exec-all.h"
 #include "qemu-xen.h"
 
+#ifdef CONFIG_PASSTHROUGH
+#include "hw/pass-through.h"
+#endif
+
 extern int igd_passthru;
 
 //#define DEBUG_PCI
@@ -858,8 +862,11 @@ void pci_unplug_netifs(void)
            dev = bus->devices[x];
            if (dev &&
                dev->config[0xa] == 0 &&
-               dev->config[0xb] == 2 &&
-               test_pci_devfn(x) != 1) {
+               dev->config[0xb] == 2
+#ifdef CONFIG_PASSTHROUGH
+               && test_pci_devfn(x) != 1
+#endif
+               ) {
                /* Found a netif.  Remove it from the bus.  Note that
                   we don't free it here, since there could still be
                   references to it floating around.  There are only