SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qtest: Fix tv_usec != long

Browse Source 
Sparc Debian 5.0.8 does not define __suseconds_t as long,
but FMT_timeval expects %ld.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Richard Henderson 2012-04-19 07:09:33 -05:00 committed by Anthony Liguori
parent e3c56761b4
commit 7f3bf92fad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qtest.c
View File

@ -153,7 +153,7 @@ static void qtest_send_prefix(CharDriverState *chr)
qtest_get_time(&tv); qtest_get_time(&tv);
fprintf(qtest_log_fp, "[S +" FMT_timeval "] ", fprintf(qtest_log_fp, "[S +" FMT_timeval "] ",
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long) tv.tv_usec);
} }
static void GCC_FMT_ATTR(2, 3) qtest_send(CharDriverState *chr, static void GCC_FMT_ATTR(2, 3) qtest_send(CharDriverState *chr,
@ -201,7 +201,7 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
qtest_get_time(&tv); qtest_get_time(&tv);
fprintf(qtest_log_fp, "[R +" FMT_timeval "]", fprintf(qtest_log_fp, "[R +" FMT_timeval "]",
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long) tv.tv_usec);
for (i = 0; words[i]; i++) { for (i = 0; words[i]; i++) {
fprintf(qtest_log_fp, " %s", words[i]); fprintf(qtest_log_fp, " %s", words[i]);
} }
@ -399,7 +399,7 @@ static void qtest_event(void *opaque, int event)
qtest_opened = true; qtest_opened = true;
if (qtest_log_fp) { if (qtest_log_fp) {
fprintf(qtest_log_fp, "[I " FMT_timeval "] OPENED\n", fprintf(qtest_log_fp, "[I " FMT_timeval "] OPENED\n",
start_time.tv_sec, start_time.tv_usec); start_time.tv_sec, (long) start_time.tv_usec);
} }
break; break;
case CHR_EVENT_CLOSED: case CHR_EVENT_CLOSED:
@ -408,7 +408,7 @@ static void qtest_event(void *opaque, int event)
qemu_timeval tv; qemu_timeval tv;
qtest_get_time(&tv); qtest_get_time(&tv);
fprintf(qtest_log_fp, "[I +" FMT_timeval "] CLOSED\n", fprintf(qtest_log_fp, "[I +" FMT_timeval "] CLOSED\n",
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long) tv.tv_usec);
} }
break; break;
default: default: