# HG changeset patch
# User Jim Fehlig <jfehlig@novell.com>
# Date 1284948067 21600
# Node ID 4674ad11feef87a6a57b99313966e0e121588e1c
# Parent  5393151a737b023476f4e571effc547e758cf8c8
xend: Fix device_configure

The semantics of XendDomainInfo.py:device_configure() changed with xen upstream
c/s 19610.  Previously this method would take a devid in actual id *or* name
form, e.g. it would accept '5632' or 'hdc'.  This patch restores that behavior.

    Signed-off-by: Jim Fehlig <jfehlig@novell.com>

Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -1218,6 +1218,9 @@ class XendDomainInfo:
             except ValueError:
                 pass
             devid = dev_control.convertToDeviceNumber(dev)
+        else:
+            # devid could be a name, e.g. hdc
+            devid = dev_control.convertToDeviceNumber(devid)
         dev_info = self._getDeviceInfo_vbd(devid)
         if dev_info is None:
             raise VmError("Device %s not connected" % devid)