External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu_migration.c: use auto* in qemuMigrationSrcRun()

Browse Source 
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-07-13 06:49:51 -03:00 committed by Michal Privoznik
parent 6f59ffb4c9
commit 866ce83c3e
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_migration.c
View File

@ -3467,10 +3467,10 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
int ret = -1; int ret = -1;
unsigned int migrate_flags = QEMU_MONITOR_MIGRATE_BACKGROUND; unsigned int migrate_flags = QEMU_MONITOR_MIGRATE_BACKGROUND;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
qemuMigrationCookiePtr mig = NULL; g_autoptr(qemuMigrationCookie) mig = NULL;
char *tlsAlias = NULL; g_autofree char *tlsAlias = NULL;
qemuMigrationIOThreadPtr iothread = NULL; qemuMigrationIOThreadPtr iothread = NULL;
int fd = -1; VIR_AUTOCLOSE fd = -1;
unsigned long migrate_speed = resource ? resource : priv->migMaxBandwidth; unsigned long migrate_speed = resource ? resource : priv->migMaxBandwidth;
virErrorPtr orig_err = NULL; virErrorPtr orig_err = NULL;
unsigned int cookieFlags = 0; unsigned int cookieFlags = 0;
@ -3479,8 +3479,8 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
bool bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH); bool bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);
bool cancel = false; bool cancel = false;
unsigned int waitFlags; unsigned int waitFlags;
virDomainDefPtr persistDef = NULL; g_autoptr(virDomainDef) persistDef = NULL;
char *timestamp; g_autofree char *timestamp = NULL;
int rc; int rc;
VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, " VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, "
@ -3642,10 +3642,8 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
} }
/* log start of migration */ /* log start of migration */
if ((timestamp = virTimeStringNow()) != NULL) { if ((timestamp = virTimeStringNow()) != NULL)
qemuDomainLogAppendMessage(driver, vm, "%s: initiating migration\n", timestamp); qemuDomainLogAppendMessage(driver, vm, "%s: initiating migration\n", timestamp);
VIR_FREE(timestamp);
}
rc = -1; rc = -1;
switch (spec->destType) { switch (spec->destType) {
@ -3779,11 +3777,6 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(tlsAlias);
VIR_FORCE_CLOSE(fd);
virDomainDefFree(persistDef);
qemuMigrationCookieFree(mig);
if (events) if (events)
priv->signalIOError = false; priv->signalIOError = false;