Destroy (extrenal) device state if a VM's configuration is destroyed
PATCH 1/1 Destroy (extrenal) device state if a VM's configuration is destroyed
This is a refactored version of a previous patch that destroys external devices' state when a VM configuration file is destroyed. Currently only the vTPM device's state needs to be explicitly destroyed.
I am also surrounding the saving of the managed domain's configuration with a try-catch.
xen-unstable.hg/tools/python/xen/xend/XendConstants.py +6 -0
@@ -89,6 +89,12 @@ DEV_MIGRATE_STEP2 = 2 DEV_MIGRATE_STEP3 = 3 # +# VTPM-related constants +# + +VTPM_DELETE_SCRIPT = '/etc/xen/scripts/vtpm-delete' + +# # Xenstore Constants #
xen-unstable.hg/tools/python/xen/xend/server/tpmif.py +6 -2
@@ -25,7 +25,7 @@ from xen.xend import sxp from xen.xend import XendRoot from xen.xend.XendLogging import log from xen.xend.XendError import XendError -from xen.xend.XendConstants import DEV_MIGRATE_TEST +from xen.xend.XendConstants import DEV_MIGRATE_TEST, VTPM_DELETE_SCRIPT from xen.xend.server.DevController import DevController import os
@@ -33,6 +33,10 @@ import re xroot = XendRoot.instance() +def destroy_vtpmstate(name): + if os.path.exists(VTPM_DELETE_SCRIPT): + os.system(VTPM_DELETE_SCRIPT + " " + name) + class TPMifController(DevController): """TPM interface controller. Handles all TPM devices for a domain. """
@@ -79,7 +83,7 @@ class TPMifController(DevController): if uuid: result['uuid'] = uuid if type: - result['type'] == type + result['type'] = type return result
xen-unstable.hg/tools/python/xen/xend/XendDomain.py +2 -1
@@ -37,6 +37,7 @@ from xen.xend.XendError import XendError from xen.xend.XendLogging import log from xen.xend.XendConstants import XS_VMROOT from xen.xend.XendConstants import DOM_STATE_HALTED, DOM_STATE_RUNNING +from xen.xend.XendDevices import XendDevices from xen.xend.xenstore.xstransact import xstransact from xen.xend.xenstore.xswatch import xswatch
@@ -881,7 +882,7 @@ class XendDomain: self._managed_domain_unregister(dominfo) self._remove_domain(dominfo) - + XendDevices.destroy_device_state(dominfo) except Exception, ex: raise XendError(str(ex)) finally:
xen-unstable.hg/tools/python/xen/xend/XendDevices.py +10 -0
@@ -66,3 +66,13 @@ class XendDevices: make_controller = classmethod(make_controller) + def destroy_device_state(cls, domain): + """Destroy the state of (external) devices. This is necessary + to do when a VM's configuration is destroyed. + + @param domain: domain this controller is handling devices for. + @type domain: XendDomainInfo + """ + tpmif.destroy_vtpmstate(domain.getName()) + + destroy_device_state = classmethod(destroy_device_state)
xen-unstable.hg/tools/python/xen/xend/XendAPI.py +6 -3
@@ -1384,9 +1384,12 @@ class XendAPI: xendom = XendDomain.instance() if xendom.is_valid_vm(vtpm_struct['VM']): dom = xendom.get_vm_by_uuid(vtpm_struct['VM']) - vtpm_ref = dom.create_vtpm(vtpm_struct) - xendom.managed_config_save(dom) - return xen_api_success(vtpm_ref) + try: + vtpm_ref = dom.create_vtpm(vtpm_struct) + xendom.managed_config_save(dom) + return xen_api_success(vtpm_ref) + except XendError: + return xen_api_error(XEND_ERROR_TODO) else: return xen_api_error(XEND_ERROR_DOMAIN_INVALID)
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Ewan Mellor
AppliedQuoted 7 lines · Stefan Berger
This is a refactored version of a previous patch that destroys external devices' state when a VM configuration file is destroyed. Currently only the vTPM device's state needs to be explicitly destroyed.
I am also surrounding the saving of the managed domain's configuration with a try-catch.Signed-off-by Stefan Berger <[email protected]>
Applied, thanks.
Ewan.