openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Replace priv with qemuCaps in qemuMigrationCookieParse 

QEMU capabilities is the only thing we use from priv so we can just pass
that directly.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Jiri Denemark 2022-11-30 16:05:56 +01:00
parent 8745591457
commit 9e5b42b5eb
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_migration.c
View File

@ -3935,7 +3935,8 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver,
if (qemuMigrationJobStartPhase(vm, phase) < 0) if (qemuMigrationJobStartPhase(vm, phase) < 0)
return -1; return -1;
if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, priv, if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname,
priv->qemuCaps,
cookiein, cookieinlen, cookiein, cookieinlen,
QEMU_MIGRATION_COOKIE_STATS))) QEMU_MIGRATION_COOKIE_STATS)))
return -1; return -1;
@ -4768,7 +4769,8 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
} }
} }
mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, priv, mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname,
priv->qemuCaps,
cookiein, cookieinlen, cookiein, cookieinlen,
cookieFlags | cookieFlags |
QEMU_MIGRATION_COOKIE_GRAPHICS | QEMU_MIGRATION_COOKIE_GRAPHICS |
@ -5058,7 +5060,8 @@ qemuMigrationSrcResume(virDomainObj *vm,
VIR_DEBUG("vm=%p", vm); VIR_DEBUG("vm=%p", vm);
mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, priv, mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname,
priv->qemuCaps,
cookiein, cookieinlen, cookiein, cookieinlen,
QEMU_MIGRATION_COOKIE_CAPS); QEMU_MIGRATION_COOKIE_CAPS);
if (!mig) if (!mig)
@ -6456,7 +6459,8 @@ qemuMigrationDstFinishOffline(virQEMUDriver *driver,
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
g_autoptr(qemuMigrationCookie) mig = NULL; g_autoptr(qemuMigrationCookie) mig = NULL;
if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, priv, if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname,
priv->qemuCaps,
cookiein, cookieinlen, cookie_flags))) cookiein, cookieinlen, cookie_flags)))
return NULL; return NULL;
@ -6652,7 +6656,8 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
VIR_DEBUG("vm=%p, flags=0x%lx, retcode=%d", VIR_DEBUG("vm=%p, flags=0x%lx, retcode=%d",
vm, flags, retcode); vm, flags, retcode);
if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, priv, if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname,
priv->qemuCaps,
cookiein, cookieinlen, cookie_flags))) cookiein, cookieinlen, cookie_flags)))
goto error; goto error;

8
src/qemu/qemu_migration_cookie.c
View File

@ -1493,7 +1493,7 @@ qemuMigrationCookieParse(virQEMUDriver *driver,
virDomainObj *vm, virDomainObj *vm,
const virDomainDef *def, const virDomainDef *def,
const char *origname, const char *origname,
qemuDomainObjPrivate *priv, virQEMUCaps *qemuCaps,
const char *cookiein, const char *cookiein,
int cookieinlen, int cookieinlen,
unsigned int flags) unsigned int flags)
@ -1514,11 +1514,7 @@ qemuMigrationCookieParse(virQEMUDriver *driver,
return NULL; return NULL;
if (cookiein && cookieinlen && if (cookiein && cookieinlen &&
qemuMigrationCookieXMLParseStr(mig, qemuMigrationCookieXMLParseStr(mig, driver, qemuCaps, cookiein, flags) < 0)
driver,
priv ? priv->qemuCaps : NULL,
cookiein,
flags) < 0)
return NULL; return NULL;
if (flags & QEMU_MIGRATION_COOKIE_PERSISTENT && if (flags & QEMU_MIGRATION_COOKIE_PERSISTENT &&

2
src/qemu/qemu_migration_cookie.h
View File

@ -192,7 +192,7 @@ qemuMigrationCookieParse(virQEMUDriver *driver,
virDomainObj *vm, virDomainObj *vm,
const virDomainDef *def, const virDomainDef *def,
const char *origname, const char *origname,
qemuDomainObjPrivate *priv, virQEMUCaps *qemuCaps,
const char *cookiein, const char *cookiein,
int cookieinlen, int cookieinlen,
unsigned int flags); unsigned int flags);

2
tests/qemumigrationcookiexmltest.c
View File

@ -144,7 +144,7 @@ testQemuMigrationCookieParse(const void *opaque)
data->vm, data->vm,
data->vm->def, data->vm->def,
NULL, NULL,
priv, priv->qemuCaps,
data->xmlstr, data->xmlstr,
data->xmlstrlen, data->xmlstrlen,
data->cookieParseFlags))) { data->cookieParseFlags))) {