Skip to contentSkip to conversation

xm: Add missing AUTO_PHP_SLOT

PATCH New Simon Horman 1 participant 1 message Apr 5, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xm: Add missing AUTO_PHP_SLOT

This patch changes over a few sections of code that I missed when adding AUTO_PHP_SLOT to signify that qemu-xen should pick a slot - previously 0 was used.

I have not experienced any breakage as a result of these changes being missing, nor am I even sure that is possible. But it seems worthwhile to clean things up in this way for 3.4. And possibly remove the (spurious?) checks afterwards.

tools/python/xen/xend/XendDomainInfo.py +2 -2
Index: xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py
===================================================================
@@ -619,7 +619,7 @@ class XendDomainInfo:
             pci_devs = pci_conf['devs']
             for x in pci_devs:
                 if (int(x['vslt'], 16) == int(new_dev['vslt'], 16) and
-                   int(x['vslt'], 16) != 0 ):
+                   int(x['vslt'], 16) != AUTO_PHP_SLOT):
                     raise VmError("vslot %s already have a device." % (new_dev['vslt']))
 
                 if (int(x['domain'], 16) == int(new_dev['domain'], 16) and
@@ -1045,7 +1045,7 @@ class XendDomainInfo:
         if devnum >= pci_len:
             raise VmError("Device @ vslot 0x%x doesn't exist." % (vslot))
 
-        if vslot == 0:
+        if vslot == AUTO_PHP_SLOT:
             raise VmError("Device @ vslot 0x%x do not support hotplug." % (vslot))
 
         # Check the co-assignment.