From: Simon Horman Subject: [patch] xm: Add missing AUTO_PHP_SLOT Date: Mon, 6 Apr 2009 08:50:10 +1000 Message-ID: <20090405225007.GA3494@verge.net.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel Cc: Ian Jackson , Keir Fraser , "Cui, Dexuan" List-Id: xen-devel@lists.xenproject.org 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. Signed-off-by: Simon Horman Index: xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py =================================================================== --- xen-unstable.hg.orig/tools/python/xen/xend/XendDomainInfo.py 2009-04-06 08:20:31.000000000 +1000 +++ xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py 2009-04-06 08:42:01.000000000 +1000 @@ -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.