From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Thu, 27 Jan 2011 06:56:38 +0000 (+0900)
Subject: pci: use PCI_DEVFN in pci_get_bus_devfn()
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6ff534b678e26450ad6e2ad850b70c9db0e92139;p=qmiga%2Fqemu.git

pci: use PCI_DEVFN in pci_get_bus_devfn()

Replace hardcoded logic by a common macro.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/pci.c b/hw/pci.c
index 44a1f9e526..df184f1829 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -558,7 +558,7 @@ PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr)
         return NULL;
     }
 
-    *devfnp = slot << 3;
+    *devfnp = PCI_DEVFN(slot, 0);
     return pci_find_bus(pci_find_root_bus(dom), bus);
 }