I tried compiling libvirt with older gcc and probably because I used different configure options I got some shadowed declarations. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- src/qemu/qemu_migration.c | 6 +++--- src/storage/storage_backend_zfs.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d0055a27e24c..68a8fa892e17 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5943,7 +5943,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, int rc; qemuDomainJobInfoPtr jobInfo = NULL; bool inPostCopy = false; - bool kill = true; + bool doKill = true; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", @@ -6091,7 +6091,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } if (inPostCopy) { - kill = false; + doKill = false; event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_POSTCOPY); @@ -6151,7 +6151,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, if (!dom && !(flags & VIR_MIGRATE_OFFLINE) && virDomainObjIsActive(vm)) { - if (kill) { + if (doKill) { qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, QEMU_ASYNC_JOB_MIGRATION_IN, VIR_QEMU_PROCESS_STOP_MIGRATED); diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index c66a808ab7b4..5c0c1fce5d4b 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -51,7 +51,7 @@ static int virStorageBackendZFSVolModeNeeded(void) { virCommandPtr cmd = NULL; - int ret = -1, exit = -1; + int ret = -1, exit_code = -1; char *error = NULL; /* 'zfs get' without arguments prints out @@ -63,8 +63,8 @@ virStorageBackendZFSVolModeNeeded(void) virCommandAddEnvString(cmd, "LC_ALL=C"); virCommandSetErrorBuffer(cmd, &error); - ret = virCommandRun(cmd, &exit); - if ((ret < 0) || (exit != 2)) { + ret = virCommandRun(cmd, &exit_code); + if ((ret < 0) || (exit_code != 2)) { VIR_WARN("Command 'zfs get' either failed " "to run or exited with unexpected status"); goto cleanup; -- 2.8.1