From: Peter Krempa Date: Tue, 2 Dec 2025 16:45:36 +0000 (+0100) Subject: qemuMigrationSrcToLegacyFile: Remove 'driver' argument X-Git-Tag: v12.0.0-rc1~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=256ce775d9a9be1a1807fde5b2955974dbd67b82;p=thirdparty%2Flibvirt.git qemuMigrationSrcToLegacyFile: Remove 'driver' argument We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Ján Tomko --- diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 87b2135b57..dfe5227390 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -7145,8 +7145,7 @@ qemuMigrationProcessUnattended(virQEMUDriver *driver, static int -qemuMigrationSrcToLegacyFile(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationSrcToLegacyFile(virDomainObj *vm, int fd, virCommand *compressor, virDomainAsyncJob asyncJob) @@ -7163,7 +7162,7 @@ qemuMigrationSrcToLegacyFile(virQEMUDriver *driver, * doesn't have to open() the file, so while we still have to * grant SELinux access, we can do it on fd and avoid cleanup * later, as well as skip futzing with cgroup. */ - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def, compressor ? pipeFD[1] : fd) < 0) goto cleanup; @@ -7297,7 +7296,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, qemuMigrationParamsCapEnabled(migParams, QEMU_MIGRATION_CAP_MAPPED_RAM)) rc = qemuMigrationSrcToSparseFile(driver, vm, path, fd, bypassCache, asyncJob); else - rc = qemuMigrationSrcToLegacyFile(driver, vm, *fd, compressor, asyncJob); + rc = qemuMigrationSrcToLegacyFile(vm, *fd, compressor, asyncJob); if (rc < 0) goto cleanup;