diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2007-12-20 17:28:59 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2007-12-20 17:28:59 +0000 |
| commit | 8ca45cf2d1221edc960e93b004083ae317269d0a (patch) | |
| tree | 832999d13e99c09977d5f73d9c1363926a5e6977 | |
| parent | b2e6c832d9b7d6130a36256f40984b6d510f731c (diff) | |
| parent | 3a50e363b45c23002fd1efc279938924dbcb9a4f (diff) | |
| download | xen-8ca45cf2d1221edc960e93b004083ae317269d0a.tar.gz xen-8ca45cf2d1221edc960e93b004083ae317269d0a.tar.bz2 xen-8ca45cf2d1221edc960e93b004083ae317269d0a.zip | |
Merge with ia64 tree
| -rw-r--r-- | tools/ioemu/hw/tpm_tis.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/ioemu/hw/tpm_tis.c b/tools/ioemu/hw/tpm_tis.c index 3c67921822..a4742e6a4a 100644 --- a/tools/ioemu/hw/tpm_tis.c +++ b/tools/ioemu/hw/tpm_tis.c @@ -270,11 +270,11 @@ static int create_local_socket(tpmState *s, uint32_t vtpm_instance) } #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, void *opaque, int irq) 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++) { - open_vtpm_channel(s); sleep(1); + open_vtpm_channel(s); } } |