qga: replace qemu_gettimeofday() with g_get_real_time()
GLib g_get_real_time() is an alternative to gettimeofday() which allows to simplify our code. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20220307070401.171986-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
20e4ae117a
commit
287698e50f
@ -136,20 +136,6 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)
|
|||||||
/* succeeded */
|
/* succeeded */
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t qmp_guest_get_time(Error **errp)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
qemu_timeval tq;
|
|
||||||
|
|
||||||
ret = qemu_gettimeofday(&tq);
|
|
||||||
if (ret < 0) {
|
|
||||||
error_setg_errno(errp, errno, "Failed to get time");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return tq.tv_sec * 1000000000LL + tq.tv_usec * 1000;
|
|
||||||
}
|
|
||||||
|
|
||||||
void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
|
void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -1751,25 +1751,6 @@ static int64_t filetime_to_ns(const FILETIME *tf)
|
|||||||
- W32_FT_OFFSET) * 100;
|
- W32_FT_OFFSET) * 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t qmp_guest_get_time(Error **errp)
|
|
||||||
{
|
|
||||||
SYSTEMTIME ts = {0};
|
|
||||||
FILETIME tf;
|
|
||||||
|
|
||||||
GetSystemTime(&ts);
|
|
||||||
if (ts.wYear < 1601 || ts.wYear > 30827) {
|
|
||||||
error_setg(errp, "Failed to get time");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!SystemTimeToFileTime(&ts, &tf)) {
|
|
||||||
error_setg(errp, "Failed to convert system time: %d", (int)GetLastError());
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return filetime_to_ns(&tf);
|
|
||||||
}
|
|
||||||
|
|
||||||
void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
|
void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
|
||||||
{
|
{
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
@ -585,3 +585,8 @@ GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count,
|
|||||||
|
|
||||||
return read_data;
|
return read_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int64_t qmp_guest_get_time(Error **errp)
|
||||||
|
{
|
||||||
|
return g_get_real_time() * 1000;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user