From nobody Fri Nov 21 10:10:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1763545142; cv=none; d=zohomail.com; s=zohoarc; b=UJMUbgqxUxTy4iDqtqaVhxMW61Tf14pjuQOBYPTC35H9Jlp1sczj3Uq8C3l/V2xrx5h5VovnJ3jyxAtcMMmGaz9NEHzFDAVgNcc5JDe44bnyaHp7lcCY1jIuGBJhRUkxM+zbUQReTAn14bLmLDqGFm26MDjX5r6sW/K4VwfMChA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763545142; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=/qh4dqZSdCqUgzYE9UrMqTu7/8rTUslXEBk/fMq2W0s=; b=eagS3AVrDmBDG0GW48nYm5ijXNE6NxIzRH9LzMR4/tLWDyH6BbZthdPTiEjx0pbGQHlVq66BuDt3LKbjtB9BoRHA7+DGxJ9UxOpjBT1SAr3vhxK3icgG8Hjjl9vn323UANeS+ur1r7P13qTsXHaUMPR9LkZPwW6FqKYIgrjHDwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1763545142479981.5574613941956; Wed, 19 Nov 2025 01:39:02 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 3B2B744136; Wed, 19 Nov 2025 04:39:00 -0500 (EST) Received: from [172.19.199.50] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5D98943FEB; Wed, 19 Nov 2025 04:38:08 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 4F68B43EC1; Wed, 19 Nov 2025 04:37:59 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 200A143EBD for ; Wed, 19 Nov 2025 04:37:58 -0500 (EST) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-164-ddkolBdgPhm21LIQk7WwmQ-1; Wed, 19 Nov 2025 04:37:56 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 382F6195605A for ; Wed, 19 Nov 2025 09:37:55 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.45.242.12]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 55379180049F for ; Wed, 19 Nov 2025 09:37:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763545077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/qh4dqZSdCqUgzYE9UrMqTu7/8rTUslXEBk/fMq2W0s=; b=JIjq2wOZhmFU2MztiuA3WO5XrmWMUqfadcmqYQfGq5CEnl9TMnzxm6rYrAK+zD39TG2Tx9 pEGjh+dol5SzLBHgFE9pEe3EVc5j3x3sk1DXqgAiNRbCcErsOPIT1xHCcgYq5r0WjCtlxk qUDQMDuN+LLrv4317DodoMRSYfi4NyY= X-MC-Unique: ddkolBdgPhm21LIQk7WwmQ-1 X-Mimecast-MFC-AGG-ID: ddkolBdgPhm21LIQk7WwmQ_1763545075 To: devel@lists.libvirt.org Subject: [PATCH 1/8] virDomainNestedJobAllowed: Allow VIR_JOB_MODIFY_MIGRATION_SAFE if VIR_JOB_MODIFY is allowed Date: Wed, 19 Nov 2025 10:37:44 +0100 Message-ID: <1ebbfa8aeb6dd9483c8e6a873ded9371b2381a0e.1763544909.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: XtIw0WWriw9RNkbFLEASp653gmYSATg2wQ37xOyqp3E_1763545075 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3FM5DNRJER2S6XFMGC2HUYHYQSMHER7J X-Message-ID-Hash: 3FM5DNRJER2S6XFMGC2HUYHYQSMHER7J X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1763545147761153000 Content-Type: text/plain; charset="utf-8" From: Peter Krempa 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 --- src/conf/virdomainjob.c | 1 + 1 file changed, 1 insertion(+) 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, virDom= ainJob newJob) { return !jobs->asyncJob || newJob =3D=3D VIR_JOB_NONE || + (newJob =3D=3D VIR_JOB_MODIFY_MIGRATION_SAFE && jobs->mask & JO= B_MASK(VIR_JOB_MODIFY)) || (jobs->mask & JOB_MASK(newJob)); } --=20 2.51.1