openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: use GDateTime for formatting timestamp when dumping snapshot info 

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: Max Reitz <mreitz@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-04-30 12:59:06 +01:00
parent 85cd1cc668
commit 39683553f9
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/qapi.c
View File

@ -663,10 +663,8 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,
void bdrv_snapshot_dump(QEMUSnapshotInfo *sn) void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
{ {
char date_buf[128], clock_buf[128]; char clock_buf[128];
char icount_buf[128] = {0}; char icount_buf[128] = {0};
struct tm tm;
time_t ti;
int64_t secs; int64_t secs;
char *sizing = NULL; char *sizing = NULL;
@ -674,10 +672,9 @@ void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
qemu_printf("%-10s%-17s%8s%20s%13s%11s", qemu_printf("%-10s%-17s%8s%20s%13s%11s",
"ID", "TAG", "VM SIZE", "DATE", "VM CLOCK", "ICOUNT"); "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK", "ICOUNT");
} else { } else {
ti = sn->date_sec; g_autoptr(GDateTime) date = g_date_time_new_from_unix_local(sn->date_sec);
localtime_r(&ti, &tm); g_autofree char *date_buf = g_date_time_format(date, "%Y-%m-%d %H:%M:%S");
strftime(date_buf, sizeof(date_buf),
"%Y-%m-%d %H:%M:%S", &tm);
secs = sn->vm_clock_nsec / 1000000000; secs = sn->vm_clock_nsec / 1000000000;
snprintf(clock_buf, sizeof(clock_buf), snprintf(clock_buf, sizeof(clock_buf),
"%02d:%02d:%02d.%03d", "%02d:%02d:%02d.%03d",