[prev in list] [next in list] [prev in thread] [next in thread]
List: xen-cvs
Subject: [Xen-changelog] [xen-unstable] Merge with ia64 tree
From: Xen patchbot-unstable <patchbot-unstable () lists ! xensource ! com>
Date: 2007-12-21 0:50:10
Message-ID: 200712210050.lBL0oB8P029413 () xenbits ! xensource ! com
[Download RAW message or body]
# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1198171739 0
# Node ID 72bb96eb71a04ad4854c195e5484e02c17845219
# Parent 7b7b123625d03fe51cda7ffc634306ba2b0db5b3
# Parent c433ebd2a9bb5b520309440201e03bbf29880008
Merge with ia64 tree
---
tools/ioemu/hw/tpm_tis.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff -r 7b7b123625d0 -r 72bb96eb71a0 tools/ioemu/hw/tpm_tis.c
--- a/tools/ioemu/hw/tpm_tis.c Thu Dec 20 09:40:33 2007 -0700
+++ b/tools/ioemu/hw/tpm_tis.c Thu Dec 20 17:28:59 2007 +0000
@@ -270,11 +270,11 @@ static int create_local_socket(tpmState
}
#ifdef DEBUG_TPM
if (success)
- fprintf(logfile,"Successfully connected using local socket "
- LOCAL_SOCKET_PATH ".\n");
+ fprintf(logfile," Successfully connected using local socket"
+ "%s.\n",addr.sun_path);
else
- fprintf(logfile,"Could not connect to local socket "
- LOCAL_SOCKET_PATH ".\n");
+ fprintf(logfile," Could not connect to local socket "
+ "%s.\n",addr.sun_path);
#endif
} else {
success = 0;
@@ -905,9 +905,10 @@ void tpm_tis_init(SetIRQFunc *set_irq, v
register_savevm("tpm-tis", 0, 1, tpm_save, tpm_load, s);
+ open_vtpm_channel(s);
for (c = 0; !IS_COMM_WITH_VTPM(s) && (c < 5); c++) {
+ sleep(1);
open_vtpm_channel(s);
- sleep(1);
}
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic