From: Michael Roth <michael.roth@amd.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Markus Armbruster" <armbru@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 02/12] qga: Use common time encoding for guest-get-devices 'driver-date'
Date: Tue, 27 Oct 2020 00:53:07 -0500 [thread overview]
Message-ID: <20201027055317.351868-3-michael.roth@amd.com> (raw)
In-Reply-To: <20201027055317.351868-1-michael.roth@amd.com>
From: Markus Armbruster <armbru@redhat.com>
guest-get-devices returns 'driver-date' as string in the format
YYYY-MM-DD. Goes back to recent commit 2e4211cee4 "qga: add command
guest-get-devices for reporting VirtIO devices".
We should avoid use of multiple encodings for the same kind of data.
Especially string encodings. Change it to return nanoseconds since
the epoch, like guest-get-time does.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael Roth <michael.roth@amd.com>
---
qga/commands-win32.c | 19 +++++++++++--------
qga/qapi-schema.json | 4 ++--
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 879b02b6c3..b01616a992 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -1641,6 +1641,12 @@ out:
return head;
}
+static int64_t filetime_to_ns(const FILETIME *tf)
+{
+ return ((((int64_t)tf->dwHighDateTime << 32) | tf->dwLowDateTime)
+ - W32_FT_OFFSET) * 100;
+}
+
int64_t qmp_guest_get_time(Error **errp)
{
SYSTEMTIME ts = {0};
@@ -1657,8 +1663,7 @@ int64_t qmp_guest_get_time(Error **errp)
return -1;
}
- return ((((int64_t)tf.dwHighDateTime << 32) | tf.dwLowDateTime)
- - W32_FT_OFFSET) * 100;
+ return filetime_to_ns(&tf);
}
void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
@@ -2363,7 +2368,6 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp)
slog("enumerating devices");
for (i = 0; SetupDiEnumDeviceInfo(dev_info, i, &dev_info_data); i++) {
bool skip = true;
- SYSTEMTIME utc_date;
g_autofree LPWSTR name = NULL;
g_autofree LPFILETIME date = NULL;
g_autofree LPWSTR version = NULL;
@@ -2434,13 +2438,12 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp)
slog("failed to get driver date");
continue;
}
- FileTimeToSystemTime(date, &utc_date);
- device->driver_date = g_strdup_printf("%04d-%02d-%02d",
- utc_date.wYear, utc_date.wMonth, utc_date.wDay);
+ device->driver_date = filetime_to_ns(date);
device->has_driver_date = true;
- slog("driver: %s\ndriver version: %s,%s\n", device->driver_name,
- device->driver_date, device->driver_version);
+ slog("driver: %s\ndriver version: %" PRId64 ",%s\n",
+ device->driver_name, device->driver_date,
+ device->driver_version);
item = g_new0(GuestDeviceInfoList, 1);
item->value = g_steal_pointer(&device);
if (!cur_item) {
diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index f2c81cda2b..c7bfb8bf6a 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -1282,7 +1282,7 @@
# @GuestDeviceInfo:
#
# @driver-name: name of the associated driver
-# @driver-date: driver release date in format YYYY-MM-DD
+# @driver-date: driver release date, in nanoseconds since the epoch
# @driver-version: driver version
# @id: device ID
#
@@ -1291,7 +1291,7 @@
{ 'struct': 'GuestDeviceInfo',
'data': {
'driver-name': 'str',
- '*driver-date': 'str',
+ '*driver-date': 'int',
'*driver-version': 'str',
'*id': 'GuestDeviceId'
} }
--
2.25.1
next prev parent reply other threads:[~2020-10-27 7:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-27 5:53 [PULL 00/12] qemu-ga patch queue for soft-freeze Michael Roth
2020-10-27 5:53 ` [PULL 01/12] qga: Rename guest-get-devices return member 'address' to 'id' Michael Roth
2020-10-27 5:53 ` Michael Roth [this message]
2020-10-27 5:53 ` [PULL 03/12] qga-win: Fix guest-get-devices error API violations Michael Roth
2020-10-27 5:53 ` [PULL 04/12] qga: Flatten simple union GuestDeviceId Michael Roth
2020-10-27 5:53 ` [PULL 05/12] qga: add command guest-get-disks Michael Roth
2020-10-27 5:53 ` [PULL 06/12] qga: add implementation of guest-get-disks for Linux Michael Roth
2020-10-27 5:53 ` [PULL 07/12] qga: add implementation of guest-get-disks for Windows Michael Roth
2020-10-27 5:53 ` [PULL 08/12] glib-compat: add g_unix_get_passwd_entry_qemu() Michael Roth
2020-10-27 5:53 ` [PULL 09/12] qga: add ssh-{add,remove}-authorized-keys Michael Roth
2020-11-02 15:49 ` Markus Armbruster
2020-11-03 2:11 ` Michael Roth
2020-11-03 6:25 ` Markus Armbruster
2020-10-27 5:53 ` [PULL 10/12] qga: add *reset argument to ssh-add-authorized-keys Michael Roth
2020-10-27 5:53 ` [PULL 11/12] meson: minor simplification Michael Roth
2020-10-27 5:53 ` [PULL 12/12] qga: add ssh-get-authorized-keys Michael Roth
2020-10-27 8:03 ` [PULL 00/12] qemu-ga patch queue for soft-freeze no-reply
2020-10-28 20:39 ` Peter Maydell
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=20201027055317.351868-3-michael.roth@amd.com \
--to=michael.roth@amd.com \
--cc=armbru@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.