haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

savevm: Remove MinGW specific code which is no longer needed

Browse source 
QEMU provides a portable function qemu_gettimeofday instead of
gettimeofday and also an implementation of localtime_r for MinGW.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Weil 2013-01-07 22:20:27 +01:00 committed by Stefan Hajnoczi
parent 1d57db193f
commit 68b891ec39
1 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
savevm.c
View file

@ -23,15 +23,6 @@
*/ */
#include "config-host.h" #include "config-host.h"
#ifndef _WIN32
#include <arpa/inet.h>
#endif
#ifdef _WIN32
#include <windows.h>
#endif
#include "qemu-common.h" #include "qemu-common.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/qdev.h" #include "hw/qdev.h"
@ -2093,13 +2084,8 @@ void do_savevm(Monitor *mon, const QDict *qdict)
QEMUFile *f; QEMUFile *f;
int saved_vm_running; int saved_vm_running;
uint64_t vm_state_size; uint64_t vm_state_size;
#ifdef _WIN32 qemu_timeval tv;
struct _timeb tb;
struct tm *ptm;
#else
struct timeval tv;
struct tm tm; struct tm tm;
#endif
const char *name = qdict_get_try_str(qdict, "name"); const char *name = qdict_get_try_str(qdict, "name");
/* Verify if there is a device that doesn't support snapshots and is writable */ /* Verify if there is a device that doesn't support snapshots and is writable */
@ -2129,15 +2115,9 @@ void do_savevm(Monitor *mon, const QDict *qdict)
memset(sn, 0, sizeof(*sn)); memset(sn, 0, sizeof(*sn));
/* fill auxiliary fields */ /* fill auxiliary fields */
#ifdef _WIN32 qemu_gettimeofday(&tv);
_ftime(&tb);
sn->date_sec = tb.time;
sn->date_nsec = tb.millitm * 1000000;
#else
gettimeofday(&tv, NULL);
sn->date_sec = tv.tv_sec; sn->date_sec = tv.tv_sec;
sn->date_nsec = tv.tv_usec * 1000; sn->date_nsec = tv.tv_usec * 1000;
#endif
sn->vm_clock_nsec = qemu_get_clock_ns(vm_clock); sn->vm_clock_nsec = qemu_get_clock_ns(vm_clock);
if (name) { if (name) {
@ -2149,15 +2129,9 @@ void do_savevm(Monitor *mon, const QDict *qdict)
pstrcpy(sn->name, sizeof(sn->name), name); pstrcpy(sn->name, sizeof(sn->name), name);
} }
} else { } else {
#ifdef _WIN32
time_t t = tb.time;
ptm = localtime(&t);
strftime(sn->name, sizeof(sn->name), "vm-%Y%m%d%H%M%S", ptm);
#else
/* cast below needed for OpenBSD where tv_sec is still 'long' */ /* cast below needed for OpenBSD where tv_sec is still 'long' */
localtime_r((const time_t *)&tv.tv_sec, &tm); localtime_r((const time_t *)&tv.tv_sec, &tm);
strftime(sn->name, sizeof(sn->name), "vm-%Y%m%d%H%M%S", &tm); strftime(sn->name, sizeof(sn->name), "vm-%Y%m%d%H%M%S", &tm);
#endif
} }
/* Delete old snapshots of the same name */ /* Delete old snapshots of the same name */