diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py
index 647a7de3db..b826f8ea3c 100644
--- a/tools/python/xen/util/pci.py
+++ b/tools/python/xen/util/pci.py
@@ -286,19 +286,13 @@ def parse_pci_name_extended(pci_dev_str):
     # Virtual slot assignment takes place here if specified in the bdf,
     # else it is done inside qemu-xen, as it knows which slots are free
     pci = []
+    vfunc = 0;
     func_list = pci_func_list_process(pci_dev_str, template,
                                       pci_dev_info['func'])
     for func in func_list:
         pci_dev = template.copy()
         pci_dev['func'] = "0x%x" % func
 
-        if len(func_list) == 1:
-            # For single-function devices vfunc must be 0
-            vfunc = 0
-        else:
-            # For multi-function virtual devices,
-            # identity map the func to vfunc
-            vfunc = func
         if pci_dev_info['vdevfn'] == '':
             vdevfn = AUTO_PHP_SLOT | vfunc
         else:
@@ -306,6 +300,7 @@ def parse_pci_name_extended(pci_dev_str):
         pci_dev['vdevfn'] = "0x%02x" % vdevfn
 
         pci.append(pci_dev)
+        vfunc += 1
 
     # For pci attachment and detachment is it important that virtual
     # function 0 is done last. This is because is virtual function 0 that
diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 5bfde5032e..75065a9d9c 100644
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -2226,9 +2226,17 @@ def xm_pci_list(args):
     if len(devs) == 0:
         return
 
-    devs.sort(None,
-              lambda x: (x['vdevfn'] - PCI_FUNC(x['vdevfn'])) << 32 |
-                        PCI_BDF(x['domain'], x['bus'], x['slot'], x['func']))
+    def f(x):
+	# The vfunc shouldn't be used for ordering if the vslot hasn't been
+	# assigned as the output looks odd beacuse the vfunc isn't reported
+	# but the (physical) function is.
+	if x['vdevfn'] & AUTO_PHP_SLOT:
+	    vdevfn = AUTO_PHP_SLOT
+	else:
+	    vdevfn = x['vdevfn']
+        return (vdevfn << 32) | \
+	       PCI_BDF(x['domain'], x['bus'], x['slot'], x['func'])
+    devs.sort(None, f)
 
     has_vdevfn = False
     for x in devs: