xen-4.1-3 xend/XendDomainInfo.py#device_configure() TypeError
PATCH 1/1 xen-4.1-3 xend/XendDomainInfo.py#device_configure() TypeError
Hello,
I noticed a bug in Xen-4.1-3, which is also still present in xen+git.
I know that the Python xend is deprecated, but I'm stuck with xen-4.1 until xen is usable with libvirt, so my patch might still be helpful for others. This is a follow-up to <http://lists.xen.org/archives/html/xen-users/2012-11/msg00069.html>, which still keeps me busy.
/xen/xend/server/SrvDomain.py declares, that "dev" is a string:
def op_device_configure(self, _, req):
return self.call(self.dom.device_configure,
[['config', 'sxpr'],
['dev', 'str']],
req)but in xen/xend/XendDomainInfo.py "devid" is expected to be an integer:
def device_configure(self, dev_sxp, devid = None):
"""Configure an existing device.
...
@param devid: device id
@type devid: int
This leads to an error when I try to change the media of an CDROM device:
ERROR (SrvBase:88) Request device_configure failed.
Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/xen/web/SrvBase.py", line 85, in perform
return op_method(op, req)
File "/usr/lib/python2.6/dist-packages/xen/xend/server/SrvDomain.py", line 216, in op_device_configure
req)
File "/usr/lib/python2.6/dist-packages/xen/xend/server/SrvDomain.py", line 186, in call
return FormFn(fn, args)(req.args)
File "/usr/lib/python2.6/dist-packages/xen/xend/Args.py", line 166, in __call__
return self.call_with_form_args(self.fn, fargs, xargs=xargs)
File "/usr/lib/python2.6/dist-packages/xen/xend/Args.py", line 138, in call_with_form_args
return fn(*params, **keys)
File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 1214, in device_configure
raise VmError("Device %s not connected" % devid)
VmError: Device 768 not connected
This is because devid="768" != dev=768:
def _getDeviceInfo_vbd(self, devid):
for dev_type, dev_info in self.info.all_devices_sxpr():
if dev_type != 'vbd' and dev_type != 'tap' and dev_type != 'tap2':
continue
dev = sxp.child_value(dev_info, 'dev')
dev = dev.split(':')[0]
dev = self.getDeviceController(dev_type).convertToDeviceNumber(dev) if devid == dev:
return dev_info
After applying the attached patch, I can successfully change the media using libvirt:
# virsh change-media ucs31-64-hvm hda --eject --live --config # virsh change-media ucs31-64-hvm hda /var/lib/libvirt/images/UCS_3.1-1-amd64.iso --live --config
Sincerely
Philipp Hahn
Signature · 4 lines
Philipp Hahn Open Source Software Engineer [email protected] Univention GmbH be open. fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/
tools/python/xen/xend/XendDomainInfo.py +10 -10
@@ -1167,7 +1167,7 @@ class XendDomainInfo: @param dev_config: device configuration @type dev_config: SXP object (parsed config) @param devid: device id - @type devid: int + @type devid: str @return: Returns True if successfully updated device @rtype: boolean """
@@ -1193,24 +1193,24 @@ class XendDomainInfo: dev_control = self.getDeviceController(dev_class) if devid is None: - dev = dev_config.get('dev', '') - if not dev: + devid = dev_config.get('dev', '') + if not devid: raise VmError('Block device must have virtual details specified') - if 'ioemu:' in dev: - (_, dev) = dev.split(':', 1) + if 'ioemu:' in devid: + (_, devid) = devid.split(':', 1) try: - (dev, _) = dev.split(':', 1) # Remove ":disk" or ":cdrom" + (devid, _) = devid.split(':', 1) # Remove ":disk" or ":cdrom" except ValueError: pass - devid = dev_control.convertToDeviceNumber(dev) - dev_info = self._getDeviceInfo_vbd(devid) + dev = dev_control.convertToDeviceNumber(devid) + dev_info = self._getDeviceInfo_vbd(dev) if dev_info is None: raise VmError("Device %s not connected" % devid) dev_uuid = sxp.child_value(dev_info, 'uuid') if self.domid is not None: # use DevController.reconfigureDevice to change device config - dev_control.reconfigureDevice(devid, dev_config) + dev_control.reconfigureDevice(dev, dev_config) else: (_, new_b, new_f) = dev_control.getDeviceDetails(dev_config) if (new_f['device-type'] == 'cdrom' and
@@ -1220,7 +1220,7 @@ class XendDomainInfo: pass else: raise VmError('Refusing to reconfigure device %s:%d to %s' % - (dev_class, devid, dev_config)) + (dev_class, dev, dev_config)) # update XendConfig with new device info self.info.device_update(dev_uuid, dev_sxp)
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Quoted 37 lines · Philipp Hahn
Hello,
I noticed a bug in Xen-4.1-3, which is also still present in xen+git.
I know that the Python xend is deprecated, but I'm stuck with xen-4.1 until xen is usable with libvirt, so my patch might still be helpful for others. This is a follow-up to <http://lists.xen.org/archives/html/xen-users/2012-11/msg00069.html>, which still keeps me busy./xen/xend/server/SrvDomain.py declares, that "dev" is a string:
def op_device_configure(self, _, req): return self.call(self.dom.device_configure, [['config', 'sxpr'], ['dev', 'str']], req)but in
xen/xend/XendDomainInfo.py"devid" is expected to be an integer:
defdevice_configure(self, dev_sxp, devid = None):
"""Configure an existing device.
...
@param devid: device id
@type devid: intThis leads to an error when I try to change the media of an CDROM device:
ERROR (SrvBase:88) Requestdevice_configurefailed.
Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/xen/web/SrvBase.py", line 85, in perform
returnop_method(op, req)
File "/usr/lib/python2.6/dist-packages/xen/xend/server/SrvDomain.py", line 216, inop_device_configure
req)
File "/usr/lib/python2.6/dist-packages/xen/xend/server/SrvDomain.py", line 186, in call
returnFormFn(fn, args)(req.args)
File "/usr/lib/python2.6/dist-packages/xen/xend/Args.py", line 166, in__call__
returnself.call_with_form_args(self.fn, fargs, xargs=xargs)
File "/usr/lib/python2.6/dist-packages/xen/xend/Args.py", line 138, incall_with_form_args
returnfn(*params, **keys)
File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 1214, indevice_configure
raiseVmError("Device %s not connected" % devid)
VmError: Device 768 not connected
Quoted 10 lines
This is because devid="768" != dev=768:
def_getDeviceInfo_vbd(self, devid):
fordev_type,dev_infoinself.info.all_devices_sxpr():
ifdev_type!= 'vbd' anddev_type!= 'tap' anddev_type!= 'tap2':
continue
dev =sxp.child_value(dev_info, 'dev')
dev = dev.split(':')[0]
dev = self.getDeviceController(dev_type).convertToDeviceNumber(dev) if devid == dev:
returndev_info
Ewwww, that looks buggy. Could you just do 'return dev' ?
Quoted 73 lines
After applying the attached patch, I can successfully change the media using libvirt:
# virsh change-media ucs31-64-hvm hda --eject --live --config # virsh change-media ucs31-64-hvm hda /var/lib/libvirt/images/UCS_3.1-1-amd64.iso --live --configSincerely
Philipp HahnSignature · 4 lines
Philipp Hahn Open Source Software Engineer [email protected] Univention GmbH be open. fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/tools/python/xen/xend/XendDomainInfo.py +10
-10@@ -1167,7 +1167,7 @@ class XendDomainInfo: @param dev_config: device configuration @type dev_config: SXP object (parsed config) @param devid: device id - @type devid: int + @type devid: str @return: Returns True if successfully updated device @rtype: boolean """@@ -1193,24 +1193,24 @@ class XendDomainInfo: dev_control = self.getDeviceController(dev_class) if devid is None: - dev = dev_config.get('dev', '') - if not dev: + devid = dev_config.get('dev', '') + if not devid: raise VmError('Block device must have virtual details specified') - if 'ioemu:' in dev: - (_, dev) = dev.split(':', 1) + if 'ioemu:' in devid: + (_, devid) = devid.split(':', 1) try: - (dev, _) = dev.split(':', 1) # Remove ":disk" or ":cdrom" + (devid, _) = devid.split(':', 1) # Remove ":disk" or ":cdrom" except ValueError: pass - devid = dev_control.convertToDeviceNumber(dev) - dev_info = self._getDeviceInfo_vbd(devid) + dev = dev_control.convertToDeviceNumber(devid) + dev_info = self._getDeviceInfo_vbd(dev) if dev_info is None: raise VmError("Device %s not connected" % devid) dev_uuid = sxp.child_value(dev_info, 'uuid') if self.domid is not None: # use DevController.reconfigureDevice to change device config - dev_control.reconfigureDevice(devid, dev_config) + dev_control.reconfigureDevice(dev, dev_config) else: (_, new_b, new_f) = dev_control.getDeviceDetails(dev_config) if (new_f['device-type'] == 'cdrom' and@@ -1220,7 +1220,7 @@ class XendDomainInfo: pass else: raise VmError('Refusing to reconfigure device %s:%d to %s' % - (dev_class, devid, dev_config)) + (dev_class, dev, dev_config)) # update XendConfig with new device info self.info.device_update(dev_uuid, dev_sxp)_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Hello,
Am Dienstag 28 Mai 2013, 17:25:52 schrieben Sie:
Quoted 2 lines
Quoted 2 lines
def
_getDeviceInfo_vbd(self, devid):
fordev_type,dev_infoinself.info.all_devices_sxpr()
...
Quoted 3 lines
Quoted 1 line
return
dev_infoEwwww, that looks buggy. Could you just do 'return dev' ?
I don't think that this would be correct, since dev and devid are just the device numbers, but dev_info contains the device details as an Sxpr:
devid='768'
dev='hda:cdrom' ... dev='hda' ... dev=768
dev_type='vbd'
dev_info=['vbd', ('uuid', '920a5c24-28c6-6abb-ad47-9c1144012986'), ('bootable', 1), ('driver', 'paravirtualised'), ('dev', 'hda:cdrom'), ('uname', 'file:/var/lib/libvirt/images/UCS_3.1-1-amd64.iso'), ('mode', 'r'), ('VDI', ''), ('backend', 0)]
So chaning the return type of the function with the name _get*DeviceInfo* look wrong. Or am I missing something?
Sincerely
Philipp
Signature · 4 lines
Philipp Hahn Open Source Software Engineer [email protected] Univention GmbH be open. fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/
Quoted 10 lines · Philipp Hahn
Hello,
Am Dienstag 28 Mai 2013, 17:25:52 schrieben Sie:
Quoted 2 lines
Quoted 2 lines
def
_getDeviceInfo_vbd(self, devid):
fordev_type,dev_infoinself.info.all_devices_sxpr()...
Quoted 3 lines
Quoted 1 line
return
dev_infoEwwww, that looks buggy. Could you just do 'return dev' ?
Quoted 7 lines
I don't think that this would be correct, since dev and devid are just the device numbers, but
dev_infocontains the device details as an Sxpr:
devid='768'
dev='hda:cdrom' ... dev='hda' ... dev=768
dev_type='vbd'
dev_info=['vbd', ('uuid', '920a5c24-28c6-6abb-ad47-9c1144012986'), ('bootable', 1), ('driver', 'paravirtualised'), ('dev', 'hda:cdrom'), ('uname', 'file:/var/lib/libvirt/images/UCS_3.1-1-amd64.iso'), ('mode', 'r'), ('VDI', ''), ('backend', 0)]So chaning the return type of the function with the name _get*DeviceInfo* look wrong. Or am I missing something?
I think you are right. My understanding from your description was incorrect.
Could you repost the patch with your SoB please? I seem to have lost it somewhere :-( (The original email).
Quoted 8 lines
Sincerely
PhilippSignature · 4 lines
Philipp Hahn Open Source Software Engineer [email protected] Univention GmbH be open. fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/