From patchwork Fri Mar 1 09:33:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Li X-Patchwork-Id: 224264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6BA862C029D for ; Fri, 1 Mar 2013 20:34:58 +1100 (EST) Received: from localhost ([::1]:43269 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBMMi-00064H-II for incoming@patchwork.ozlabs.org; Fri, 01 Mar 2013 04:34:56 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBMLU-0004kI-Hi for qemu-devel@nongnu.org; Fri, 01 Mar 2013 04:33:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UBMLP-0003P7-Il for qemu-devel@nongnu.org; Fri, 01 Mar 2013 04:33:40 -0500 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:52633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBMLO-0003Ow-PN for qemu-devel@nongnu.org; Fri, 01 Mar 2013 04:33:35 -0500 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 1 Mar 2013 19:26:04 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp09.au.ibm.com (202.81.31.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 1 Mar 2013 19:26:02 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 5C9712CE804A for ; Fri, 1 Mar 2013 20:33:29 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r219KxuE3866928 for ; Fri, 1 Mar 2013 20:20:59 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r219XSga010348 for ; Fri, 1 Mar 2013 20:33:29 +1100 Received: from localhost.cn.ibm.com ([9.115.122.212]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r219XL3P010143; Fri, 1 Mar 2013 20:33:27 +1100 From: Lei Li To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2013 17:33:00 +0800 Message-Id: <1362130380-1895-3-git-send-email-lilei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1362130380-1895-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1362130380-1895-1-git-send-email-lilei@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13030109-3568-0000-0000-0000033A349E X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.142 Cc: aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, Lei Li Subject: [Qemu-devel] [PATCH 2/2] qga: add guest-set-time command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Lei Li --- qga/commands-posix.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ qga/qapi-schema.json | 27 ++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index f159e25..e246a0d 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -135,6 +135,61 @@ int64_t qmp_guest_get_time(Error **errp) return time_ns; } +void qmp_guest_set_time(int64_t time_ns, Error **errp) +{ + int ret; + int status; + pid_t pid; + Error *local_err = NULL; + struct timeval tv; + + /* year-2038 will overflow in case time_t is 32bit */ + if ((sizeof(time_t) <= 4) && ((unsigned long) time_ns & (1ul << 31))) { + error_setg_errno(errp, errno, "Invalid time %ld for overflow", + time_ns); + } + + tv.tv_sec = time_ns / 1000000000; + tv.tv_usec = (time_ns % 1000000000) / 1000; + + ret = settimeofday(&tv, NULL); + if (ret < 0) { + error_setg_errno(errp, errno, "Failed to set time to guest"); + return; + } + + /* Set the Hardware Clock to the current System Time. */ + pid = fork(); + if (pid == 0) { + setsid(); + reopen_fd_to_null(0); + reopen_fd_to_null(1); + reopen_fd_to_null(2); + + execle("/sbin/hwclock", "hwclock", "-w", NULL, environ); + _exit(EXIT_FAILURE); + } else if (pid < 0) { + error_setg_errno(errp, errno, "failed to create child process"); + return; + } + + ga_wait_child(pid, &status, &local_err); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); + return; + } + + if (!WIFEXITED(status)) { + error_setg(errp, "child process has terminated abnormally"); + return; + } + + if (WEXITSTATUS(status)) { + error_setg(errp, "hwclock failed to set hardware clock to system time"); + return; + } +} + typedef struct GuestFileHandle { uint64_t id; FILE *fh; diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 563600c..5eba324 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -99,6 +99,33 @@ 'returns': 'int' } ## +# @guest-set-time: +# +# Set guest time. +# +# Right now, when a guest is paused or migrated to a file +# then loaded from that file, the guest OS has no idea that +# there was a big gap in the time. Depending on how long +# the gap was, NTP might not be able to resynchronize the +# guest. +# +# This command tries to set guest time based on the information +# from host or an absolute value given by management app, and +# set the Hardware Clock to the current System Time. This +# will make it easier for a guest to resynchronize without +# waiting for NTP. +# +# @time: time of nanoseconds, relative to the Epoch of +# 1970-01-01 in UTC/GMT. +# +# Returns: Nothing on success. +# +# Since: 1.5 +## +{ 'command': 'guest-set-time', + 'data': { 'time': 'int' } } + +## # @GuestAgentCommandInfo: # # Information about guest agent commands.