From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Jiri Pirko <jiri@resnulli.us>,
qemu-block@nongnu.org, Juan Quintela <quintela@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Jason Wang <jasowang@redhat.com>,
qemu-devel@nongnu.org, Laurent Vivier <laurent@vivier.eu>,
virtio-fs@redhat.com, Gerd Hoffmann <kraxel@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Max Reitz <mreitz@redhat.com>, Brad Smith <brad@comstyle.com>
Subject: Re: [PATCH 1/7] migration: use GDateTime for formatting timestamp in snapshot names
Date: Wed, 5 May 2021 15:42:46 +0100 [thread overview]
Message-ID: <YJKu5jfOeu5ubDXZ@work-vm> (raw)
In-Reply-To: <20210505103702.521457-2-berrange@redhat.com>
* Daniel P. Berrangé (berrange@redhat.com) wrote:
> 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.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@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
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2021-05-05 14:44 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 10:36 [PATCH 0/7] replace all use of strftime() with g_date_time_format() Daniel P. Berrangé
2021-05-05 10:36 ` [PATCH 1/7] migration: use GDateTime for formatting timestamp in snapshot names Daniel P. Berrangé
2021-05-05 14:42 ` Dr. David Alan Gilbert [this message]
2021-05-06 3:14 ` Brad Smith
2021-05-05 10:36 ` [PATCH 2/7] block: use GDateTime for formatting timestamp when dumping snapshot info Daniel P. Berrangé
2021-05-07 17:05 ` Max Reitz
2021-05-05 10:36 ` [PATCH 3/7] net/rocker: use GDateTime for formatting timestamp in debug messages Daniel P. Berrangé
2021-06-11 16:28 ` Daniel P. Berrangé
2021-06-14 16:43 ` Juan Quintela
2021-05-05 10:36 ` [PATCH 4/7] usb/dev-mtp: use GDateTime for formatting timestamp for objects Daniel P. Berrangé
2021-05-05 13:08 ` Gerd Hoffmann
2021-05-05 10:37 ` [PATCH 5/7] io: use GDateTime for formatting timestamp for websock headers Daniel P. Berrangé
2021-06-11 16:29 ` Daniel P. Berrangé
2021-06-14 15:41 ` Dr. David Alan Gilbert
2021-05-05 10:37 ` [PATCH 6/7] linux-user: use GDateTime for formatting timestamp for core file Daniel P. Berrangé
2021-05-05 11:18 ` Laurent Vivier
2021-05-15 19:51 ` Laurent Vivier
2021-05-05 10:37 ` [PATCH 7/7] virtiofsd: use GDateTime for formatting timestamp for debug messages Daniel P. Berrangé
2021-05-05 14:51 ` Dr. David Alan Gilbert
2021-05-06 16:00 ` Dr. David Alan Gilbert
2021-05-06 17:45 ` Dr. David Alan Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YJKu5jfOeu5ubDXZ@work-vm \
--to=dgilbert@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=brad@comstyle.com \
--cc=jasowang@redhat.com \
--cc=jiri@resnulli.us \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=laurent@vivier.eu \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtio-fs@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).