[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/13] migration: use GDateTime for formatting timestamp in snapsh
From: |
Daniel P . Berrangé |
Subject: |
[PULL 11/13] migration: use GDateTime for formatting timestamp in snapshot names |
Date: |
Mon, 14 Jun 2021 15:15:47 +0100 |
The GDateTime APIs provided by GLib avoid portability pitfalls, such
as some platforms where 'struct timeval.tv_sec' field is still 'long'
instead of 'time_t'. When combined with automatic cleanup, GDateTime
often results in simpler code too.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
migration/savevm.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 52e2d72e4b..72848b946c 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2775,8 +2775,7 @@ bool save_snapshot(const char *name, bool overwrite,
const char *vmstate,
QEMUFile *f;
int saved_vm_running;
uint64_t vm_state_size;
- qemu_timeval tv;
- struct tm tm;
+ g_autoptr(GDateTime) now = g_date_time_new_now_local();
AioContext *aio_context;
if (migration_is_blocked(errp)) {
@@ -2836,9 +2835,8 @@ bool save_snapshot(const char *name, bool overwrite,
const char *vmstate,
memset(sn, 0, sizeof(*sn));
/* fill auxiliary fields */
- qemu_gettimeofday(&tv);
- sn->date_sec = tv.tv_sec;
- sn->date_nsec = tv.tv_usec * 1000;
+ sn->date_sec = g_date_time_to_unix(now);
+ sn->date_nsec = g_date_time_get_microsecond(now) * 1000;
sn->vm_clock_nsec = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
if (replay_mode != REPLAY_MODE_NONE) {
sn->icount = replay_get_current_icount();
@@ -2849,9 +2847,8 @@ bool save_snapshot(const char *name, bool overwrite,
const char *vmstate,
if (name) {
pstrcpy(sn->name, sizeof(sn->name), name);
} else {
- /* cast below needed for OpenBSD where tv_sec is still 'long' */
- localtime_r((const time_t *)&tv.tv_sec, &tm);
- strftime(sn->name, sizeof(sn->name), "vm-%Y%m%d%H%M%S", &tm);
+ g_autofree char *autoname = g_date_time_format(now,
"vm-%Y%m%d%H%M%S");
+ pstrcpy(sn->name, sizeof(sn->name), autoname);
}
/* save the VM state */
--
2.31.1
- [PULL 00/13] Misc fixes patches, Daniel P . Berrangé, 2021/06/14
- [PULL 01/13] docs: add table of contents to QAPI references, Daniel P . Berrangé, 2021/06/14
- [PULL 02/13] docs: document how to pass secret data to QEMU, Daniel P . Berrangé, 2021/06/14
- [PULL 03/13] docs: document usage of the authorization framework, Daniel P . Berrangé, 2021/06/14
- [PULL 04/13] docs: recommend SCRAM-SHA-256 SASL mech instead of SHA-1 variant, Daniel P . Berrangé, 2021/06/14
- [PULL 05/13] sasl: remove comment about obsolete kerberos versions, Daniel P . Berrangé, 2021/06/14
- [PULL 06/13] migration: add trace point when vm_stop_force_state fails, Daniel P . Berrangé, 2021/06/14
- [PULL 07/13] softmmu: add trace point when bdrv_flush_all fails, Daniel P . Berrangé, 2021/06/14
- [PULL 08/13] block: preserve errno from fdatasync failures, Daniel P . Berrangé, 2021/06/14
- [PULL 10/13] block: remove duplicate trace.h include, Daniel P . Berrangé, 2021/06/14
- [PULL 11/13] migration: use GDateTime for formatting timestamp in snapshot names,
Daniel P . Berrangé <=
- [PULL 09/13] block: add trace point when fdatasync fails, Daniel P . Berrangé, 2021/06/14
- [PULL 12/13] block: use GDateTime for formatting timestamp when dumping snapshot info, Daniel P . Berrangé, 2021/06/14
- [PULL 13/13] usb/dev-mtp: use GDateTime for formatting timestamp for objects, Daniel P . Berrangé, 2021/06/14
- Re: [PULL 00/13] Misc fixes patches, Peter Maydell, 2021/06/14