https://bugzilla.redhat.com/show_bug.cgi?id=1046192
Commit b8bf79a, which adds clock='variable', forgets to check
localtime basis in qemuBuildClockArgStr(). So that localtime
basis could not be used.
Reported-by: Jincheng Miao jm...@redhat.com
Signed-off-by: Michal Privoznik mpriv...@redhat.com
---
src/qemu/qemu_command.c | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5b94de1..6cc32f9 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6491,14 +6491,18 @@ qemuBuildClockArgStr(virDomainClockDefPtr def)
time_t now = time(NULL);
struct tm nowbits;
-if (def-data.variable.basis != VIR_DOMAIN_CLOCK_BASIS_UTC) {
-virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _(unsupported clock basis '%s'),
-
virDomainClockBasisTypeToString(def-data.variable.basis));
-goto error;
+switch ((enum virDomainClockBasis) def-data.variable.basis) {
+case VIR_DOMAIN_CLOCK_BASIS_UTC:
+now += def-data.variable.adjustment;
+gmtime_r(now, nowbits);
+break;
+case VIR_DOMAIN_CLOCK_BASIS_LOCALTIME:
+now += def-data.variable.adjustment;
+localtime_r(now, nowbits);
+break;
+case VIR_DOMAIN_CLOCK_BASIS_LAST:
+break;
}
-now += def-data.variable.adjustment;
-gmtime_r(now, nowbits);
/* Store the guest's basedate */
def-data.variable.basedate = now;
--
1.8.5.2
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
