debuggers.hg
changeset 16692:72bb96eb71a0
Merge with ia64 tree
author | Keir Fraser <keir.fraser@citrix.com> |
---|---|
date | Thu Dec 20 17:28:59 2007 +0000 (2007-12-20) |
parents | 7b7b123625d0 c433ebd2a9bb |
children | ed79613b4881 |
files |
line diff
1.1 --- a/tools/ioemu/hw/tpm_tis.c Thu Dec 20 09:40:33 2007 -0700 1.2 +++ b/tools/ioemu/hw/tpm_tis.c Thu Dec 20 17:28:59 2007 +0000 1.3 @@ -270,11 +270,11 @@ static int create_local_socket(tpmState 1.4 } 1.5 #ifdef DEBUG_TPM 1.6 if (success) 1.7 - fprintf(logfile,"Successfully connected using local socket " 1.8 - LOCAL_SOCKET_PATH ".\n"); 1.9 + fprintf(logfile," Successfully connected using local socket" 1.10 + "%s.\n",addr.sun_path); 1.11 else 1.12 - fprintf(logfile,"Could not connect to local socket " 1.13 - LOCAL_SOCKET_PATH ".\n"); 1.14 + fprintf(logfile," Could not connect to local socket " 1.15 + "%s.\n",addr.sun_path); 1.16 #endif 1.17 } else { 1.18 success = 0; 1.19 @@ -905,9 +905,10 @@ void tpm_tis_init(SetIRQFunc *set_irq, v 1.20 1.21 register_savevm("tpm-tis", 0, 1, tpm_save, tpm_load, s); 1.22 1.23 + open_vtpm_channel(s); 1.24 for (c = 0; !IS_COMM_WITH_VTPM(s) && (c < 5); c++) { 1.25 + sleep(1); 1.26 open_vtpm_channel(s); 1.27 - sleep(1); 1.28 } 1.29 } 1.30