diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cab653b5d6d0b48da096e098ba2758f99cf855f0..c8a002977ecc16d15df97b63ea9e3cf1f1ae4810 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16598,7 +16598,7 @@ qemuDomainSetTime(virDomainPtr dom, virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv; virDomainObjPtr vm; - bool sync = flags & VIR_DOMAIN_TIME_SYNC; + bool rtcSync = flags & VIR_DOMAIN_TIME_SYNC; int ret = -1; int rv; @@ -16625,7 +16625,7 @@ qemuDomainSetTime(virDomainPtr dom, goto endjob; qemuDomainObjEnterAgent(vm); - rv = qemuAgentSetTime(priv->agent, seconds, nseconds, sync); + rv = qemuAgentSetTime(priv->agent, seconds, nseconds, rtcSync); qemuDomainObjExitAgent(vm); if (rv < 0) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index a3b66edac1dbdcff21230f1da71fbdbf086a0edc..8bd58ad41776875256e5057edf1f43016c34bd54 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1400,7 +1400,7 @@ cmdDomTime(vshControl *ctl, const vshCmd *cmd) bool ret = false; bool now = vshCommandOptBool(cmd, "now"); bool pretty = vshCommandOptBool(cmd, "pretty"); - bool sync = vshCommandOptBool(cmd, "sync"); + bool rtcSync = vshCommandOptBool(cmd, "sync"); long long seconds = 0; unsigned int nseconds = 0; unsigned int flags = 0; @@ -1426,13 +1426,13 @@ cmdDomTime(vshControl *ctl, const vshCmd *cmd) doSet = true; } - if (doSet || now || sync) { + if (doSet || now || rtcSync) { if (now && ((seconds = time(NULL)) == (time_t) -1)) { vshError(ctl, _("Unable to get current time")); goto cleanup; } - if (sync) + if (rtcSync) flags |= VIR_DOMAIN_TIME_SYNC; if (virDomainSetTime(dom, seconds, nseconds, flags) < 0)