28 lines
1.5 KiB
Diff
28 lines
1.5 KiB
Diff
# HG changeset patch
|
|
# User jfehlig@jfehlig2.provo.novell.com
|
|
# Date 1166568442 25200
|
|
# Node ID 72a013bc923efa47b3262849cd5611a16353abc5
|
|
# Parent 057f7c4dbed1c75a3fbe446d346cee04cff31497
|
|
Remove ':disk' suffix from dev entry in dev_info dictionary in XendConfig.py.
|
|
|
|
The suffix was added regardless of device type so it doesn't appear to add any semantics. Additionally, clients would be forced to strip this suffix from the device name since something like 'hda:disk" is not a device name.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@novell.com>
|
|
|
|
diff -r 057f7c4dbed1 -r 72a013bc923e tools/python/xen/xend/XendConfig.py
|
|
--- a/tools/python/xen/xend/XendConfig.py Tue Dec 19 12:00:11 2006 +0000
|
|
+++ b/tools/python/xen/xend/XendConfig.py Tue Dec 19 15:47:22 2006 -0700
|
|
@@ -970,10 +970,10 @@ class XendConfig(dict):
|
|
elif dev_type in ('vbd', 'tap'):
|
|
if dev_type == 'vbd':
|
|
dev_info['uname'] = cfg_xenapi.get('image', '')
|
|
- dev_info['dev'] = '%s:disk' % cfg_xenapi.get('device')
|
|
+ dev_info['dev'] = cfg_xenapi.get('device')
|
|
elif dev_type == 'tap':
|
|
dev_info['uname'] = 'tap:qcow:%s' % cfg_xenapi.get('image')
|
|
- dev_info['dev'] = '%s:disk' % cfg_xenapi.get('device')
|
|
+ dev_info['dev'] = cfg_xenapi.get('device')
|
|
|
|
dev_info['driver'] = cfg_xenapi.get('driver')
|
|
dev_info['VDI'] = cfg_xenapi.get('VDI', '')
|