Index: xen/xen-unstable.hg/tools/xm-test/configure.ac
===================================================================
--- xen.orig/xen-unstable.hg/tools/xm-test/configure.ac
+++ xen/xen-unstable.hg/tools/xm-test/configure.ac
@@ -93,6 +93,7 @@ AC_CONFIG_FILES([
     tests/unpause/Makefile
     tests/vcpu-pin/Makefile
     tests/vcpu-disable/Makefile
+    tests/vtpm/Makefile
     tests/enforce_dom0_cpus/Makefile
     lib/XmTestReport/xmtest.py
     lib/XmTestLib/config.py
Index: xen/xen-unstable.hg/tools/xm-test/tests/Makefile.am
===================================================================
--- xen.orig/xen-unstable.hg/tools/xm-test/tests/Makefile.am
+++ xen/xen-unstable.hg/tools/xm-test/tests/Makefile.am
@@ -23,6 +23,7 @@ SUBDIRS = 	               	\
 		unpause         \
 		vcpu-disable    \
 		vcpu-pin	\
+		vtpm            \
 		enforce_dom0_cpus	\
 		save restore migrate
 
Index: xen/xen-unstable.hg/tools/xm-test/tests/vtpm/Makefile.am
===================================================================
--- /dev/null
+++ xen/xen-unstable.hg/tools/xm-test/tests/vtpm/Makefile.am
@@ -0,0 +1,22 @@
+
+SUBDIRS =
+
+TESTS = 01_vtpm-list_pos.test \
+        02_vtpm-cat_pcrs.test
+
+XFAIL_TESTS =
+
+EXTRA_DIST = $(TESTS) $(XFAIL_TESTS)
+
+TESTS_ENVIRONMENT=@TENV@
+
+%.test: %.py
+	cp $< $@
+	chmod +x $@
+
+clean-local: am_config_clean-local
+
+am_config_clean-local:
+	rm -f *test
+	rm -f *log
+	rm -f *~
Index: xen/xen-unstable.hg/tools/xm-test/lib/XmTestLib/XenDomain.py
===================================================================
--- xen.orig/xen-unstable.hg/tools/xm-test/lib/XmTestLib/XenDomain.py
+++ xen/xen-unstable.hg/tools/xm-test/lib/XmTestLib/XenDomain.py
@@ -99,6 +99,7 @@ class XenConfig:
         # These options need to be lists
         self.defaultOpts["disk"] = []
         self.defaultOpts["vif"]  = []
+        self.defaultOpts["vtpm"] = []
 
         self.opts = self.defaultOpts
 
Index: xen/xen-unstable.hg/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py
===================================================================
--- /dev/null
+++ xen/xen-unstable.hg/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+
+# Copyright (C) International Business Machines Corp., 2006
+# Author: Stefan Berger <stefanb@xxxxxxxxxx)
+
+# Positive Test: create domain with virtual TPM attached at build time,
+#                verify list
+
+
+from XmTestLib import *
+
+def vtpm_cleanup(domName):
+	# Since this is only a temporary domain I clean up the domain from the
+	# virtual TPM directory
+	traceCommand("/etc/xen/scripts/vtpm-delete %s" % domName)
+
+if ENABLE_HVM_SUPPORT:
+    SKIP("vtpm-list not supported for HVM domains")
+
+config = {"vtpm":"instance=1,backend=0"}
+domain = XmTestDomain(extraConfig=config)
+
+try:
+    domain.start()
+except DomainError, e:
+    if verbose:
+        print e.extra
+    vtpm_cleanup(domain.getName())
+    FAIL("Unable to create domain")
+
+domName = domain.getName()
+
+status, output = traceCommand("xm vtpm-list %s" % domain.getId())
+eyecatcher = "/local/domain/0/backend/vtpm"
+where = output.find(eyecatcher)
+if status != 0:
+    vtpm_cleanup(domName)
+    FAIL("xm vtpm-list returned bad status, expected 0, status is %i" % status)
+elif where < 0:
+    vtpm_cleanup(domName)
+    FAIL("Fail to list virtual TPM device")
+
+domain.stop()
+
+vtpm_cleanup(domName)
Index: xen/xen-unstable.hg/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
===================================================================
--- /dev/null
+++ xen/xen-unstable.hg/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
@@ -0,0 +1,81 @@
+#!/usr/bin/python
+
+# Copyright (C) International Business Machines Corp., 2006
+# Author: Stefan Berger <stefanb@xxxxxxxxxx)
+
+# Positive Test: create domain with virtual TPM attached at build time,
+#                check list of pcrs
+
+from XmTestLib import *
+
+def vtpm_cleanup(domName):
+	# Since this is only a temporary domain I clean up the domain from the
+	# virtual TPM directory
+	traceCommand("/etc/xen/scripts/vtpm-delete %s" % domName)
+
+if ENABLE_HVM_SUPPORT:
+    SKIP("vtpm-list not supported for HVM domains")
+
+status, output = traceCommand("ls /dev/tpm0")
+if re.search("No such file or directory",output):
+    SKIP("This machine has no hardware TPM; cannot run this test")
+
+status, output = traceCommand("ps aux | grep vtpm_manager | grep -v grep")
+if output == "":
+    FAIL("virtual TPM manager must be started to run this test")
+
+# vtpm manager has been detected
+config = {"vtpm":"instance=1,backend=0"}
+domain = XmTestDomain(extraConfig=config)
+
+try:
+    domain.start()
+except DomainError, e:
+    if verbose:
+        print e.extra
+    vtpm_cleanup(domain.getName())
+    FAIL("Unable to create domain")
+
+domName = domain.getName()
+
+try:
+    console = XmConsole(domain.getName())
+except ConsoleError, e:
+    vtpm_cleanup(domName)
+    FAIL(str(e))
+
+try:
+    console.sendInput("input")
+    run = console.runCmd("ls /sys")
+except ConsoleError, e:
+    saveLog(console.getHistory())
+    vtpm_cleanup(domName)
+    FAIL(str(e))
+
+if re.search("No such file",run["output"]):
+    try:
+        run = console.runCmd("mkdir /sys")
+        run = console.runCmd("mount -t sysfs /sys /sys")
+    except ConsoleError, e:
+        saveLog(console.getHistory())
+        vtpm_cleanup(domName)
+        FAIL(str(e))
+
+try:
+    run = console.runCmd("cat /sys/devices/platform/tpm_vtpm/pcrs")
+except ConsoleError, e:
+    saveLog(console.getHistory())
+    vtpm_cleanup(domName)
+    FAIL(str(e))
+
+if re.search("No such file",run["output"]):
+    FAIL("TPM frontend support not compiled into (domU?) kernel")
+
+console.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")
Index: xen/xen-unstable.hg/tools/examples/Makefile
===================================================================
--- xen.orig/xen-unstable.hg/tools/examples/Makefile
+++ xen/xen-unstable.hg/tools/examples/Makefile
@@ -26,7 +26,7 @@ XEN_SCRIPTS += network-route vif-route
 XEN_SCRIPTS += network-nat vif-nat
 XEN_SCRIPTS += block
 XEN_SCRIPTS += block-enbd block-nbd
-XEN_SCRIPTS += vtpm
+XEN_SCRIPTS += vtpm vtpm-delete
 XEN_SCRIPT_DATA = xen-script-common.sh
 XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh
 XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh
Index: xen/xen-unstable.hg/tools/examples/vtpm-common.sh
===================================================================
--- xen.orig/xen-unstable.hg/tools/examples/vtpm-common.sh
+++ xen/xen-unstable.hg/tools/examples/vtpm-common.sh
@@ -58,6 +58,9 @@ if [ -z "$VTPM_IMPL_DEFINED" ]; then
 	function vtpm_resume() {
 		true
 	}
+	function vtpm_delete() {
+		true
+	}
 fi
 
 #Find the instance number for the vtpm given the name of the domain
@@ -66,7 +69,7 @@ fi
 # Return value
 #  Returns '0' if instance number could not be found, otherwise
 #  it returns the instance number in the variable 'instance'
-function find_instance () {
+function vtpmdb_find_instance () {
 	local vmname=$1
 	local ret=0
 	instance=`cat $VTPMDB |                    \
@@ -82,16 +85,15 @@ function find_instance () {
 	if [ "$instance" != "" ]; then
 		ret=1
 	fi
-	return $ret
+	res=$ret
 }
 
 
 # Check whether a particular instance number is still available
-# returns '1' if it is available
-function is_free_instancenum () {
+# returns res='1' if it is available
+function vtpmdb_is_free_instancenum () {
 	local instance=$1
 	local avail=1
-
 	#Allowed instance number range: 1-255
 	if [ $instance -eq 0 -o $instance -gt 255 ]; then
 		avail=0
@@ -110,13 +112,13 @@ function is_free_instancenum () {
 			fi
 		done
 	fi
-	return $avail
+	res=$avail
 }
 
 
 # Get an available instance number given the database
 # Returns an unused instance number
-function get_free_instancenum () {
+function vtpmdb_get_free_instancenum () {
 	local ctr
 	local instances
 	local don
@@ -150,7 +152,7 @@ function get_free_instancenum () {
 
 
 # Add a domain name and instance number to the DB file
-function add_instance () {
+function vtpmdb_add_instance () {
 	local vmname=$1
 	local inst=$2
 
@@ -159,8 +161,8 @@ function add_instance () {
 		echo "#1st column: domain name" >> $VTPMDB
 		echo "#2nd column: TPM instance number" >> $VTPMDB
 	fi
-	validate_entry $vmname $inst
-	if [ $? -eq 0 ]; then
+	vtpmdb_validate_entry $vmname $inst
+	if [ $res -eq 0 ]; then
 		echo "$vmname $inst" >> $VTPMDB
 	fi
 }
@@ -168,11 +170,10 @@ function add_instance () {
 
 #Validate whether an entry is the same as passed to this
 #function
-function validate_entry () {
+function vtpmdb_validate_entry () {
 	local rc=0
 	local vmname=$1
 	local inst=$2
-	local res
 
 	res=`cat $VTPMDB |             \
 	     gawk -vvmname=$vmname     \
@@ -197,13 +198,15 @@ function validate_entry () {
 	elif [ "$res" == "2" ]; then
 		let rc=2
 	fi
-	return $rc
+	res=$rc
 }
 
 
 #Remove an entry from the vTPM database given its domain name
-function remove_entry () {
+#and instance number
+function vtpmdb_remove_entry () {
 	local vmname=$1
+	local instance=$2
 	local VTPMDB_TMP="$VTPMDB".tmp
 	`cat $VTPMDB |             \
 	 gawk -vvmname=$vmname     \
@@ -214,6 +217,7 @@ function remove_entry () {
 	 '} > $VTPMDB_TMP`
 	if [ -e $VTPMDB_TMP ]; then
 		mv -f $VTPMDB_TMP $VTPMDB
+		vtpm_delete $instance
 	else
 		log err "Error creating temporary file '$VTPMDB_TMP'."
 	fi
@@ -222,7 +226,7 @@ function remove_entry () {
 
 # Find the reason for the creation of this device:
 # Set global REASON variable to 'resume' or 'create'
-function get_create_reason () {
+function vtpm_get_create_reason () {
 	local resume=$(xenstore-read $XENBUS_PATH/resume)
 	if [ "$resume" == "True" ]; then
 		REASON="resume"
@@ -237,26 +241,22 @@ function get_create_reason () {
 function vtpm_create_instance () {
 	local domname=$(xenstore_read "$XENBUS_PATH"/domain)
 	local res
-	set +e
-	get_create_reason
+	vtpm_get_create_reason
 
 	claim_lock vtpmdb
-
-	find_instance $domname
-	res=$?
+	vtpmdb_find_instance $domname
 	if [ $res -eq 0 ]; then
 		#Try to give the preferred instance to the domain
 		instance=$(xenstore_read "$XENBUS_PATH"/pref_instance)
 		if [ "$instance" != "" ]; then
-			is_free_instancenum $instance
-			res=$?
+			vtpmdb_is_free_instancenum $instance
 			if [ $res -eq 0 ]; then
-				get_free_instancenum
+				vtpmdb_get_free_instancenum
 			fi
 		else
-			get_free_instancenum
+			vtpmdb_get_free_instancenum
 		fi
-		add_instance $domname $instance
+		vtpmdb_add_instance $domname $instance
 		if [ "$REASON" == "create" ]; then
 			vtpm_create $instance
 		elif [ "$REASON" == "resume" ]; then
@@ -279,25 +279,35 @@ function vtpm_create_instance () {
 		true
 	fi
 	xenstore_write $XENBUS_PATH/instance $instance
-	set -e
 }
 
 
 #Remove an instance
 function vtpm_remove_instance () {
 	local domname=$(xenstore_read "$XENBUS_PATH"/domain)
-	set +e
-	find_instance $domname
-	res=$?
+	vtpmdb_find_instance $domname
 	if [ $res -eq 0 ]; then
-		#Something is really wrong with the DB
+		#Something is really wrong with the VTPMDB
 		log err "vTPM DB file $VTPMDB has no entry for '$domname'"
 	else
 		if [ "$REASON" == "suspend" ]; then
 			vtpm_suspend $instance
 		fi
 	fi
-	set -e
 }
 
 
+#Remove a entry in the directory given the domain's name
+#1st parameter: The name of the domain
+function vtpm_delete_instance () {
+	local rc
+
+	claim_lock vtpmdb
+
+	vtpmdb_find_instance $1
+	if [ $res -ne 0 ]; then
+		vtpmdb_remove_entry $1 $instance
+	fi
+
+	release_lock vtpmdb
+}
Index: xen/xen-unstable.hg/tools/examples/vtpm-delete
===================================================================
--- /dev/null
+++ xen/xen-unstable.hg/tools/examples/vtpm-delete
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# This scripts must be called the following way:
+# vtpm-delete <domain name>
+
+if [ $1 != "remove" ]; then
+	exec sh -c "bash $0 remove $*"
+fi
+
+
+XENBUS_PATH=" "
+
+dir=$(dirname "$0")
+. "$dir/vtpm-common.sh"
+
+shift
+
+vtpm_delete_instance $1