9:44 a.m.
Old gcc complains about shadowing 'sync' variable:
../../src/qemu/qemu_agent.c: In function 'qemuAgentSetTime':
../../src/qemu/qemu_agent.c:1737: warning: declaration of 'sync'
shadows a global declaration [-Wshadow]
/usr/include/unistd.h:464: warning: shadowed declaration is here
[-Wshadow]
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/qemu/qemu_agent.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 10e2b8d..0421733 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1734,13 +1734,13 @@ int
qemuAgentSetTime(qemuAgentPtr mon,
long long seconds,
unsigned int nseconds,
- bool sync)
+ bool rtcSync)
{
int ret = -1;
virJSONValuePtr cmd;
virJSONValuePtr reply = NULL;
- if (sync) {
+ if (rtcSync) {
cmd = qemuAgentMakeCommand("guest-set-time", NULL);
} else {
/* guest agent expect time with nanosecond granularity.
--
1.8.5.5
10:16 a.m.
On 05/19/2014 08:44 AM, Pavel Hrdina wrote:
Old gcc complains about shadowing 'sync' variable:
../../src/qemu/qemu_agent.c: In function 'qemuAgentSetTime':
../../src/qemu/qemu_agent.c:1737: warning: declaration of 'sync'
shadows a global declaration [-Wshadow]
/usr/include/unistd.h:464: warning: shadowed declaration is here
[-Wshadow]
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/qemu/qemu_agent.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
ACK; qualifies as a trivial build-breaker.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
12:07 p.m.
On 19.5.2014 17:16, Eric Blake wrote:
On 05/19/2014 08:44 AM, Pavel Hrdina wrote:
> Old gcc complains about shadowing 'sync' variable:
>
> ../../src/qemu/qemu_agent.c: In function 'qemuAgentSetTime':
> ../../src/qemu/qemu_agent.c:1737: warning: declaration of 'sync'
> shadows a global declaration [-Wshadow]
> /usr/include/unistd.h:464: warning: shadowed declaration is here
> [-Wshadow]
>
> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
> ---
> src/qemu/qemu_agent.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
ACK; qualifies as a trivial build-breaker.
Thanks, pushed,
Pavel
6:08 p.m.
New subject: [libvirt] [PATCH] build: nuke more uses of 'sync'
Commit d5c86278 was incomplete; other functions also triggered
compiler warnings about collisions in the use of 'sync'.
* src/qemu/qemu_driver.c (qemuDomainSetTime): Fix another client.
* tools/virsh-domain-monitor.c (cmdDomTime): Likewise.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
Pushing under the build-breaker rule.
src/qemu/qemu_driver.c | 4 ++--
tools/virsh-domain-monitor.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index cab653b..c8a0029 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 a3b66ed..8bd58ad 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)
--
1.7.1
3871
days inactive
3871
days old
3 comments
2 participants
participants (2)
-
Eric Blake -
Pavel Hrdina