All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "Daniel P . Berrangé" <berrange@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Cornelia Huck" <cohuck@redhat.com>,
	qemu-devel@nongnu.org, "Michael Roth" <mdroth@linux.vnet.ibm.com>,
	qemu-s390x@nongnu.org, "Laszlo Ersek" <lersek@redhat.com>
Subject: [PULL v2 16/16] qga: fence guest-set-time if hwclock not available
Date: Sat, 14 Dec 2019 10:45:26 +0100	[thread overview]
Message-ID: <20191214094526.8698-17-cohuck@redhat.com> (raw)
In-Reply-To: <20191214094526.8698-1-cohuck@redhat.com>

The Posix implementation of guest-set-time invokes hwclock to
set/retrieve the time to/from the hardware clock. If hwclock
is not available, the user is currently informed that "hwclock
failed to set hardware clock to system time", which is quite
misleading. This may happen e.g. on s390x, which has a different
timekeeping concept anyway.

Let's check for the availability of the hwclock command and
return QERR_UNSUPPORTED for guest-set-time if it is not available.

Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Message-Id: <20191205115350.18713-1-cohuck@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 qga/commands-posix.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 1c1a165daed8..0be301a4ea77 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -156,6 +156,17 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
     pid_t pid;
     Error *local_err = NULL;
     struct timeval tv;
+    static const char hwclock_path[] = "/sbin/hwclock";
+    static int hwclock_available = -1;
+
+    if (hwclock_available < 0) {
+        hwclock_available = (access(hwclock_path, X_OK) == 0);
+    }
+
+    if (!hwclock_available) {
+        error_setg(errp, QERR_UNSUPPORTED);
+        return;
+    }
 
     /* If user has passed a time, validate and set it. */
     if (has_time) {
@@ -195,7 +206,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
 
         /* Use '/sbin/hwclock -w' to set RTC from the system time,
          * or '/sbin/hwclock -s' to set the system time from RTC. */
-        execle("/sbin/hwclock", "hwclock", has_time ? "-w" : "-s",
+        execle(hwclock_path, "hwclock", has_time ? "-w" : "-s",
                NULL, environ);
         _exit(EXIT_FAILURE);
     } else if (pid < 0) {
-- 
2.21.0



  parent reply	other threads:[~2019-12-14  9:59 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-14  9:45 [PULL v2 00/16] first s390x update for 5.0 Cornelia Huck
2019-12-14  9:45 ` [PULL v2 01/16] vfio-ccw: Fix error message Cornelia Huck
2019-12-14  9:45 ` [PULL v2 02/16] hw: add compat machines for 5.0 Cornelia Huck
2019-12-14  9:45 ` [PULL v2 03/16] s390x: Don't do a normal reset on the initial cpu Cornelia Huck
2019-12-14  9:45 ` [PULL v2 04/16] s390x: Move reset normal to shared reset handler Cornelia Huck
2019-12-14  9:45 ` [PULL v2 05/16] s390x: Move initial reset Cornelia Huck
2019-12-14  9:45 ` [PULL v2 06/16] s390x: Move clear reset Cornelia Huck
2019-12-14  9:45 ` [PULL v2 07/16] s390x: Beautify diag308 handling Cornelia Huck
2019-12-14  9:45 ` [PULL v2 08/16] s390x: kvm: Make kvm_sclp_service_call void Cornelia Huck
2019-12-14  9:45 ` [PULL v2 09/16] s390x: Fix cpu normal reset ri clearing Cornelia Huck
2019-12-14  9:45 ` [PULL v2 10/16] s390x/event-facility: Fix realize() error API violations Cornelia Huck
2019-12-14  9:45 ` [PULL v2 11/16] s390x/cpumodel: Fix feature property " Cornelia Huck
2019-12-14  9:45 ` [PULL v2 12/16] s390x/cpumodel: Fix realize() " Cornelia Huck
2019-12-14  9:45 ` [PULL v2 13/16] s390x/cpumodel: Fix query-cpu-model-FOO " Cornelia Huck
2019-12-14  9:45 ` [PULL v2 14/16] s390x/cpumodel: Fix query-cpu-definitions " Cornelia Huck
2019-12-14  9:45 ` [PULL v2 15/16] s390x/tcg: clear local interrupts on reset normal Cornelia Huck
2019-12-14  9:45 ` Cornelia Huck [this message]
2020-01-03 12:05   ` [PULL v2 16/16] qga: fence guest-set-time if hwclock not available Peter Maydell
2019-12-16 13:04 ` [PULL v2 00/16] first s390x update for 5.0 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=20191214094526.8698-17-cohuck@redhat.com \
    --to=cohuck@redhat.com \
    --cc=berrange@redhat.com \
    --cc=lersek@redhat.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@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.