OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qtest: use qemu_gettimeofday()

Browse Source 
On linux, qemu_timeval will always be two long ints.  On windows, we use our
own struct definition.  This should fix win64.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2012-03-30 14:04:04 -05:00
parent a3b6181e42
commit 6e92466a7c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qtest.c
View File

@ -31,7 +31,7 @@ static FILE *qtest_log_fp;
static CharDriverState *qtest_chr;
static GString *inbuf;
static int irq_levels[MAX_IRQ];
static struct timeval start_time;
static qemu_timeval start_time;
static bool qtest_opened;
#define FMT_timeval "%ld.%06ld"
@ -132,9 +132,9 @@ static int hex2nib(char ch)
}
}
static void qtest_get_time(struct timeval *tv)
static void qtest_get_time(qemu_timeval *tv)
{
gettimeofday(tv, NULL);
qemu_gettimeofday(tv);
tv->tv_sec -= start_time.tv_sec;
tv->tv_usec -= start_time.tv_usec;
if (tv->tv_usec < 0) {
@ -145,7 +145,7 @@ static void qtest_get_time(struct timeval *tv)
static void qtest_send_prefix(CharDriverState *chr)
{
struct timeval tv;
qemu_timeval tv;
if (!qtest_log_fp || !qtest_opened) {
return;
@ -195,7 +195,7 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
command = words[0];
if (qtest_log_fp) {
struct timeval tv;
qemu_timeval tv;
int i;
qtest_get_time(&tv);
@ -394,7 +394,7 @@ static void qtest_event(void *opaque, int event)
for (i = 0; i < ARRAY_SIZE(irq_levels); i++) {
irq_levels[i] = 0;
}
gettimeofday(&start_time, NULL);
qemu_gettimeofday(&start_time);
qtest_opened = true;
if (qtest_log_fp) {
fprintf(qtest_log_fp, "[I " FMT_timeval "] OPENED\n",
@ -404,7 +404,7 @@ static void qtest_event(void *opaque, int event)
case CHR_EVENT_CLOSED:
qtest_opened = false;
if (qtest_log_fp) {
struct timeval tv;
qemu_timeval tv;
qtest_get_time(&tv);
fprintf(qtest_log_fp, "[I +" FMT_timeval "] CLOSED\n",
tv.tv_sec, tv.tv_usec);