From: Peter Krempa <pkrempa@redhat.com> We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_migration.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b2d67a1e74..a0ec2f5ff3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -7204,14 +7204,14 @@ qemuMigrationSrcToLegacyFile(virDomainObj *vm, static int -qemuMigrationSrcToSparseFile(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationSrcToSparseFile(virDomainObj *vm, const char *path, int *fd, bool bypassCache, virDomainAsyncJob asyncJob) { - g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + qemuDomainObjPrivate *priv = vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver); VIR_AUTOCLOSE directFd = -1; int directFlag = 0; bool needUnlink = false; @@ -7233,12 +7233,14 @@ qemuMigrationSrcToSparseFile(virQEMUDriver *driver, if (directFd < 0) return -1; - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, directFd) < 0) + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def, + directFd) < 0) return -1; } - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, *fd) < 0) + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def, + *fd) < 0) return -1; if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) @@ -7252,7 +7254,8 @@ qemuMigrationSrcToSparseFile(virQEMUDriver *driver, /* Helper function called while vm is active. */ int -qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, +qemuMigrationSrcToFile(virQEMUDriver *driver G_GNUC_UNUSED, + virDomainObj *vm, const char *path, int *fd, virCommand *compressor, @@ -7291,7 +7294,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, if (migParams && qemuMigrationParamsCapEnabled(migParams, QEMU_MIGRATION_CAP_MAPPED_RAM)) - rc = qemuMigrationSrcToSparseFile(driver, vm, path, fd, bypassCache, asyncJob); + rc = qemuMigrationSrcToSparseFile(vm, path, fd, bypassCache, asyncJob); else rc = qemuMigrationSrcToLegacyFile(vm, *fd, compressor, asyncJob); -- 2.52.0