From ab507f047953cdf57e4e887a9cb07f08654d4958 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 16 Feb 2010 17:48:20 +0000 Subject: [PATCH] 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 (Cherry-picked from f187eeb8546405d57eb421cdd329d804ee734d23, conflicts to hw/pci.c) --- hw/pci.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 01eff8d0..80568dac 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -31,6 +31,12 @@ #include "exec-all.h" #include "qemu-xen.h" +#ifdef CONFIG_PASSTHROUGH +#include "hw/pass-through.h" +#endif + +extern int igd_passthru; + //#define DEBUG_PCI struct PCIBus { @@ -826,8 +832,11 @@ void pci_unplug_netifs(void) dev = bus->devices[x]; if (dev && dev->config[0xa] == 0 && - dev->config[0xb] == 2 && - test_pci_slot(x >> 3) != 1) { + dev->config[0xb] == 2 +#ifdef CONFIG_PASSTHROUGH + && test_pci_slot(x >> 3) != 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 -- 2.39.5