passthrough: magic protocol passthrough fix fix

The previous changeset 60b80e3ee319e908069d1603e5b73f815acdffac had a
bug qemu-xen-unstable, in that test_pci_slot is only in 3.4-testing.
This patch makes it use the new devfn-based interface.

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

diff --git a/hw/pci.c b/hw/pci.c
index fc6b019f760fba3cce2bd166c3926ee7c36064ba..a1c1f161bffa7255e952b7f3f8ec8ff46a35ef29 100644 (file)
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -859,7 +859,7 @@ void pci_unplug_netifs(void)
            if (dev &&
                dev->config[0xa] == 0 &&
                dev->config[0xb] == 2 &&
-               test_pci_slot(x >> 3) != 1) {
+               test_pci_devfn(x) != 1) {
                /* 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