qga: fence guest-set-time if hwclock not available
RFC PATCH 1/1 qga: fence guest-set-time if hwclock not available
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.
---
Not sure if that is the correct approach, but the current error message is really quite confusing.
Gave it a quick test with an s390x and an x86_64 guest; invoking 'virsh domtime <value>' now fails with 'not currently supported' on s390x and continues to work as before on x86_64.
--- qga/commands-posix.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
qga/commands-posix.c +19 -1
@@ -149,6 +149,13 @@ int64_t qmp_guest_get_time(Error **errp)return tq.tv_sec *1000000000LL + tq.tv_usec *1000 ; } +static int check_hwclock_available (const char *path) +{ +struct stat st; + +return (stat (path, &st) <0 ) ?0 :1 ; +} +void qmp_guest_set_time (bool has_time,int64_t time_ns,Error **errp) {int ret;
@@ -156,6 +163,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; +const char *hwclock_path ="/sbin/hwclock" ; +static int hwclock_available =-1 ; + +if (hwclock_available <0 ) { + hwclock_available =check_hwclock_available (hwclock_path); + } + +if (!hwclock_available) { +error_setg (errp,QERR_UNSUPPORTED ); +return ; + }/* If user has passed a time, validate and set it. */ if (has_time) {
@@ -195,7 +213,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 ) {
Signature · 1 line
2.21.0
Quoted 7 lines · Cornelia Huck
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.
Quoted 8 lines
Let's check for the availability of the hwclock command and return
QERR_UNSUPPORTEDfor guest-set-time if it is not available.Signed-off-by Cornelia Huck <[email protected]>---
Not sure if that is the correct approach, but the current error message is really quite confusing.
I guess the alternative is to just #ifndef __s390x__ the whole impl of the qmp_guest_set_time method, but I don't have a strong opinion on which is best.
Quoted 28 lines
Gave it a quick test with an s390x and an
x86_64guest; invoking 'virsh domtime <value>' now fails with 'not currently supported' on s390x and continues to work as before onx86_64.--- qga/commands-posix.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)qga/commands-posix.c +7
-0@@ -149,6 +149,13 @@ int64_t qmp_guest_get_time(Error **errp)return tq.tv_sec *1000000000LL + tq.tv_usec *1000 ; } +static int check_hwclock_available (const char *path) +{ +struct stat st; + +return (stat (path, &st) <0 ) ?0 :1 ; +} +void qmp_guest_set_time (bool has_time,int64_t time_ns,Error **errp) {int ret;
qga/commands-posix.c void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) · line 170
Quoted 8 lines
qga/commands-posix.c +5
-0@@ -156,6 +163,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; +const char *hwclock_path ="/sbin/hwclock" ; +static int hwclock_available =-1 ; + +if (hwclock_available <0 ) { + hwclock_available =check_hwclock_available (hwclock_path);
Could do this inline with:
hwclock_available = (access(hwclock_available, X_OK) == 0);
getting a slightly better result as this check for it being executable as well as existing.
Quoted 22 lines
qga/commands-posix.c +7
-1+ } + +if (!hwclock_available) { +error_setg (errp,QERR_UNSUPPORTED ); +return ; + }/* If user has passed a time, validate and set it. */ if (has_time) {@@ -195,7 +213,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 ) {Signature · 1 line
2.21.0
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 14 lines · On Thu, 28 Nov 2019 12:45:32 +0000 Daniel P. Berrangé <[email protected]>…
Quoted 13 lines · Cornelia Huck
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_UNSUPPORTEDfor guest-set-time if it is not available.Signed-off-by Cornelia Huck <[email protected]>---
Quoted 6 lines
Quoted 2 lines
Not sure if that is the correct approach, but the current error message is really quite confusing.
I guess the alternative is to just #ifndef
__s390x__the whole impl of theqmp_guest_set_timemethod, but I don't have a strong opinion on which is best.
This hardcodes this as a s390x specialty, though, and I'm not sure that assumption is and will stay correct.
Quoted 40 lines
Quoted 29 lines
Gave it a quick test with an s390x and an
x86_64guest; invoking 'virsh domtime <value>' now fails with 'not currently supported' on s390x and continues to work as before onx86_64.--- qga/commands-posix.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)qga/commands-posix.c +7
-0@@ -149,6 +149,13 @@ int64_t qmp_guest_get_time(Error **errp)return tq.tv_sec *1000000000LL + tq.tv_usec *1000 ; } +static int check_hwclock_available (const char *path) +{ +struct stat st; + +return (stat (path, &st) <0 ) ?0 :1 ; +} +void qmp_guest_set_time (bool has_time,int64_t time_ns,Error **errp) {int ret;qga/commands-posix.c void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) · line 170
Quoted 8 lines
qga/commands-posix.c +5
-0@@ -156,6 +163,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; +const char *hwclock_path ="/sbin/hwclock" ; +static int hwclock_available =-1 ; + +if (hwclock_available <0 ) { + hwclock_available =check_hwclock_available (hwclock_path);Could do this inline with:
Quoted 4 lines
hwclock_available = (access(hwclock_available, X_OK) == 0);getting a slightly better result as this check for it being executable as well as existing.
Yes, that looks better. Can do if we agree on this approach.
Quoted 26 lines
Quoted 23 lines
qga/commands-posix.c +7
-1+ } + +if (!hwclock_available) { +error_setg (errp,QERR_UNSUPPORTED ); +return ; + }/* If user has passed a time, validate and set it. */ if (has_time) {@@ -195,7 +213,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 ) {Signature · 1 line
2.21.0Regards,
Daniel
Quoted 68 lines · Cornelia Huck
Quoted 14 lines · On Thu, 28 Nov 2019 12:45:32 +0000 Daniel P. Berrangé <[email protected]>…
Quoted 13 lines · Cornelia Huck
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_UNSUPPORTEDfor guest-set-time if it is not available.Signed-off-by Cornelia Huck <[email protected]>---
Quoted 6 lines
Quoted 2 lines
Not sure if that is the correct approach, but the current error message is really quite confusing.
I guess the alternative is to just #ifndef
__s390x__the whole impl of theqmp_guest_set_timemethod, but I don't have a strong opinion on which is best.This hardcodes this as a s390x specialty, though, and I'm not sure that assumption is and will stay correct.
Quoted 40 lines
Quoted 29 lines
Gave it a quick test with an s390x and an
x86_64guest; invoking 'virsh domtime <value>' now fails with 'not currently supported' on s390x and continues to work as before onx86_64.--- qga/commands-posix.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)qga/commands-posix.c +7
-0@@ -149,6 +149,13 @@ int64_t qmp_guest_get_time(Error **errp)return tq.tv_sec *1000000000LL + tq.tv_usec *1000 ; } +static int check_hwclock_available (const char *path) +{ +struct stat st; + +return (stat (path, &st) <0 ) ?0 :1 ; +} +void qmp_guest_set_time (bool has_time,int64_t time_ns,Error **errp) {int ret;qga/commands-posix.c void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) · line 170
Quoted 8 lines
qga/commands-posix.c +5
-0@@ -156,6 +163,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; +const char *hwclock_path ="/sbin/hwclock" ; +static int hwclock_available =-1 ; + +if (hwclock_available <0 ) { + hwclock_available =check_hwclock_available (hwclock_path);Could do this inline with:
Quoted 6 lines
Quoted 4 lines
hwclock_available = (access(hwclock_available, X_OK) == 0);getting a slightly better result as this check for it being executable as well as existing.
Yes, that looks better. Can do if we agree on this approach.
I'm fine with this
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 38 lines · Daniel P. Berrangé
Quoted 7 lines · Cornelia Huck
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.
Quoted 8 lines
Let's check for the availability of the hwclock command and return
QERR_UNSUPPORTEDfor guest-set-time if it is not available.Signed-off-by Cornelia Huck <[email protected]>---
Not sure if that is the correct approach, but the current error message is really quite confusing.
I guess the alternative is to just #ifndef
__s390x__the whole impl of theqmp_guest_set_timemethod, but I don't have a strong opinion on which is best.Quoted 17 lines
Gave it a quick test with an s390x and an
x86_64guest; invoking 'virsh domtime <value>' now fails with 'not currently supported' on s390x and continues to work as before onx86_64.--- qga/commands-posix.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)qga/commands-posix.c +0
-0@@ -149,6 +149,13 @@ int64_t qmp_guest_get_time(Error **errp)return tq.tv_sec *1000000000LL + tq.tv_usec *1000 ; }
Quoted 15 lines
Quoted 11 lines
qga/commands-posix.c +7
-0+static int check_hwclock_available (const char *path) +{ +struct stat st; + +return (stat (path, &st) <0 ) ?0 :1 ; +} +void qmp_guest_set_time (bool has_time,int64_t time_ns,Error **errp) {int ret;qga/commands-posix.c void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) · line 166
Quoted 4 lines
qga/commands-posix.c +1
-0@@ -156,6 +163,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; +const char *hwclock_path ="/sbin/hwclock" ;
slight style / semantics improvement could be
static const char hwclock_path[] = "/sbin/hwclock";
Thanks
Laszlo
Quoted 38 lines
qga/commands-posix.c void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) · line 170
Quoted 4 lines
qga/commands-posix.c +4
-0+static int hwclock_available =-1 ; + +if (hwclock_available <0 ) { + hwclock_available =check_hwclock_available (hwclock_path);Could do this inline with:
hwclock_available = (access(hwclock_available, X_OK) == 0);getting a slightly better result as this check for it being executable as well as existing.
Quoted 22 lines
qga/commands-posix.c +7
-1+ } + +if (!hwclock_available) { +error_setg (errp,QERR_UNSUPPORTED ); +return ; + }/* If user has passed a time, validate and set it. */ if (has_time) {@@ -195,7 +213,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 ) {Signature · 1 line
2.21.0Regards,
Daniel