From: Peter Krempa Date: Tue, 18 Nov 2025 16:09:33 +0000 (+0100) Subject: virDomainNestedJobAllowed: Allow VIR_JOB_MODIFY_MIGRATION_SAFE if VIR_JOB_MODIFY... X-Git-Tag: v11.10.0-rc1~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18ceb1002da9c00fd4d1e2903ba0ffd599a84e6e;p=thirdparty%2Flibvirt.git virDomainNestedJobAllowed: Allow VIR_JOB_MODIFY_MIGRATION_SAFE if VIR_JOB_MODIFY is allowed The VIR_JOB_MODIFY_MIGRATION_SAFE is supposed to be a subset of _MODIFY jobs which are allowed during migration. Now with async jobs which allow VIR_JOB_MODIFY (namely the backup job) it shouldn't be required to explicitly mention VIR_JOB_MODIFY_MIGRATION_SAFE since we already allow everything. Adjust the logic in virDomainNestedJobAllowed to accept VIR_JOB_MODIFY_MIGRATION_SAFE if VIR_JOB_MODIFY is allowed so that other places can simply allow the latter. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c index 99c362d593..c2e7d33097 100644 --- a/src/conf/virdomainjob.c +++ b/src/conf/virdomainjob.c @@ -257,6 +257,7 @@ virDomainNestedJobAllowed(virDomainJobObj *jobs, virDomainJob newJob) { return !jobs->asyncJob || newJob == VIR_JOB_NONE || + (newJob == VIR_JOB_MODIFY_MIGRATION_SAFE && jobs->mask & JOB_MASK(VIR_JOB_MODIFY)) || (jobs->mask & JOB_MASK(newJob)); }