[libvirt] [PATCH] qemu: Avoid shadow of 'sync' symbol

Peter Krempa pkrempa at redhat.com
Thu Apr 9 13:37:42 UTC 2015


Old compilers whine that 'sync' is being shadowed in the function
introduced in 1eccac1d2da7bbe97e1df25fd0ddac6e71b0794a.
---

Pushed under the build-breaker rule.

 src/qemu/qemu_domain.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index c18b864..ae632c5 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3063,17 +3063,17 @@ qemuDomainSupportsBlockJobs(virDomainObjPtr vm,
                             bool *modern)
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
-    bool async = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC);
-    bool sync = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_SYNC);
+    bool asynchronous = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC);
+    bool synchronous = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_SYNC);

-    if (!sync && !async) {
+    if (!synchronous && !asynchronous) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("block jobs not supported with this QEMU binary"));
         return -1;
     }

     if (modern)
-        *modern = async;
+        *modern = asynchronous;

     return 0;
 }
-- 
2.2.2




More information about the libvir-list mailing list