35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
# HG changeset patch
|
|
# User kfraser@localhost.localdomain
|
|
# Date 1183729265 -3600
|
|
# Node ID 3196b63a7301b264d45b82ac347b1bef854680b3
|
|
# Parent f20ee5bc9d28cab8a27e2bd073b72033adb7f9a7
|
|
xend: Fix xm block/network-attach command for inactive managed domain
|
|
Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
|
|
|
|
Index: xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
===================================================================
|
|
--- xen-3.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
|
+++ xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
@@ -500,9 +500,18 @@ class XendDomainInfo:
|
|
dev_uuid = self.info.device_add(dev_type, cfg_sxp = dev_config)
|
|
dev_config_dict = self.info['devices'][dev_uuid][1]
|
|
log.debug("XendDomainInfo.device_create: %s" % scrub_password(dev_config_dict))
|
|
- dev_config_dict['devid'] = devid = \
|
|
- self._createDevice(dev_type, dev_config_dict)
|
|
- self._waitForDevice(dev_type, devid)
|
|
+
|
|
+ if self.domid is not None:
|
|
+ try:
|
|
+ dev_config_dict['devid'] = devid = \
|
|
+ self._createDevice(dev_type, dev_config_dict)
|
|
+ self._waitForDevice(dev_type, devid)
|
|
+ except VmError, ex:
|
|
+ raise ex
|
|
+ else:
|
|
+ devid = None
|
|
+
|
|
+ xen.xend.XendDomain.instance().managed_config_save(self)
|
|
return self.getDeviceController(dev_type).sxpr(devid)
|
|
|
|
def device_configure(self, dev_sxp, devid = None):
|