From 3f2a6087de291dc96a2c4975139da27649cf32ff Mon Sep 17 00:00:00 2001 From: Lei Li Date: Fri, 15 Mar 2013 17:29:04 +0800 Subject: [PATCH 1/5] qga: add windows implementation for guest-get-time Signed-off-by: Lei Li Reviewed-by: Eric Blake Reviewed-by: Michael Roth Signed-off-by: Michael Roth --- qga/commands-win32.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index b19be9db48..d98e3eeff0 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -22,6 +22,12 @@ #define SHTDN_REASON_FLAG_PLANNED 0x80000000 #endif +/* multiple of 100 nanoseconds elapsed between windows baseline + * (1/1/1601) and Unix Epoch (1/1/1970), accounting for leap years */ +#define W32_FT_OFFSET (10000000ULL * 60 * 60 * 24 * \ + (365 * (1970 - 1601) + \ + (1970 - 1601) / 4 - 3)) + static void acquire_privilege(const char *name, Error **err) { HANDLE token; @@ -280,8 +286,25 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **err) int64_t qmp_guest_get_time(Error **errp) { - error_set(errp, QERR_UNSUPPORTED); - return -1; + SYSTEMTIME ts = {0}; + int64_t time_ns; + 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; + } + + time_ns = ((((int64_t)tf.dwHighDateTime << 32) | tf.dwLowDateTime) + - W32_FT_OFFSET) * 100; + + return time_ns; } void qmp_guest_set_time(int64_t time_ns, Error **errp) From b8f954fea019801370954fe85c32df49edf6397d Mon Sep 17 00:00:00 2001 From: Lei Li Date: Fri, 15 Mar 2013 17:29:05 +0800 Subject: [PATCH 2/5] qga: add windows implementation for guest-set-time Signed-off-by: Lei Li Reviewed-by: Eric Blake Reviewed-by: Michael Roth Signed-off-by: Michael Roth --- qga/commands-win32.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index d98e3eeff0..24e4ad0319 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -309,7 +309,34 @@ int64_t qmp_guest_get_time(Error **errp) void qmp_guest_set_time(int64_t time_ns, Error **errp) { - error_set(errp, QERR_UNSUPPORTED); + SYSTEMTIME ts; + FILETIME tf; + LONGLONG time; + + if (time_ns < 0 || time_ns / 100 > INT64_MAX - W32_FT_OFFSET) { + error_setg(errp, "Time %" PRId64 "is invalid", time_ns); + return; + } + + time = time_ns / 100 + W32_FT_OFFSET; + + tf.dwLowDateTime = (DWORD) time; + tf.dwHighDateTime = (DWORD) (time >> 32); + + if (!FileTimeToSystemTime(&tf, &ts)) { + error_setg(errp, "Failed to convert system time %d", (int)GetLastError()); + return; + } + + acquire_privilege(SE_SYSTEMTIME_NAME, errp); + if (error_is_set(errp)) { + return; + } + + if (!SetSystemTime(&ts)) { + error_setg(errp, "Failed to set time to guest: %d", (int)GetLastError()); + return; + } } GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp) From c964c9e0985e71527bac47c8351008c3dc18c1b8 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Fri, 15 Mar 2013 19:07:50 +0100 Subject: [PATCH 3/5] qga schema: mark optional GuestLogicalProcessor.can-offline with #optional Suggested-by: Eric Blake Signed-off-by: Laszlo Ersek Reviewed-by: Eric Blake Reviewed-by: Michael Roth Signed-off-by: Michael Roth --- qga/qapi-schema.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index dac4e6f95f..2af3515115 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -562,9 +562,10 @@ # # @online: Whether the VCPU is enabled. # -# @can-offline: Whether offlining the VCPU is possible. This member is always -# filled in by the guest agent when the structure is returned, -# and always ignored on input (hence it can be omitted then). +# @can-offline: #optional Whether offlining the VCPU is possible. This member +# is always filled in by the guest agent when the structure is +# returned, and always ignored on input (hence it can be omitted +# then). # # Since: 1.5 ## From 9481ecd737b91d507baf347287c62efe6760784f Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Fri, 15 Mar 2013 19:07:51 +0100 Subject: [PATCH 4/5] qga schema: document generic QERR_UNSUPPORTED Part of the wording was shamelessly stolen from Michael Roth's email. Suggested-by: Michael Roth Signed-off-by: Laszlo Ersek Reviewed-by: Eric Blake Reviewed-by: Michael Roth Signed-off-by: Michael Roth --- qga/qapi-schema.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 2af3515115..7155b7ab55 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -1,5 +1,16 @@ # *-*- Mode: Python -*-* +## +# +# General note concerning the use of guest agent interfaces: +# +# "unsupported" is a higher-level error than the errors that individual +# commands might document. The caller should always be prepared to receive +# QERR_UNSUPPORTED, even if the given command doesn't specify it, or doesn't +# document any failure mode at all. +# +## + ## # # Echo back a unique integer value, and prepend to response a From ce7f7cc2715145eadf1ac45a5dae63f535fc8bbf Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Fri, 22 Mar 2013 16:31:07 -0400 Subject: [PATCH 5/5] qemu-ga: ga_get_fd_handle(): abort if fd_counter overflows Today we reset fd_counter if it wraps, but it's better to abort() instead, as fd_counter should never reach INT64_MAX. Signed-off-by: Luiz Capitulino Reviewed-by: Eric Blake *fixed typo: s/resonable/reasonable/ Signed-off-by: Michael Roth --- qga/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qga/main.c b/qga/main.c index 74ef7885b2..1841759db2 100644 --- a/qga/main.c +++ b/qga/main.c @@ -889,9 +889,13 @@ int64_t ga_get_fd_handle(GAState *s, Error **errp) g_assert(!ga_is_frozen(s)); handle = s->pstate.fd_counter++; - if (s->pstate.fd_counter < 0) { - s->pstate.fd_counter = 0; + + /* This should never happen on a reasonable timeframe, as guest-file-open + * would have to be issued 2^63 times */ + if (s->pstate.fd_counter == INT64_MAX) { + abort(); } + if (!write_persistent_state(&s->pstate, s->pstate_filepath)) { error_setg(errp, "failed to commit persistent state to disk"); }