mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
Fix various shadowed declarations
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@redhat.com>
This commit is contained in:
parent
da6bbc51fb
commit
fb6ec0ed3d
@ -5943,7 +5943,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
|
|||||||
int rc;
|
int rc;
|
||||||
qemuDomainJobInfoPtr jobInfo = NULL;
|
qemuDomainJobInfoPtr jobInfo = NULL;
|
||||||
bool inPostCopy = false;
|
bool inPostCopy = false;
|
||||||
bool kill = true;
|
bool doKill = true;
|
||||||
|
|
||||||
VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, "
|
VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, "
|
||||||
"cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d",
|
"cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d",
|
||||||
@ -6091,7 +6091,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (inPostCopy) {
|
if (inPostCopy) {
|
||||||
kill = false;
|
doKill = false;
|
||||||
event = virDomainEventLifecycleNewFromObj(vm,
|
event = virDomainEventLifecycleNewFromObj(vm,
|
||||||
VIR_DOMAIN_EVENT_RESUMED,
|
VIR_DOMAIN_EVENT_RESUMED,
|
||||||
VIR_DOMAIN_EVENT_RESUMED_POSTCOPY);
|
VIR_DOMAIN_EVENT_RESUMED_POSTCOPY);
|
||||||
@ -6151,7 +6151,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
|
|||||||
if (!dom &&
|
if (!dom &&
|
||||||
!(flags & VIR_MIGRATE_OFFLINE) &&
|
!(flags & VIR_MIGRATE_OFFLINE) &&
|
||||||
virDomainObjIsActive(vm)) {
|
virDomainObjIsActive(vm)) {
|
||||||
if (kill) {
|
if (doKill) {
|
||||||
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
|
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
|
||||||
QEMU_ASYNC_JOB_MIGRATION_IN,
|
QEMU_ASYNC_JOB_MIGRATION_IN,
|
||||||
VIR_QEMU_PROCESS_STOP_MIGRATED);
|
VIR_QEMU_PROCESS_STOP_MIGRATED);
|
||||||
|
@ -51,7 +51,7 @@ static int
|
|||||||
virStorageBackendZFSVolModeNeeded(void)
|
virStorageBackendZFSVolModeNeeded(void)
|
||||||
{
|
{
|
||||||
virCommandPtr cmd = NULL;
|
virCommandPtr cmd = NULL;
|
||||||
int ret = -1, exit = -1;
|
int ret = -1, exit_code = -1;
|
||||||
char *error = NULL;
|
char *error = NULL;
|
||||||
|
|
||||||
/* 'zfs get' without arguments prints out
|
/* 'zfs get' without arguments prints out
|
||||||
@ -63,8 +63,8 @@ virStorageBackendZFSVolModeNeeded(void)
|
|||||||
virCommandAddEnvString(cmd, "LC_ALL=C");
|
virCommandAddEnvString(cmd, "LC_ALL=C");
|
||||||
virCommandSetErrorBuffer(cmd, &error);
|
virCommandSetErrorBuffer(cmd, &error);
|
||||||
|
|
||||||
ret = virCommandRun(cmd, &exit);
|
ret = virCommandRun(cmd, &exit_code);
|
||||||
if ((ret < 0) || (exit != 2)) {
|
if ((ret < 0) || (exit_code != 2)) {
|
||||||
VIR_WARN("Command 'zfs get' either failed "
|
VIR_WARN("Command 'zfs get' either failed "
|
||||||
"to run or exited with unexpected status");
|
"to run or exited with unexpected status");
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user