[Xen-changelog] [qemu-xen-3.4-testing] passthrough: magic protocol passthrough fix no-passthrough compile

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

commit ab507f047953cdf57e4e887a9cb07f08654d4958
Author: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Date:   Tue Feb 16 17:48:20 2010 +0000

    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@xxxxxxxxxxxxx>
    
    (Cherry-picked from f187eeb8546405d57eb421cdd329d804ee734d23,
     conflicts to hw/pci.c)
---
 hw/pci.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hw/pci.c b/hw/pci.c
index 01eff8d..80568da 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
--
generated by git-patchbot for /home/xen/git/qemu-xen-3.4-testing.git

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