1 files changed, 3 insertions, 6 deletions
diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
index 62ecfb86bd..a18cbab2f7 100644
--- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
+++ b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
@@ -11,6 +11,7 @@ from vtpm_utils import *
 import commands
 import os
 import os.path
+import atexit
 
 config = {"vtpm":"instance=1,backend=0"}
 domain = XmTestDomain(extraConfig=config)
@@ -21,32 +22,28 @@ try:
 except DomainError, e:
     if verbose:
         print e.extra
-    vtpm_cleanup(domName)
     FAIL("Unable to create domain (%s)" % domName)
 
+atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName)))
+
 try:
     console.sendInput("input")
 except ConsoleError, e:
     saveLog(console.getHistory())
-    vtpm_cleanup(domName)
     FAIL(str(e))
 
 try:
     run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs")
 except ConsoleError, e:
     saveLog(console.getHistory())
-    vtpm_cleanup(domName)
     FAIL("No result from dumping the PCRs")
 
 if re.search("No such file",run["output"]):
-    vtpm_cleanup(domName)
     FAIL("TPM frontend support not compiled into (domU?) kernel")
 
 domain.closeConsole()
 
 domain.stop()
 
-vtpm_cleanup(domName)
-
 if not re.search("PCR-00:",run["output"]):
     FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")