From nobody Wed Apr 15 07:00:21 2026 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=1775142932; cv=none; d=zohomail.com; s=zohoarc; b=caxfF9m6xm09p0zMH6afv+m253l6MUfMq8ORU8sCoDGBezLfWGJQ3aFNynZlVJZwOIKhbEALY8/vgYTdut6/vGp2VYX3SrMExomiUsdc/ytLZvDOQVEBOb2PsoG9HU1mwI2EiIE9sKG7t6qfL4gijkifEm8d2kpxqYOoeJ7olbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775142932; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=jkEu9jZ3AlWP5h2gElRUrEZqbs0L8O4iLUjHVpl+I+g=; b=lNQeQXhx5JHwil5L8XD2V0PJrBNjNbiKTY7x+fXnPsemcAFfFDscjaOVG3IzCRXaEgho/8KFzrMy8gruHsORYgXU5dv/9ZFRLv8Gu7fDIJwSZZz1aAsv1n4nK6htdsEtC/ZnvH6QTdeWiLX+zHvrWMZsC9ByHVbWZF3baloJGcw= 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 1775142932496666.6250216168155; Thu, 2 Apr 2026 08:15:32 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BA547423F1; Thu, 2 Apr 2026 11:14:51 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 6DDDD41913; Thu, 2 Apr 2026 11:13:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 579443F282; Thu, 2 Apr 2026 11:13:03 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 F28E03F368 for ; Thu, 2 Apr 2026 11:12:53 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-59-RnShm2mjPRWAUehMW79pyA-1; Thu, 02 Apr 2026 11:12:47 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 73B7A180060F for ; Thu, 2 Apr 2026 15:12:46 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CBF92180036E; Thu, 2 Apr 2026 15:12:45 +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=-4.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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=1775142768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jkEu9jZ3AlWP5h2gElRUrEZqbs0L8O4iLUjHVpl+I+g=; b=fvICDrQMqCHWIjDg0oZyg6hQuao8nJqFibw141AImolP8VRX2pr08Axbq9vUEa1Epb6o3g yT1mTrB4xoF3AgAgMG5jCTtpRLfvrO69WLV9VnsUlA/FvelvhG/A3KFZRLBA1jzvNKZSPG YaEKvC3iVqFzSTrUVartOTjFdh8WRIk= X-MC-Unique: RnShm2mjPRWAUehMW79pyA-1 X-Mimecast-MFC-AGG-ID: RnShm2mjPRWAUehMW79pyA_1775142766 To: devel@lists.libvirt.org Subject: [PATCH 01/16] qemu: require non-NULL 'cfg' in qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:25 -0400 Message-ID: <500cba14b93a6dc8ca166eebbc3699a109a0ec3d.1775142728.git.crobinso@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: PSJXq6IeG4HbKTIocqlRer5xYVM_wGwbqeqWJXxmqy8_1775142766 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XUOV3J6XN35T5LMXDJ3FCMUQUM3JQFUP X-Message-ID-Hash: XUOV3J6XN35T5LMXDJ3FCMUQUM3JQFUP X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775142934822158500 Content-Type: text/plain; charset="utf-8"; x-default="true" Every caller passes this in, we can depend on it being non-NULL. Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d4bd2a0b98..f494c6469b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6285,17 +6285,9 @@ qemuDomainGetImageIds(virQEMUDriverConfig *cfg, virSecurityDeviceLabelDef *disklabel; =20 if (uid) - *uid =3D -1; + *uid =3D cfg->user; if (gid) - *gid =3D -1; - - if (cfg) { - if (uid) - *uid =3D cfg->user; - - if (gid) - *gid =3D cfg->group; - } + *gid =3D cfg->group; =20 if ((vmlabel =3D virDomainDefGetSecurityLabelDef(def, "dac")) && vmlabel->label) --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775142868; cv=none; d=zohomail.com; s=zohoarc; b=XwXYi+ffhUwsLtdTRv7M1lw7Wn/xgCaMs9J3b3OTpLJuw8NtCpdZABCgU+14qWgCb1ZK5bHDpee6vnMyudn7IZDcErfjFkueO6zRjXox9r8JEN6arhffuq+GcD8wZINbMF2FW4Q+TPUeQmO2/CM0XuzbAiNQsfZjeA1ubDA9BQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775142868; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=uq7D3N11s8hTUpAxNYgaKc/W5EGIdN/7SQHtE2YTQYc=; b=Qi1aT7B3n0vKVO1AGQcT4uNgFqGhYsxFvauvszKaQkS8PRX4Sbg4Qh5pndxSSAzSQlCZ5elTO6SfeapxQ1+F9f2kMHJr9/habnAaQ7BiuCdz31dhHZ/0RnSjH0ALm0XP1jIerkW30H+/z4vUyf7iZdhfCWmbIDkblhcZOYNC1Mw= 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 1775142868543419.1605735767988; Thu, 2 Apr 2026 08:14:28 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5ABC6419C3; Thu, 2 Apr 2026 11:14:08 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 005E341897; Thu, 2 Apr 2026 11:13:09 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5B5EC3F863; Thu, 2 Apr 2026 11:12:56 -0400 (EDT) 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 923FE3F294 for ; Thu, 2 Apr 2026 11:12:49 -0400 (EDT) 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-340-KEU1N2RwMlSu6aYaaHBqPw-1; Thu, 02 Apr 2026 11:12:48 -0400 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 31AEF19560B3 for ; Thu, 2 Apr 2026 15:12:47 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A70D0180036E; Thu, 2 Apr 2026 15:12:46 +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=-1.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_SBL_CSS,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775142769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uq7D3N11s8hTUpAxNYgaKc/W5EGIdN/7SQHtE2YTQYc=; b=EGOvtwLGjlziYzBmCqKRWcdfNMHVaSbbWlBpre/kjiBd3173vzd+l2hopaw+uOekrh2G2U +YJJJK18nM6+fI5374NDkZrQv8DaaUyhjI5WITvYGqz0CAsIeAIuG8BTUOB4uVU3K2gWyV lGUYezeZHDjV0UWUGOZJlwvC31xYn7A= X-MC-Unique: KEU1N2RwMlSu6aYaaHBqPw-1 X-Mimecast-MFC-AGG-ID: KEU1N2RwMlSu6aYaaHBqPw_1775142767 To: devel@lists.libvirt.org Subject: [PATCH 02/16] qemu: tweak qemuDomainGetImageIds() argument handling Date: Thu, 2 Apr 2026 11:12:26 -0400 Message-ID: <1fe50d9aec42a1f333ec17912c08158f0e048daf.1775142728.git.crobinso@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: u10qkWe6jrd9weDFGDNtxWtUF9UGNZymxivcCUJEpd0_1775142767 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OYLS3AUJA44RL5JIXRUYXJ47F5DH5RIT X-Message-ID-Hash: OYLS3AUJA44RL5JIXRUYXJ47F5DH5RIT X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775142872240154100 Content-Type: text/plain; charset="utf-8"; x-default="true" + mark `def` as `const` + allow NULL `def` + allow NULL `src` Upcoming patches will need these Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 8 +++++--- src/qemu/qemu_domain.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f494c6469b..d3daa0fe17 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6276,7 +6276,7 @@ qemuDomainCleanupRun(virQEMUDriver *driver, =20 void qemuDomainGetImageIds(virQEMUDriverConfig *cfg, - virDomainDef *def, + const virDomainDef *def, virStorageSource *src, virStorageSource *parentSrc, uid_t *uid, gid_t *gid) @@ -6289,7 +6289,8 @@ qemuDomainGetImageIds(virQEMUDriverConfig *cfg, if (gid) *gid =3D cfg->group; =20 - if ((vmlabel =3D virDomainDefGetSecurityLabelDef(def, "dac")) && + if (def && + (vmlabel =3D virDomainDefGetSecurityLabelDef(def, "dac")) && vmlabel->label) virParseOwnershipIds(vmlabel->label, uid, gid); =20 @@ -6298,7 +6299,8 @@ qemuDomainGetImageIds(virQEMUDriverConfig *cfg, disklabel->label) virParseOwnershipIds(disklabel->label, uid, gid); =20 - if ((disklabel =3D virStorageSourceGetSecurityLabelDef(src, "dac")) && + if (src && + (disklabel =3D virStorageSourceGetSecurityLabelDef(src, "dac")) && disklabel->label) virParseOwnershipIds(disklabel->label, uid, gid); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b321a64e96..c8f0d2326c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -728,7 +728,7 @@ bool qemuDomainDiskChangeSupported(virDomainDiskDef *di= sk, virDomainDiskDef *orig_disk); =20 void qemuDomainGetImageIds(virQEMUDriverConfig *cfg, - virDomainDef *def, + const virDomainDef *def, virStorageSource *src, virStorageSource *parentSrc, uid_t *uid, --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143282; cv=none; d=zohomail.com; s=zohoarc; b=Bu1S0RxFlkiEG6iVr8nw2baEpTkhQ7P5a5zy1IDA6rEm21AXQsLrWLbXqVgbVzqYlujUtr+TMil0hfDPz3uKIYUwOuEDapPPgT1ptbslNs0WFeHHdKDm4LGMswOMWD8V6SosbOSgsMyJ/cue6HdE2hFvyRk6lu2zRFpA2HYnJFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143282; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=+2unrYNdn9Nt4UMOketz1b+FU/G9yVF5XHADJx/HibU=; b=mBI3F0qEw1lQlK1t1HQKkzvI953xoAbQk+F9ZfSCyYt60L0ohotoKUV8yr6HKPlui4eUP+c0ywmp+5l3bfCU8Ma8nsUS0hdFuiDzAj5PQM9Wu3quWB/+9RYcdbxoH8dH6ynmmKmZGrHFGR8t72Hn10NP5RICg6TcoWTg/K2JI/g= 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 1775143282271549.1260844682002; Thu, 2 Apr 2026 08:21:22 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 672804192F; Thu, 2 Apr 2026 11:21:01 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id E77CD41B78; Thu, 2 Apr 2026 11:13:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 741A23F83B; Thu, 2 Apr 2026 11:13:11 -0400 (EDT) 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 4472D3F83F for ; Thu, 2 Apr 2026 11:12:51 -0400 (EDT) Received: from mx-prod-mc-05.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-624-A6ZGeiD6PKWRASjv854BRA-1; Thu, 02 Apr 2026 11:12:49 -0400 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1609D195608E for ; Thu, 2 Apr 2026 15:12:48 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 66F9E180036E; Thu, 2 Apr 2026 15:12:47 +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=-1.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_SBL_CSS,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775142770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+2unrYNdn9Nt4UMOketz1b+FU/G9yVF5XHADJx/HibU=; b=LA1BwBMyhQ/zlsM4qZF9YYDFFbO9Dksr3k7go/H7KgJKCMXUdmFbSe2LnP+bXptHi4YzVk BNY95PN9HDIrg9DJaqHT0JxtakXegCXAASFQE+mUbUchcEeqwAW11YhILOl0AC5aMJPONC FK2W6M5A4/RIsSIqbdjx32LZX2/Ev/o= X-MC-Unique: A6ZGeiD6PKWRASjv854BRA-1 X-Mimecast-MFC-AGG-ID: A6ZGeiD6PKWRASjv854BRA_1775142768 To: devel@lists.libvirt.org Subject: [PATCH 03/16] qemu: saveimage: use qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:27 -0400 Message-ID: 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: pgkA0xmmcgc8p9t-2GklsByU_DYbh9XD2UkvwIFD3Q4_1775142768 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3FEBVEJAOVNFTRFV5BKRFZN32O3W5HTW X-Message-ID-Hash: 3FEBVEJAOVNFTRFV5BKRFZN32O3W5HTW X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143284490154100 Content-Type: text/plain; charset="utf-8"; x-default="true" Fixed to abide domain seclabel model=3D'dac' override Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_saveimage.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 64fbcd5f51..193d267d46 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -458,6 +458,8 @@ qemuSaveImageCreateFd(virDomainObj *vm, VIR_AUTOCLOSE fd =3D -1; int directFlag =3D 0; unsigned int wrapperFlags =3D VIR_FILE_WRAPPER_NON_BLOCKING; + uid_t uid; + gid_t gid; =20 if (!sparse && flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) { wrapperFlags |=3D VIR_FILE_WRAPPER_BYPASS_CACHE; @@ -469,7 +471,8 @@ qemuSaveImageCreateFd(virDomainObj *vm, } } =20 - fd =3D virQEMUFileOpenAs(cfg->user, cfg->group, false, path, + qemuDomainGetImageIds(cfg, vm->def, NULL, NULL, &uid, &gid); + fd =3D virQEMUFileOpenAs(uid, gid, false, path, O_WRONLY | O_TRUNC | O_CREAT | directFlag, needUnlink); =20 --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143334; cv=none; d=zohomail.com; s=zohoarc; b=Ck1eU8dLbqrXv4p1yccd5I1sRGYhvqwapHGTj3sk0B5fE3KOo9RmUHfXEzBwMwhN3KRytuq3ifyPGVTs/w4opn+QP6sIKkp5v6Ki9QS1qfV2+F4FZS++X/LWhSDkofG37PLMnflS3UqH1oLXJakXA+pT6C8n8yvr4QjY1+XoEO0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143334; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=yXCS9VcY+ko7iZYcLA4o6/kCiLVL2IJfCzfGP7F/VDQ=; b=fAJfIuOwPk6lR7GiNT0BpmEYB/Qp0cuIdY6ub3fQ99Q1fRl7bBVjAdj7vOiMsthdddyKMTjQbJfifEpALvS/umLwO8ynocZrwdQv2ALpFiFsWpmfTQvO2ccVfvMbGvJ5hEctTBjpuHHPsuLf2o4muJQVWT6mMsA5PgDwwyE+jkI= 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 1775143334603549.9652747379782; Thu, 2 Apr 2026 08:22:14 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 19988419D7; Thu, 2 Apr 2026 11:21:57 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0654841BD2; Thu, 2 Apr 2026 11:13:51 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 379C03F83B; Thu, 2 Apr 2026 11:13:12 -0400 (EDT) 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 1FD843F310 for ; Thu, 2 Apr 2026 11:12:52 -0400 (EDT) Received: from mx-prod-mc-03.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-616-4nOk5yejP-CCaFKrJRwuYA-1; Thu, 02 Apr 2026 11:12:49 -0400 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B969C1956068 for ; Thu, 2 Apr 2026 15:12:48 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 301C8180036E; Thu, 2 Apr 2026 15:12:48 +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=-1.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_SBL_CSS,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775142771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yXCS9VcY+ko7iZYcLA4o6/kCiLVL2IJfCzfGP7F/VDQ=; b=PLvHROzY9AGw8eWx/PTGUYbL64+/Ezy6tPLBpUvz/zjf/YpNU/fvf6OvFRdhPKUl4yBMLd uwp56FX9Wd6D2v8NhVDRheDnntVm/WLvg+dxQu4hiQy8motKlX0Hbg/iO+ffv8Yr+n1ui8 otz3wYnzHSdexHuALsVPzOZyT7To2tU= X-MC-Unique: 4nOk5yejP-CCaFKrJRwuYA-1 X-Mimecast-MFC-AGG-ID: 4nOk5yejP-CCaFKrJRwuYA_1775142768 To: devel@lists.libvirt.org Subject: [PATCH 04/16] qemu: domain taint: use qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:28 -0400 Message-ID: <4c02cf9960c480ffdd2c13db2a0cd730ab10155c.1775142728.git.crobinso@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: 0b2kPb8GSxSefvijboKm0fhVxEeMTaqvyf5RYe-bIHM_1775142768 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UK5M5JOERSO2OX5J2IVTZFJOFE4XQNYU X-Message-ID-Hash: UK5M5JOERSO2OX5J2IVTZFJOFE4XQNYU X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143337318154100 Content-Type: text/plain; charset="utf-8"; x-default="true" Fixed to abide domain seclabel model=3D'dac' override Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d3daa0fe17..efbcdc6d2d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5832,10 +5832,13 @@ void qemuDomainObjCheckTaint(virQEMUDriver *driver, g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivate *priv =3D obj->privateData; bool custom_hypervisor_feat =3D false; + uid_t uid; + gid_t gid; =20 + qemuDomainGetImageIds(cfg, obj->def, NULL, NULL, &uid, &gid); if (driver->privileged && - (cfg->user =3D=3D 0 || - cfg->group =3D=3D 0)) + (uid =3D=3D 0 || + gid =3D=3D 0)) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HIGH_PRIVILEGES, = logCtxt); =20 if (priv->hookRun) --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143468; cv=none; d=zohomail.com; s=zohoarc; b=FGGjhXnQbsk26wlHDt8CfwnAtHV0YKtBpsDwqOhZ1dvwpJNm6TMX4Mx++dZpmL0/hAAsAzrlC8u0lC9spSeIleSFpT8Ks/0FOX0OQSDWCWyDoaCn4R5NE5vmYxq/Hi3pw+WHunznetKhI0nXVjEQVb+2noMQMeZDEIacGxlbVzY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143468; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=g9Wu+BZPbB2gUsFMX02hRX+j4Bx1it5Y7nxuPkFxVpI=; b=ZIHF7qsmiJT/Ai+nAMB7YhSNdYwbG8s5NVXsdUl8s2Hvo2GtdZlp07JWdGIXSz+GaI9Ar0pAw5WXPp19Wk39cXvCFCML4b8EUnFj1lv8KzYR02wfq3C+/F/kNQYXJ0QpMTUJ/eoEk/EdEYAIgyR93RQG3rT1N7UcaI8RIbyQ24c= 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 1775143468934643.8175558741248; Thu, 2 Apr 2026 08:24:28 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5A06E4195D; Thu, 2 Apr 2026 11:23:30 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id B51A041CC2; Thu, 2 Apr 2026 11:13:57 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7855841990; Thu, 2 Apr 2026 11:13:18 -0400 (EDT) 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 E491F3F863 for ; Thu, 2 Apr 2026 11:12:57 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-656-KIjgG5uGMHC20YmXzofhWg-1; Thu, 02 Apr 2026 11:12:51 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 956E418005BF for ; Thu, 2 Apr 2026 15:12:49 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F0288180036E; Thu, 2 Apr 2026 15:12:48 +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=-4.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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=1775142772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g9Wu+BZPbB2gUsFMX02hRX+j4Bx1it5Y7nxuPkFxVpI=; b=h6K1pTNGNOX8yubSBM8s/s6rRd4wMY/aFvCTKJzJwY2/QSkcrUji7niHr+hF7X75AJsxuM wCUIODdcIfzarmhuQnv9+nUT5maRiXorwUasP8Qw9DOTT8G1+Lq8hsDLwtJJ+lMpf8NDF6 WwXMJ4Db0u8fCjKpk2bItvaKq2a0KJA= X-MC-Unique: KIjgG5uGMHC20YmXzofhWg-1 X-Mimecast-MFC-AGG-ID: KIjgG5uGMHC20YmXzofhWg_1775142769 To: devel@lists.libvirt.org Subject: [PATCH 05/16] qemu: migrate to file: use qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:29 -0400 Message-ID: <647b3f794f6599117d60738d4ecba476dfcb3a3a.1775142728.git.crobinso@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: HcLXydopFQIGVqxkJdvZpVFXJ8np27K7i7QX9eF1m-Y_1775142769 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UVK53R2B7MXBPPYS6IB57LROCZYHMFWJ X-Message-ID-Hash: UVK53R2B7MXBPPYS6IB57LROCZYHMFWJ X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143471459154100 Content-Type: text/plain; charset="utf-8"; x-default="true" Fixed to abide domain seclabel model=3D'dac' override Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_migration.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 33cc0f0ffe..9b172f47a0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -7251,6 +7251,8 @@ qemuMigrationSrcToSparseFile(virDomainObj *vm, int directFlag =3D 0; bool needUnlink =3D false; int ret; + uid_t uid; + gid_t gid; =20 /* When using directio with mapped-ram, qemu needs two fds. One with * O_DIRECT set writing the memory, and another without it set for @@ -7262,7 +7264,8 @@ qemuMigrationSrcToSparseFile(virDomainObj *vm, _("bypass cache unsupported by this system")); return -1; } - directFd =3D virQEMUFileOpenAs(cfg->user, cfg->group, false, path, + qemuDomainGetImageIds(cfg, vm->def, NULL, NULL, &uid, &gid); + directFd =3D virQEMUFileOpenAs(uid, gid, false, path, O_WRONLY | directFlag, &needUnlink); =20 if (directFd < 0) --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143540; cv=none; d=zohomail.com; s=zohoarc; b=ExdCDo00iMnfpKt8UEA8LFpYoSFBU7Ut2XXI/Y7BJqoaV7YFkJTPVvWgdDhACCNGd+SYqyIoAQ3HzUX2SRZb04XsgR6DWYoUOMhT7uI3RIzbpcQn3ba/0cAtC4kXj9pUOQw77m0/bnIcha4ZQnXKTFQRvLhZRKl/VE/ZjiR3VdQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143540; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=DvHxqiq6frG6hutRB09kq+/vM7PrpE5CGAgvcRzSH/o=; b=Hs6U91zm0fuhdAF9+MZJ3KPTvb8XsdI0eEr0Laf4sQridvTFDDuFhaExis6JDSabaQspPimQgFi28UUuZuaAA8w4BSmrEGSevnQNr+wl/yLDLMSUZEoff/bviYJ/Mo7Ql0oEPdbva2C5wv0uED2WCebpP87NL3yvHlrF6IY6CrI= 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 1775143540193166.88785853510626; Thu, 2 Apr 2026 08:25:40 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5E66C41B3F; Thu, 2 Apr 2026 11:24:46 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 8989341D16; Thu, 2 Apr 2026 11:14:09 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7B12C3F368; Thu, 2 Apr 2026 11:13:18 -0400 (EDT) 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 290A13F86B for ; Thu, 2 Apr 2026 11:12:58 -0400 (EDT) Received: from mx-prod-mc-05.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-618-QSrhq0gVO_SNrsD2IP002g-1; Thu, 02 Apr 2026 11:12:51 -0400 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 49F18195609E for ; Thu, 2 Apr 2026 15:12:50 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B79BB180036E; Thu, 2 Apr 2026 15:12:49 +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=-1.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_SBL_CSS,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775142772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DvHxqiq6frG6hutRB09kq+/vM7PrpE5CGAgvcRzSH/o=; b=cPdcCw9plEZ7eg60+xBIcQkA+M9djeVkDoveBgQPGexY6yrIbyHB1rIUQr50qQPNQa+2Af kE51kl4B159v2/3Bja4g+PkpL2sHirkkmu3b8OmH1+11XCp0+X+f80XN0i/win3egRKJAl Vgo9TxJ/VBX1VWPcVcYoB7bZ4ySMkGY= X-MC-Unique: QSrhq0gVO_SNrsD2IP002g-1 X-Mimecast-MFC-AGG-ID: QSrhq0gVO_SNrsD2IP002g_1775142770 To: devel@lists.libvirt.org Subject: [PATCH 06/16] qemu: core dump: use qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:30 -0400 Message-ID: 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: 7gy1elcGlS1oN3ON4WzrXFita8RQjTcoyKB9cWFtOY0_1775142770 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VXGYWIXBXHJQT7QNZ7EOXB3PSZILUWSP X-Message-ID-Hash: VXGYWIXBXHJQT7QNZ7EOXB3PSZILUWSP X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143542618154100 Content-Type: text/plain; charset="utf-8"; x-default="true" Fixed to abide domain seclabel model=3D'dac' override Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 861795724a..80e276b7df 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3103,6 +3103,8 @@ doCoreDump(virQEMUDriver *driver, const char *memory_dump_format =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autoptr(virCommand) compressor =3D NULL; + uid_t uid; + gid_t gid; =20 if (qemuSaveImageGetCompressionProgram(cfg->dumpImageFormat, &compress= or, "dump") < 0) goto cleanup; @@ -3117,7 +3119,8 @@ doCoreDump(virQEMUDriver *driver, goto cleanup; } } - if ((fd =3D virQEMUFileOpenAs(cfg->user, cfg->group, false, path, + qemuDomainGetImageIds(cfg, vm->def, NULL, NULL, &uid, &gid); + if ((fd =3D virQEMUFileOpenAs(uid, gid, false, path, O_CREAT | O_TRUNC | O_WRONLY | directFlag, &needUnlink)) < 0) goto cleanup; --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143063; cv=none; d=zohomail.com; s=zohoarc; b=hlJTjPGFZj8d9NBQHnIaMio1fX+gQmaXjcoYPP95IibrdvX0XmldbG6tKSdZLYbMru2EYhF1opasiRzcwfZDHJyy4bN6hYylkYqT5hK09yvYU56dtKD7j2ahWwJRbAxuOmqiMPuor09dRy4bhisVly+ApKt85U2ty/AfDOEDHUs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143063; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=gq15lFy1J9IUY4hHlH58YQ+fXaHptcxU2XGEoi3gdnk=; b=WmoIZS2S+g+dHF9cVEfdZ/JiLiXmsUlsMQUbBNSfTM7mSTa7bSMHWWS3bv52edNNCuYzmeYuxT6pYyjPthC6RTow20slwpHF7C7RQjne0XndNiiN/ymHkgWQAs/rH9o/A2djJ1ng0Gw2Fe6bWc71fy2bwcdHW1c0TxZOIV6fGZY= 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 1775143063125283.62560724538696; Thu, 2 Apr 2026 08:17:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 2A40A3F83C; Thu, 2 Apr 2026 11:17:00 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id A9FBF41ADD; Thu, 2 Apr 2026 11:13:33 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5D5AF418BC; Thu, 2 Apr 2026 11:13:11 -0400 (EDT) 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 68D9E3F870 for ; Thu, 2 Apr 2026 11:12:53 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-Z4ZN-yGDN6K85cGj9GfWqQ-1; Thu, 02 Apr 2026 11:12:51 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1EF0D1800345 for ; Thu, 2 Apr 2026 15:12:51 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8EA9E1800767; Thu, 2 Apr 2026 15:12:50 +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=-4.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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=1775142773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gq15lFy1J9IUY4hHlH58YQ+fXaHptcxU2XGEoi3gdnk=; b=d0oXZOG1i3kboqufKx4FdvduJts3WqrKI2bVp3CwB0ygTYDqkj7Q71twm0rXm0QzS6QeqY o6AOAa2nGs2Dpu87SXcRYKKMUuXTyRSSca0vZZHwQw5eK+2tZxP2+aSKCGEIsPUoRzi8VO cvXmfnm6FkXvqo4Bw60Xj0eN8v6r5dk= X-MC-Unique: Z4ZN-yGDN6K85cGj9GfWqQ-1 X-Mimecast-MFC-AGG-ID: Z4ZN-yGDN6K85cGj9GfWqQ_1775142771 To: devel@lists.libvirt.org Subject: [PATCH 07/16] qemu: storage stat: use qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:31 -0400 Message-ID: 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: pMnOKb1edm2elmzjTytpPfKTu0EuQxKrpgwzT5QTTeo_1775142771 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7TLUJGPK3AJKHTSQQ6YZ5XJSOLOIZDUT X-Message-ID-Hash: 7TLUJGPK3AJKHTSQQ6YZ5XJSOLOIZDUT X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143064962154100 Content-Type: text/plain; charset="utf-8"; x-default="true" Fixed to abide domain seclabel model=3D'dac' override Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index efbcdc6d2d..30c4c596df 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11599,6 +11599,9 @@ qemuDomainStorageOpenStat(virQEMUDriverConfig *cfg, struct stat *ret_sb, bool skipInaccessible) { + uid_t uid; + gid_t gid; + if (virStorageSourceIsLocalStorage(src)) { if (skipInaccessible && !virFileExists(src->path)) return 0; @@ -11616,7 +11619,8 @@ qemuDomainStorageOpenStat(virQEMUDriverConfig *cfg, if (skipInaccessible && virStorageSourceSupportsBackingChainTraver= sal(src) <=3D 0) return 0; =20 - if (virStorageSourceInitAs(src, cfg->user, cfg->group) < 0) + qemuDomainGetImageIds(cfg, vm->def, src, NULL, &uid, &gid); + if (virStorageSourceInitAs(src, uid, gid) < 0) return -1; =20 if (virStorageSourceStat(src, ret_sb) < 0) { --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143396; cv=none; d=zohomail.com; s=zohoarc; b=TR3VeQ2kfuooIoxuDsbMJTSw5h6CWIHvsaFa6Dn7Zb4ah1lDyF9s9s9MUYKhQ2ArXQcLiFMIjRe1i7+zBTjJjrpmr0zCmylvKI/1ym/77Gdas0wytx34aSVYpggBNXj6JnZlUy1fxwocBY2Mj9SqtSnPGIo3i/ov/aKCJdNZRaY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143396; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=3p064sJ8ovHPOH6vFYvGbG7NQF2ThtykXcQ+gJpILwA=; b=YkifpEeAJQchorqi9sJysY3zF3SVO8yjnW+GbzweMJ8+/uzNSUpnR/N38onluKaoXJI+/ZokbElRs7j05BEeq1r9U2O4WX/k8JA6moaUSap0aG8b1maIRIba6HIj1VtMgJljcJeI2yWwM3I0nHv0sCMLZkx+Ep6H4zWhq4ZIsOo= 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 1775143396658167.37772299598453; Thu, 2 Apr 2026 08:23:16 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id EBE924197E; Thu, 2 Apr 2026 11:22:32 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id AE46941C4B; Thu, 2 Apr 2026 11:13:56 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 680814198E; Thu, 2 Apr 2026 11:13:18 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 72AA93F871 for ; Thu, 2 Apr 2026 11:12:59 -0400 (EDT) Received: from mx-prod-mc-05.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-689-MwAjGJCrOeObwe-Gyvd3nQ-1; Thu, 02 Apr 2026 11:12:52 -0400 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC54A195608D for ; Thu, 2 Apr 2026 15:12:51 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 56EE718001FE; Thu, 2 Apr 2026 15:12:51 +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=-1.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_SBL_CSS,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775142774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3p064sJ8ovHPOH6vFYvGbG7NQF2ThtykXcQ+gJpILwA=; b=YrEnrMHqZQp+w3P0ptsxGGJKQIfGcUvKfR83h771siJBK74E39MQW9SWmyQdfma3PdBxO5 x0gRc3PgFKkNjmxcjVi1GpuOfpxyRSCr/dSGNjmWcW8gMFHXOSay0EiTDOqLQskMZZ0P4p PIOOBQoAdKbiFKpeg2OkONGEqsEwac4= X-MC-Unique: MwAjGJCrOeObwe-Gyvd3nQ-1 X-Mimecast-MFC-AGG-ID: MwAjGJCrOeObwe-Gyvd3nQ_1775142772 To: devel@lists.libvirt.org Subject: [PATCH 08/16] qemu: tpm: use qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:32 -0400 Message-ID: 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: 0OhTa8_aPu6hYbLP2PZ0ojO4qTV5UtDdaexcYsxhY1c_1775142772 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UI4ASGSX4EVXBOMK6BC6HCAQMAX3WHQQ X-Message-ID-Hash: UI4ASGSX4EVXBOMK6BC6HCAQMAX3WHQQ X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143397048158500 Content-Type: text/plain; charset="utf-8"; x-default="true" Fixed to abide domain seclabel model=3D'dac' override Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_tpm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 660410bcba..dacceac678 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -1316,16 +1316,20 @@ qemuExtTPMPrepareHost(virQEMUDriver *driver, { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *shortName =3D virDomainDefGetShortName(def); + uid_t uid; + gid_t gid; =20 if (!shortName) return -1; =20 + qemuDomainGetImageIds(cfg, def, NULL, NULL, &uid, &gid); + return qemuTPMEmulatorPrepareHost(tpm, cfg->swtpmLogDir, cfg->swtpm_user, cfg->swtpm_group, cfg->swtpmStateDir, - cfg->user, + uid, shortName); } =20 --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143126; cv=none; d=zohomail.com; s=zohoarc; b=V1uzdVa+1veX40xB+Ndy2X+XYeK06mgecKgp8ctMv01ld1iSQAi2gpXKK9LIg2sxBtG00KX+KBg0983hpfJTmXu1UXGceoXznBR8Oi2jbCXM/ZFH3jiqYFc7lgl7C/RyC2eZrSSAzbTHPL6XRWLlw9UfGy1aKfF/yaNezK5Dk84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143126; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=QVH9lLrSw9vkic0guAC/xq+UdQqiugP1fqoEenIl03k=; b=hy5VVnrkiISK8t2tkFDkFD93M9bMYGiOhbrabZSKoNnClVNOuQLEkPjBJhpKcA1/xDIteODX9Q5kIuo3gKqFx19izrjbC7hjhH/aOB50e8fOO8i9ORkehZJN1RT0cBiW7zszGhjwG8ifdjS1NMNnbe1myo9C7av0XxHx0B4+cYA= 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 1775143126610600.4113752655048; Thu, 2 Apr 2026 08:18:46 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id DE2C93F83C; Thu, 2 Apr 2026 11:18:13 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 4813B41B18; Thu, 2 Apr 2026 11:13:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 73BCD3F870; Thu, 2 Apr 2026 11:13:11 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 79C1C3F83B for ; Thu, 2 Apr 2026 11:12:55 -0400 (EDT) Received: from mx-prod-mc-03.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-19-XawotLi2Pfyx8n_YDMXXUg-1; Thu, 02 Apr 2026 11:12:53 -0400 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ED9C01956060 for ; Thu, 2 Apr 2026 15:12:52 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1F1D31800767; Thu, 2 Apr 2026 15:12:52 +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=-2.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,T_SPF_TEMPERROR 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=1775142775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QVH9lLrSw9vkic0guAC/xq+UdQqiugP1fqoEenIl03k=; b=OQhcCH616O3mrGZWbQlENpN6AGyTiwj+dCDcBnUeOLM8zrA6T1CZemu14YXhSeDQCPowBz 0QWh8aDb+ZWlmfagm1dN10dwlwmEQhBzZ40y8iF+hj52pG1Bigpu7aUsM7i1US0RZZw1sr WztjNCVd2BkYsb/gVTePWtMDAYTqQYk= X-MC-Unique: XawotLi2Pfyx8n_YDMXXUg-1 X-Mimecast-MFC-AGG-ID: XawotLi2Pfyx8n_YDMXXUg_1775142773 To: devel@lists.libvirt.org Subject: [PATCH 09/16] qemu: block copy: use qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:33 -0400 Message-ID: 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: SmZXAAM86cCYGyQ16-LbQBlSkZhK-Oi_51Azp7s3qmo_1775142773 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HQU4QAAOM43RR4QGJZEAMKLF6BZAHKWS X-Message-ID-Hash: HQU4QAAOM43RR4QGJZEAMKLF6BZAHKWS X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143127994154100 Content-Type: text/plain; charset="utf-8"; x-default="true" Fixed to abide domain seclabel model=3D'dac' override Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 80e276b7df..59b9601360 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14310,6 +14310,8 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, bool syncWrites =3D !!(flags & VIR_DOMAIN_BLOCK_COPY_SYNCHRONOUS_WRITE= S); bool targetIsZero =3D !!(flags & VIR_DOMAIN_BLOCK_COPY_TARGET_ZEROED); int rc =3D 0; + uid_t uid; + gid_t gid; =20 /* Preliminaries: find the disk we are editing, sanity checks */ virCheckFlags(VIR_DOMAIN_BLOCK_COPY_SHALLOW | @@ -14414,10 +14416,11 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, * can also pass the RAW flag or use XML to tell us the format. * So if we get here, we assume it is safe for us to probe the * format from the file that we will be using. */ + qemuDomainGetImageIds(cfg, vm->def, NULL, NULL, &uid, &gid); if (!supports_detect || !virStorageSourceIsLocalStorage(mirror) || - (mirror->format =3D virStorageFileProbeFormat(mirror->path= , cfg->user, - cfg->group)) <= 0) { + (mirror->format =3D virStorageFileProbeFormat(mirror->path= , uid, + gid)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("reused mirror destination format must be= specified")); goto endjob; --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143734; cv=none; d=zohomail.com; s=zohoarc; b=mIV2vby+xOsCIdJQAnjAJGfnETzjT8S91RlX2eAqQ97Yy5ctsk8f+wTxiD5O7kHBMvyndHKVXfwZQHcmCP+KgkxkZxDoyeGuloIAX/Vyn4HOfpt4g3TUGo0J/gw+QfIkyECEuxuDsW1ZC/38DqaZCUBwfb18h8QjH2YJw9P6UnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143734; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=BaR7izcHEnka2axREyZkIdFnmOPjqbKwVSp7Cp/pSps=; b=hmnVry14S0zanlkYJ48josj5YcK4Ms47HZhGCFs5IlaDswiQbJ0AliGsUZCsBFEJjUF0i4V4Fkh9UoPRLn5GyYInsfKKFdDZLe+Yp5bpQl8DDqjmzk+QmlYvXNbkJRGGAItm52Cec8wvIXwhuk6FATJAJntNG3rZ4oIEsXhhLuI= 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 1775143734606559.4152365564752; Thu, 2 Apr 2026 08:28:54 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 90A1041A09; Thu, 2 Apr 2026 11:27:45 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id ADBDF41DDA; Thu, 2 Apr 2026 11:14:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7E4323F942; Thu, 2 Apr 2026 11:13:37 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 119333F878 for ; Thu, 2 Apr 2026 11:13:01 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-125-ebGi3rc5Pa6ohyM4uzAlPg-1; Thu, 02 Apr 2026 11:12:54 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ADDA41800345 for ; Thu, 2 Apr 2026 15:12:53 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 31CB118001FE; Thu, 2 Apr 2026 15:12:53 +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=-4.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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=1775142775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BaR7izcHEnka2axREyZkIdFnmOPjqbKwVSp7Cp/pSps=; b=SSCF8Nr3nHpKovddxfoDbVg4FbxT6cs/6oq8b/yXMVjWWta2dBOB/4PS/A1RhhGpMzBFjo WW/sD4hLMtlFJhQY5Pfia+wM5xIAsdliqL5d4ldTzd8HRtB8ihWAUmIxZf+VxslPTQju/a 3QRbhf1SDNAPEG+trI8KFADeQXDrGhA= X-MC-Unique: ebGi3rc5Pa6ohyM4uzAlPg-1 X-Mimecast-MFC-AGG-ID: ebGi3rc5Pa6ohyM4uzAlPg_1775142773 To: devel@lists.libvirt.org Subject: [PATCH 10/16] qemu: cpu compare: use qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:34 -0400 Message-ID: <4cd1da8f6e84a55d4a22aa062a03f372d05ed7cd.1775142728.git.crobinso@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: qhSWVTw-JEZoP2eP1dRcY3HRRPBe4zWPaPOdXXmNKp4_1775142773 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: MXINWOJL5Q2VVAVK2TX5UWPIQYXHTWLH X-Message-ID-Hash: MXINWOJL5Q2VVAVK2TX5UWPIQYXHTWLH X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143735752154100 Content-Type: text/plain; charset="utf-8"; x-default="true" This does not change behavior, but it eliminates direct usage of `cfg->user` which makes for easier auditing Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 59b9601360..0cfd42b0e1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11756,6 +11756,8 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, g_autoptr(virCPUDef) cpu =3D NULL; virArch arch; virDomainVirtType virttype; + uid_t uid; + gid_t gid; =20 virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE | VIR_CONNECT_COMPARE_CPU_VALIDATE_XML, @@ -11810,8 +11812,10 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, return VIR_CPU_COMPARE_ERROR; } } + + qemuDomainGetImageIds(cfg, NULL, NULL, NULL, &uid, &gid); return qemuConnectCPUModelComparison(qemuCaps, cfg->libDir, - cfg->user, cfg->group, + uid, gid, hvCPU, cpu, failIncompatible); } =20 @@ -11996,6 +12000,8 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, g_auto(GStrv) features =3D NULL; unsigned int physAddrSize =3D 0; size_t i; + uid_t uid; + gid_t gid; =20 virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES | VIR_CONNECT_BASELINE_CPU_MIGRATABLE | @@ -12057,8 +12063,9 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSIO= N)) { bool expand_features =3D (flags & VIR_CONNECT_BASELINE_CPU_EXPAND_= FEATURES); =20 + qemuDomainGetImageIds(cfg, NULL, NULL, NULL, &uid, &gid); if (!(cpu =3D qemuConnectCPUModelBaseline(qemuCaps, cfg->libDir, - cfg->user, cfg->group, + uid, gid, expand_features, cpus, ncp= us, cpuModels))) goto cleanup; --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143668; cv=none; d=zohomail.com; s=zohoarc; b=BTq932VSNSG6HrYjnwc4L9ElRhMnSxmnkSwQp1Q3z5PTSNs4q2R7RUfbCMy0pAkwSOJivOyi6m1eKMgUl87zcgRB4hJB3+TT1FSN6uA34ehaqOq3aNdKNDlT1Dakv98rWFqIYcZWqml9ZC74ZGycWU3kbbvaVaDzDDPju/IXP/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143668; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=P/RVLdwVLfLUW1w0BuUG3AIcCAktvXbPuhPeKlhF85E=; b=L2FonrJjV/ZzsyW500wYgLnP/6l/NdwYMuh/SwFnEQpZk7OH0lI5RLrQAOfII/Gooc4zAnnfc40eBcwr+n6wZ9v+1bcHyGsnIUs6Kxw0pp2q/zB0A5wnTbeBRKQ6iHfKu/dwCU2ICH9lPBkfzooCtATeMR9PsU/pmA6mJVNFQ+Y= 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 17751436688133.0322061591681404; Thu, 2 Apr 2026 08:27:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4D45141C03; Thu, 2 Apr 2026 11:26:29 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 03CA441D90; Thu, 2 Apr 2026 11:14:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5D7BF3F8A2; Thu, 2 Apr 2026 11:13:36 -0400 (EDT) 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 B5B103F874 for ; Thu, 2 Apr 2026 11:13:02 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-604-vtzM8D8ZOcm7LhWSRUFzvw-1; Thu, 02 Apr 2026 11:12:55 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EC4001800371 for ; Thu, 2 Apr 2026 15:12:54 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E7822180036E; Thu, 2 Apr 2026 15:12:53 +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=-4.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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=1775142777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P/RVLdwVLfLUW1w0BuUG3AIcCAktvXbPuhPeKlhF85E=; b=bpBd2NeekGzxRIaRxWucbEno4JivC9ofCkt7xe3u1RQotYk/XAVth5otOfWiEpJ51U3tE9 kANZ9cjkWks1NRI9cBC8EwZhElEiPcg6D44FRLJopucuCXUWdk1X7hzD/k//PtQgm5rFA/ wH36zh8yDMVBMaO2J4drF3V3rVsMbZM= X-MC-Unique: vtzM8D8ZOcm7LhWSRUFzvw-1 X-Mimecast-MFC-AGG-ID: vtzM8D8ZOcm7LhWSRUFzvw_1775142775 To: devel@lists.libvirt.org Subject: [PATCH 11/16] qemu: nvram: use qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:35 -0400 Message-ID: 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: 1bf06Qf77cjhJpHG7r-tSdfWk2tKaRU6AGrjcOnvykU_1775142775 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DB6PIW2IIQVP44SM6AAXXZV44L2U3FCE X-Message-ID-Hash: DB6PIW2IIQVP44SM6AAXXZV44L2U3FCE X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143670669154100 Content-Type: text/plain; charset="utf-8"; x-default="true" This does not change behavior, but it eliminates direct usage of 'cfg->user' which makes for easier auditing Signed-off-by: Cole Robinson --- src/qemu/qemu_process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7ebc038e54..a921bbcea8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4926,6 +4926,8 @@ qemuPrepareNVRAMFileCommon(virQEMUDriver *driver, g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); VIR_AUTOCLOSE srcFD =3D -1; struct qemuPrepareNVRAMHelperData data; + uid_t uid; + gid_t gid; =20 if (!path) return 0; @@ -4951,9 +4953,10 @@ qemuPrepareNVRAMFileCommon(virQEMUDriver *driver, data.srcFD =3D srcFD; data.srcPath =3D template; =20 + qemuDomainGetImageIds(cfg, NULL, NULL, NULL, &uid, &gid); if (virFileRewrite(path, S_IRUSR | S_IWUSR, - cfg->user, cfg->group, + uid, gid, qemuPrepareNVRAMHelper, &data) < 0) { return -1; --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143835; cv=none; d=zohomail.com; s=zohoarc; b=e99C6oykjYQkDDhYQ0AxnNU8U9gMCZc/gStnrK459yda5tYdu2LU33OPh0y2EPsH99xEevYtZ+ujACTUA1sbM8TSnoznN64Qp9rcJ3IG0jiwclywV89xJXKXxvgPakDfZUUFsLN749aTSPhiL1eZ7ird8BdUAey9eS9DfW14dTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143835; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=ilKDvKVu0eWgMS/E2tKDB8aKZzPHEQInC9I2HDiFQGU=; b=Y1mD/EE5pn7KbqOLIECt30pyLKfZly2LV2mB0z6pwBLsjUdocoVKzhKRV1RK8yI81IKNXmscbrs+i1aNdvoGrLTzDiXMy9WBzSrhU8YS/8rx4EUgl7lgDzdLpmi7+D0PKZyAj7AD4KbnSaB+baIN4ZJ6x7GWIP5v0kV8nIbSfdA= 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 1775143835288271.5278505427782; Thu, 2 Apr 2026 08:30:35 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BC4D33F89A; Thu, 2 Apr 2026 11:30:14 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 58F4E41E1E; Thu, 2 Apr 2026 11:14:33 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 146F43F8EE; Thu, 2 Apr 2026 11:13:38 -0400 (EDT) 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 551E93F2FB for ; Thu, 2 Apr 2026 11:13:03 -0400 (EDT) Received: from mx-prod-mc-05.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-184-rbWIfuRTM8WuKyv7LWwsWw-1; Thu, 02 Apr 2026 11:12:56 -0400 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E824719560AE for ; Thu, 2 Apr 2026 15:12:55 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0DB7A1800767; Thu, 2 Apr 2026 15:12: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=-2.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,T_SPF_TEMPERROR 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=1775142778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ilKDvKVu0eWgMS/E2tKDB8aKZzPHEQInC9I2HDiFQGU=; b=JZp29N1fjvtif0QR+CVAPi4Ejp/otMvPzZQ9SiWvlBlKBYCGytQ8Ib7A+nX9zAuCfBaAZE 1fPV5p4kANhMm8ye29S6j5XA/SxXEaHeBktHNFCoGT5WSNE5uRPoS6GyHXycfAMZERoWTO 0GHO3BooNZw5w2p79fujFAWXl9aA1YI= X-MC-Unique: rbWIfuRTM8WuKyv7LWwsWw-1 X-Mimecast-MFC-AGG-ID: rbWIfuRTM8WuKyv7LWwsWw_1775142776 To: devel@lists.libvirt.org Subject: [PATCH 12/16] qemu: simplify qemuProcessPrepareDomainStorage() args Date: Thu, 2 Apr 2026 11:12:36 -0400 Message-ID: <4035c05ef886e584114ad500507f27dfe9de6d26.1775142728.git.crobinso@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: nU5MQMnsIt63F9ZvOuzMt359SUvDyShzPlSIgsBKnHc_1775142776 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: AOFN4EI53ZKJBD2H4IJKL6IJGZGT2EZI X-Message-ID-Hash: AOFN4EI53ZKJBD2H4IJKL6IJGZGT2EZI X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143837613154100 Content-Type: text/plain; charset="utf-8"; x-default="true" Variously 'cfg', 'driver', and 'priv' data are passed around the callstack, but we can get all of those as needed by passing around a single virDomainObj. Upcoming patches need vm->def as well, so let's clean this up first Signed-off-by: Cole Robinson --- src/qemu/qemu_backup.c | 12 ++--- src/qemu/qemu_domain.c | 97 +++++++++++++++++++++------------------- src/qemu/qemu_domain.h | 12 ++--- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 6 +-- src/qemu/qemu_process.c | 15 +++---- src/qemu/qemu_snapshot.c | 6 +-- 7 files changed, 69 insertions(+), 81 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 65a083ea74..a953d1879b 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -272,11 +272,8 @@ qemuBackupDiskPrepareDataOne(virDomainObj *vm, struct qemuBackupDiskData *dd, virJSONValue *actions, bool pull, - GHashTable *blockNamedNodeData, - virQEMUDriverConfig *cfg) + GHashTable *blockNamedNodeData) { - qemuDomainObjPrivate *priv =3D vm->privateData; - /* set data structure */ dd->backupdisk =3D backupdisk; dd->store =3D dd->backupdisk->store; @@ -315,7 +312,7 @@ qemuBackupDiskPrepareDataOne(virDomainObj *vm, dd->backingStore =3D dd->terminator =3D virStorageSourceNew(); } =20 - if (qemuDomainPrepareStorageSourceBlockdev(NULL, dd->store, priv, cfg)= < 0) + if (qemuDomainPrepareStorageSourceBlockdev(NULL, dd->store, vm) < 0) return -1; =20 if (dd->backupdisk->incremental) { @@ -398,7 +395,6 @@ qemuBackupDiskPrepareData(virDomainObj *vm, virDomainBackupDef *def, GHashTable *blockNamedNodeData, virJSONValue *actions, - virQEMUDriverConfig *cfg, struct qemuBackupDiskData **rdd) { struct qemuBackupDiskData *disks =3D NULL; @@ -418,7 +414,7 @@ qemuBackupDiskPrepareData(virDomainObj *vm, ndisks++; =20 if (qemuBackupDiskPrepareDataOne(vm, backupdisk, dd, actions, pull, - blockNamedNodeData, cfg) < 0) + blockNamedNodeData) < 0) goto error; =20 if (pull) { @@ -883,7 +879,7 @@ qemuBackupBegin(virDomainObj *vm, goto endjob; =20 if ((ndd =3D qemuBackupDiskPrepareData(vm, def, blockNamedNodeData, ac= tions, - cfg, &dd)) <=3D 0) { + &dd)) <=3D 0) { if (ndd =3D=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("no disks selected for backup")); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 30c4c596df..bed8c558d0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6124,10 +6124,11 @@ qemuDomainSetFakeReboot(virDomainObj *vm, } =20 static void -qemuDomainCheckRemoveOptionalDisk(virQEMUDriver *driver, - virDomainObj *vm, +qemuDomainCheckRemoveOptionalDisk(virDomainObj *vm, size_t diskIndex) { + qemuDomainObjPrivate *priv =3D vm->privateData; + virQEMUDriver *driver =3D priv->driver; char uuid[VIR_UUID_STRING_BUFLEN]; virObjectEvent *event =3D NULL; virDomainDiskDef *disk =3D vm->def->disks[diskIndex]; @@ -6176,8 +6177,7 @@ qemuDomainCheckRemoveOptionalDisk(virQEMUDriver *driv= er, * clears any reported error if 0 is returned. */ int -qemuDomainCheckDiskStartupPolicy(virQEMUDriver *driver, - virDomainObj *vm, +qemuDomainCheckDiskStartupPolicy(virDomainObj *vm, size_t diskIndex, bool cold_boot) { @@ -6209,7 +6209,7 @@ qemuDomainCheckDiskStartupPolicy(virQEMUDriver *drive= r, break; } =20 - qemuDomainCheckRemoveOptionalDisk(driver, vm, diskIndex); + qemuDomainCheckRemoveOptionalDisk(vm, diskIndex); virResetLastError(); return 0; } @@ -6416,10 +6416,10 @@ qemuDomainPrepareStorageSourceConfig(virStorageSour= ce *src, static int qemuDomainPrepareStorageSource(virStorageSource *src, virDomainObj *vm, - virDomainDiskDef *disk, - virQEMUDriverConfig *cfg) + virDomainDiskDef *disk) { qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); =20 /* convert detected ISO format to 'raw' as qemu would not understand i= t */ if (src->format =3D=3D VIR_STORAGE_FILE_ISO) @@ -6432,7 +6432,7 @@ qemuDomainPrepareStorageSource(virStorageSource *src, qemuDomainPrepareDiskSourceData(disk, src); =20 if (!qemuDiskBusIsSD(disk->bus) && - qemuDomainPrepareStorageSourceBlockdev(disk, src, priv, cfg) < 0) + qemuDomainPrepareStorageSourceBlockdev(disk, src, vm) < 0) return -1; =20 return 0; @@ -6548,15 +6548,15 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver, * backing chain we need to also consider the data store part of the c= urrent * image */ if (src->dataFileStore && !hadDataStore && - qemuDomainPrepareStorageSource(src->dataFileStore, vm, disk, cfg) = < 0) + qemuDomainPrepareStorageSource(src->dataFileStore, vm, disk) < 0) return -1; =20 for (n =3D src->backingStore; virStorageSourceIsBacking(n); n =3D n->b= ackingStore) { - if (qemuDomainPrepareStorageSource(n, vm, disk, cfg) < 0) + if (qemuDomainPrepareStorageSource(n, vm, disk) < 0) return -1; =20 if (n->dataFileStore && - qemuDomainPrepareStorageSource(n->dataFileStore, vm, disk, cfg= ) < 0) + qemuDomainPrepareStorageSource(n->dataFileStore, vm, disk) < 0) return -1; } =20 @@ -9101,11 +9101,12 @@ qemuDomainPrepareStorageSourceNFS(virStorageSource = *src) */ static bool qemuDomainPrepareStorageSourceNbdkit(virStorageSource *src, - virQEMUDriverConfig *cfg, const char *alias, - qemuDomainObjPrivate *priv) + virDomainObj *vm) { g_autoptr(qemuNbdkitCaps) nbdkit =3D NULL; + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); =20 if (!cfg->storageUseNbdkit) return false; @@ -9135,10 +9136,12 @@ qemuDomainPrepareStorageSourceNbdkit(virStorageSour= ce *src, */ static int qemuDomainPrepareStorageSourceTLS(virStorageSource *src, - virQEMUDriverConfig *cfg, - const char *parentAlias, - qemuDomainObjPrivate *priv) + virDomainObj *vm, + const char *parentAlias) { + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); + if (virStorageSourceGetActualType(src) !=3D VIR_STORAGE_TYPE_NETWORK) return 0; =20 @@ -9781,9 +9784,11 @@ qemuDomainPrepareDiskCachemode(virDomainDiskDef *dis= k) =20 static int qemuDomainPrepareStorageSourcePR(virStorageSource *src, - qemuDomainObjPrivate *priv, + virDomainObj *vm, const char *parentalias) { + qemuDomainObjPrivate *priv =3D vm->privateData; + if (!src->pr) return 0; =20 @@ -9804,16 +9809,17 @@ qemuDomainPrepareStorageSourcePR(virStorageSource *= src, /** * qemuDomainPrepareDiskSourceLegacy: * @disk: disk to prepare - * @priv: VM private data - * @cfg: qemu driver config + * @vm: domain object * * Prepare any disk source relevant data for use with the -drive command l= ine. */ static int qemuDomainPrepareDiskSourceLegacy(virDomainDiskDef *disk, - qemuDomainObjPrivate *priv, - virQEMUDriverConfig *cfg) + virDomainObj *vm) { + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); + if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps) < 0) return -1; =20 @@ -9828,11 +9834,10 @@ qemuDomainPrepareDiskSourceLegacy(virDomainDiskDef = *disk, disk->info.alias) < 0) return -1; =20 - if (qemuDomainPrepareStorageSourcePR(disk->src, priv, disk->info.alias= ) < 0) + if (qemuDomainPrepareStorageSourcePR(disk->src, vm, disk->info.alias) = < 0) return -1; =20 - if (qemuDomainPrepareStorageSourceTLS(disk->src, cfg, disk->info.alias, - priv) < 0) + if (qemuDomainPrepareStorageSourceTLS(disk->src, vm, disk->info.alias)= < 0) return -1; =20 return 0; @@ -9841,8 +9846,9 @@ qemuDomainPrepareDiskSourceLegacy(virDomainDiskDef *d= isk, =20 static int qemuDomainPrepareStorageSourceFDs(virStorageSource *src, - qemuDomainObjPrivate *priv) + virDomainObj *vm) { + qemuDomainObjPrivate *priv =3D vm->privateData; qemuDomainStorageSourcePrivate *srcpriv =3D NULL; virStorageType actualType =3D virStorageSourceGetActualType(src); virDomainFDTuple *fdt =3D NULL; @@ -9898,16 +9904,17 @@ static int qemuDomainPrepareStorageSourceBlockdevNodename(virDomainDiskDef *disk, virStorageSource *src, const char *nodenameprefix, - qemuDomainObjPrivate *priv, - virQEMUDriverConfig *cfg) + virDomainObj *vm) { + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); char *nodestorage =3D g_strdup_printf("%s-storage", nodenameprefix); const char *encryptionAlias =3D nodestorage; =20 /* qemuBlockStorageSourceSetStorageNodename steals 'nodestorage' */ qemuBlockStorageSourceSetStorageNodename(src, nodestorage); =20 - if (qemuDomainPrepareStorageSourceFDs(src, priv) < 0) + if (qemuDomainPrepareStorageSourceFDs(src, vm) < 0) return -1; =20 if (qemuBlockStorageSourceNeedsFormatLayer(src, priv->qemuCaps)) { @@ -9933,18 +9940,17 @@ qemuDomainPrepareStorageSourceBlockdevNodename(virD= omainDiskDef *disk, qemuDomainPrepareStorageSourceConfig(src, cfg); qemuDomainPrepareDiskSourceData(disk, src); =20 - if (!qemuDomainPrepareStorageSourceNbdkit(src, cfg, nodestorage, priv)= ) { + if (!qemuDomainPrepareStorageSourceNbdkit(src, nodestorage, vm)) { /* If we're using nbdkit to serve the storage source, we don't pass * authentication secrets to qemu, but will pass them to nbdkit in= stead */ if (qemuDomainSecretStorageSourcePrepareAuth(priv, src, nodestorag= e) < 0) return -1; } =20 - if (qemuDomainPrepareStorageSourcePR(src, priv, nodestorage) < 0) + if (qemuDomainPrepareStorageSourcePR(src, vm, nodestorage) < 0) return -1; =20 - if (qemuDomainPrepareStorageSourceTLS(src, cfg, nodestorage, - priv) < 0) + if (qemuDomainPrepareStorageSourceTLS(src, vm, nodestorage) < 0) return -1; =20 if (qemuDomainPrepareStorageSourceNFS(src) < 0) @@ -9973,24 +9979,24 @@ qemuDomainPrepareThrottleFilterBlockdev(virDomainTh= rottleFilterDef *filter, int qemuDomainPrepareStorageSourceBlockdev(virDomainDiskDef *disk, virStorageSource *src, - qemuDomainObjPrivate *priv, - virQEMUDriverConfig *cfg) + virDomainObj *vm) { + qemuDomainObjPrivate *priv =3D vm->privateData; g_autofree char *nodenameprefix =3D NULL; =20 src->id =3D qemuDomainStorageIDNew(priv); =20 nodenameprefix =3D g_strdup_printf("libvirt-%u", src->id); =20 - return qemuDomainPrepareStorageSourceBlockdevNodename(disk, src, noden= ameprefix, priv, cfg); + return qemuDomainPrepareStorageSourceBlockdevNodename(disk, src, noden= ameprefix, vm); } =20 =20 static int qemuDomainPrepareDiskSourceBlockdev(virDomainDiskDef *disk, - qemuDomainObjPrivate *priv, - virQEMUDriverConfig *cfg) + virDomainObj *vm) { + qemuDomainObjPrivate *priv =3D vm->privateData; qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); virStorageSource *n; size_t i; @@ -10000,11 +10006,11 @@ qemuDomainPrepareDiskSourceBlockdev(virDomainDisk= Def *disk, diskPriv->nodeCopyOnRead =3D g_strdup_printf("libvirt-CoR-%s", dis= k->dst); =20 for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { - if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0) + if (qemuDomainPrepareStorageSourceBlockdev(disk, n, vm) < 0) return -1; =20 if (n->dataFileStore && - qemuDomainPrepareStorageSourceBlockdev(disk, n->dataFileStore,= priv, cfg) < 0) + qemuDomainPrepareStorageSourceBlockdev(disk, n->dataFileStore,= vm) < 0) return -1; } =20 @@ -10018,8 +10024,7 @@ qemuDomainPrepareDiskSourceBlockdev(virDomainDiskDe= f *disk, =20 int qemuDomainPrepareDiskSource(virDomainDiskDef *disk, - qemuDomainObjPrivate *priv, - virQEMUDriverConfig *cfg) + virDomainObj *vm) { /* Nothing to prepare as it will use -chardev instead * of -blockdev/-drive option. */ @@ -10040,10 +10045,10 @@ qemuDomainPrepareDiskSource(virDomainDiskDef *dis= k, } =20 if (!qemuDiskBusIsSD(disk->bus)) { - if (qemuDomainPrepareDiskSourceBlockdev(disk, priv, cfg) < 0) + if (qemuDomainPrepareDiskSourceBlockdev(disk, vm) < 0) return -1; } else { - if (qemuDomainPrepareDiskSourceLegacy(disk, priv, cfg) < 0) + if (qemuDomainPrepareDiskSourceLegacy(disk, vm) < 0) return -1; } =20 @@ -10451,8 +10456,7 @@ qemuDomainDefHasManagedPR(virDomainObj *vm) * 'libvirt-pflash1-format' for pflash1. */ int -qemuDomainInitializePflashStorageSource(virDomainObj *vm, - virQEMUDriverConfig *cfg) +qemuDomainInitializePflashStorageSource(virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; virDomainDef *def =3D vm->def; @@ -10476,8 +10480,7 @@ qemuDomainInitializePflashStorageSource(virDomainOb= j *vm, if (qemuDomainPrepareStorageSourceBlockdevNodename(NULL, def->os.loader-= >nvram, "libvirt-pflash= 1", - priv, - cfg) < 0) + vm) < 0) return -1; } =20 diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index c8f0d2326c..a3ce85bc8e 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -709,8 +709,7 @@ qemuDomainRemoveInactiveLocked(virDomainObj *vm); void qemuDomainSetFakeReboot(virDomainObj *vm, bool value); =20 -int qemuDomainCheckDiskStartupPolicy(virQEMUDriver *driver, - virDomainObj *vm, +int qemuDomainCheckDiskStartupPolicy(virDomainObj *vm, size_t diskIndex, bool cold_boot); =20 @@ -767,8 +766,7 @@ int qemuDomainStorageSourceAccessAllow(virQEMUDriver *d= river, =20 int qemuDomainPrepareStorageSourceBlockdev(virDomainDiskDef *disk, virStorageSource *src, - qemuDomainObjPrivate *priv, - virQEMUDriverConfig *cfg); + virDomainObj *vm); =20 void qemuDomainCleanupAdd(virDomainObj *vm, qemuDomainCleanupCallback cb); @@ -1031,8 +1029,7 @@ qemuDomainValidateStorageSource(virStorageSource *src, =20 int qemuDomainPrepareDiskSource(virDomainDiskDef *disk, - qemuDomainObjPrivate *priv, - virQEMUDriverConfig *cfg); + virDomainObj *vm); =20 bool qemuDomainDiskCachemodeFlags(virDomainDiskCache cachemode, @@ -1070,8 +1067,7 @@ qemuDomainMakeCPUMigratable(virArch arch, virCPUDef *origCPU); =20 int -qemuDomainInitializePflashStorageSource(virDomainObj *vm, - virQEMUDriverConfig *cfg); +qemuDomainInitializePflashStorageSource(virDomainObj *vm); =20 bool qemuDomainDiskHasLatencyHistogram(virDomainDiskDef *disk); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0cfd42b0e1..95c843451e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14481,7 +14481,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, /* we must initialize XML-provided chain prior to detecting to keep se= mantics * with VM startup */ for (n =3D mirror; virStorageSourceIsBacking(n); n =3D n->backingStore= ) { - if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0) + if (qemuDomainPrepareStorageSourceBlockdev(disk, n, vm) < 0) goto endjob; } =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9439948089..458b1d1eca 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -608,8 +608,6 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver, virStorageSource *newsrc, bool force) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - qemuDomainObjPrivate *priv =3D vm->privateData; virStorageSource *oldsrc =3D disk->src; qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); int rc; @@ -628,7 +626,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver, if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) < 0) goto rollback; =20 - if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) + if (qemuDomainPrepareDiskSource(disk, vm) < 0) goto rollback; =20 if (qemuDomainStorageSourceChainAccessAllow(driver, vm, newsrc) < 0) @@ -1072,7 +1070,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver = *driver, goto cleanup; =20 if (!virStorageSourceIsEmpty(disk->src)) { - if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) + if (qemuDomainPrepareDiskSource(disk, vm) < 0) goto cleanup; =20 if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) < 0) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a921bbcea8..612698463d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6840,10 +6840,7 @@ qemuProcessPrepareDeviceBootorder(virDomainDef *def) =20 =20 static int -qemuProcessPrepareDomainStorage(virQEMUDriver *driver, - virDomainObj *vm, - qemuDomainObjPrivate *priv, - virQEMUDriverConfig *cfg, +qemuProcessPrepareDomainStorage(virDomainObj *vm, unsigned int flags) { size_t i; @@ -6854,14 +6851,14 @@ qemuProcessPrepareDomainStorage(virQEMUDriver *driv= er, virDomainDiskDef *disk =3D vm->def->disks[idx]; =20 if (virDomainDiskTranslateSourcePool(disk) < 0) { - if (qemuDomainCheckDiskStartupPolicy(driver, vm, idx, cold_boo= t) < 0) + if (qemuDomainCheckDiskStartupPolicy(vm, idx, cold_boot) < 0) return -1; =20 /* disk source was dropped */ continue; } =20 - if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) + if (qemuDomainPrepareDiskSource(disk, vm) < 0) return -1; } =20 @@ -7122,7 +7119,7 @@ qemuProcessPrepareDomain(virQEMUDriver *driver, return -1; =20 VIR_DEBUG("Setting up storage"); - if (qemuProcessPrepareDomainStorage(driver, vm, priv, cfg, flags) < 0) + if (qemuProcessPrepareDomainStorage(vm, flags) < 0) return -1; =20 VIR_DEBUG("Setting up host devices"); @@ -7144,7 +7141,7 @@ qemuProcessPrepareDomain(virQEMUDriver *driver, VIR_DEBUG("Prepare bios/uefi paths"); if (qemuFirmwareFillDomain(driver, vm->def, false) < 0) return -1; - if (qemuDomainInitializePflashStorageSource(vm, cfg) < 0) + if (qemuDomainInitializePflashStorageSource(vm) < 0) return -1; =20 VIR_DEBUG("Preparing external devices"); @@ -7436,7 +7433,7 @@ qemuProcessPrepareHostStorage(virQEMUDriver *driver, else if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) >=3D= 0) continue; =20 - if (qemuDomainCheckDiskStartupPolicy(driver, vm, idx, cold_boot) >= =3D 0) + if (qemuDomainCheckDiskStartupPolicy(vm, idx, cold_boot) >=3D 0) continue; =20 return -1; diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 82ae38ca29..e71282d559 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1257,12 +1257,10 @@ qemuSnapshotDiskBitmapsPropagate(qemuSnapshotDiskDa= ta *dd, static int qemuSnapshotDiskPrepareOneBlockdev(virDomainObj *vm, qemuSnapshotDiskData *dd, - virQEMUDriverConfig *cfg, bool reuse, GHashTable *blockNamedNodeData, virDomainAsyncJob asyncJob) { - qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virStorageSource) terminator =3D NULL; int rc; =20 @@ -1271,7 +1269,7 @@ qemuSnapshotDiskPrepareOneBlockdev(virDomainObj *vm, terminator =3D virStorageSourceNew(); =20 if (qemuDomainPrepareStorageSourceBlockdev(dd->disk, dd->src, - priv, cfg) < 0) + vm) < 0) return -1; =20 if (!(dd->crdata =3D qemuBuildStorageSourceChainAttachPrepareBlockdevT= op(dd->src, @@ -1371,7 +1369,7 @@ qemuSnapshotDiskPrepareOne(qemuSnapshotDiskContext *s= napctxt, =20 dd->prepared =3D true; =20 - if (qemuSnapshotDiskPrepareOneBlockdev(vm, dd, snapctxt->cfg, reuse, + if (qemuSnapshotDiskPrepareOneBlockdev(vm, dd, reuse, blockNamedNodeData, snapctxt->a= syncJob) < 0) return -1; =20 --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143955; cv=none; d=zohomail.com; s=zohoarc; b=avtwOb8uyq3bzh2TQXH6fJ68EfCMnd5DfU9KGFLPbjF7pD4wvoWmMMEd6TDNm2wTCFZ58LArHsbqwD1nULJRTvIEQx6yx2DVAiTZRJ8F6E3TLnumumYiNAAdmpMZ1t83h8Xvet/enjPCj1CO4O3WLQrGwiEGj2ZlD8y34cGa+0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143955; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=6OdVbUEhddX1sfZJ3qimJU5jq688u8GihSh9yCiPyvE=; b=dkBncR1A1kL8P4yKO7fLGyTnAHd9JcUupQ3M2FPS49qIJFVe25y/DNy/Lja4ha3gVvQ4tvZ4KhWzjPrcDePv1bQAtaVWRTe7T4bRFWbz/qAmCtufpKjBg4VHx92fQ7ZDQ6brS/7+wGDaMCDb/cQRIAJP67A2v/KQ+tutCizOoYI= 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 1775143955409537.8018895975536; Thu, 2 Apr 2026 08:32:35 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E46BC4196B; Thu, 2 Apr 2026 11:31:39 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C528043DC0; Thu, 2 Apr 2026 11:14:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 91A3441832; Thu, 2 Apr 2026 11:13:45 -0400 (EDT) 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 46F6E3F8E4 for ; Thu, 2 Apr 2026 11:13:04 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-300-KpvHOlfsPGWBSkXWQxPPvw-1; Thu, 02 Apr 2026 11:12:57 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C706D1800610 for ; Thu, 2 Apr 2026 15:12:56 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2B3A918001FE; Thu, 2 Apr 2026 15:12:56 +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=-4.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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=1775142779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6OdVbUEhddX1sfZJ3qimJU5jq688u8GihSh9yCiPyvE=; b=CLc668MsJq4p6h962ovkaU6PUL4Ml+r/vO8uthVakxj8QDjPyuIV03CO+jh9fxnZBMgsvU cXj2LCv5ofBqYjF9LdOXsm9lkFumL+RnCU3kY0rEwCFjvaTkU0jINy4wbMIja89nWlFKxX D0NDNRSRYHcfo08oS+4zijQUQCkOCEs= X-MC-Unique: KpvHOlfsPGWBSkXWQxPPvw-1 X-Mimecast-MFC-AGG-ID: KpvHOlfsPGWBSkXWQxPPvw_1775142776 To: devel@lists.libvirt.org Subject: [PATCH 13/16] qemu: nbdkit: use qemuDomainGetImageIds() Date: Thu, 2 Apr 2026 11:12:37 -0400 Message-ID: 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: ipZ_qbrwqcVOVHJ4kTNDGY83G1LtW9wjH732AlJhUKg_1775142776 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RE3TRIOGP2WUHVAUFLRK4J3L3YU2ZWJT X-Message-ID-Hash: RE3TRIOGP2WUHVAUFLRK4J3L3YU2ZWJT X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143957988154100 Content-Type: text/plain; charset="utf-8"; x-default="true" Fixed to abide domain seclabel model=3D'dac' override Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bed8c558d0..c89030b60c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9107,6 +9107,8 @@ qemuDomainPrepareStorageSourceNbdkit(virStorageSource= *src, g_autoptr(qemuNbdkitCaps) nbdkit =3D NULL; qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); + uid_t uid; + gid_t gid; =20 if (!cfg->storageUseNbdkit) return false; @@ -9118,8 +9120,9 @@ qemuDomainPrepareStorageSourceNbdkit(virStorageSource= *src, if (!nbdkit) return false; =20 + qemuDomainGetImageIds(cfg, vm->def, NULL, NULL, &uid, &gid); return qemuNbdkitInitStorageSource(nbdkit, src, priv->libDir, - alias, cfg->user, cfg->group); + alias, uid, gid); } =20 =20 --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775144033; cv=none; d=zohomail.com; s=zohoarc; b=STeN0GEWxn5BA2aOU+qWXDsX3qmM2yxJ3IEYoBDPEg+mSf6T39YXvN9SzNAu108Sv13b3HM7+w4RHjMVj6LMKbEgpaRg40SjxyKid5uQnh1kZ4Z75dmQbsL6dKpw1WcFmOTEq6HQzQwdnTUAOY0InMxl+Qw4ZelYxnZyLubq4Ag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775144033; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=3qgEJDfTpSjwo2Pj+GPNDDrK1D+sdq4x3WSIFYLsZWo=; b=MfYSLdCQRcvm2CS1wxWPjZDa7M7nX/4+XuI4tBUFseDiKdehayuit2FIKrwoZ629kqmSWmIo4zT6coc7CT2blF5p5XL56F+p2RMjAEwG2yv3gcsDNCGkBtKEdScw7pjki2rbRWOqiOb9yZayxCIqGF+zdEs6ylszYn52xUkB9kM= 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 1775144033785342.72027819103994; Thu, 2 Apr 2026 08:33:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4BD1A3F895; Thu, 2 Apr 2026 11:33:38 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 4EEC243E22; Thu, 2 Apr 2026 11:15:00 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 81E974184B; Thu, 2 Apr 2026 11:14:17 -0400 (EDT) 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 40AF74186D for ; Thu, 2 Apr 2026 11:13:06 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-342-fVu9X9jrNZ6eSM3iuRxv7A-1; Thu, 02 Apr 2026 11:12:59 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E1EEE1800365 for ; Thu, 2 Apr 2026 15:12:57 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0AAF5180036E; Thu, 2 Apr 2026 15:12:56 +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=-4.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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=1775142780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3qgEJDfTpSjwo2Pj+GPNDDrK1D+sdq4x3WSIFYLsZWo=; b=QvZ+Icomy0caZj0VsVgzNq5K7qXfxaDFldyHtG3sD9/ryGWbqm6wQwn+yjwpOLVUTdB7QB /lkEegkoiGK8EiiQEP8oRhz51oJ9ATNHiDnRWbQDCOOwfdi1L+0ah1JdAXIvU/b4wVJazj Mu8zUpqM0uA7mDByxL3tTOnfxmvPzxI= X-MC-Unique: fVu9X9jrNZ6eSM3iuRxv7A-1 X-Mimecast-MFC-AGG-ID: fVu9X9jrNZ6eSM3iuRxv7A_1775142778 To: devel@lists.libvirt.org Subject: [PATCH 14/16] qemu: remove qemuDomainOpenFile() TODO comment Date: Thu, 2 Apr 2026 11:12:38 -0400 Message-ID: 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: kGEWfzOJU_ulTocuKpDdyaJx--ArtON1O64q1geILZw_1775142778 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DBUPRQU5JRGTH5MVQ3WEGL33WEHG6UNM X-Message-ID-Hash: DBUPRQU5JRGTH5MVQ3WEGL33WEHG6UNM X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775144035019154100 Content-Type: text/plain; charset="utf-8"; x-default="true" qemuDomainOpenFile() only acts on the 'dac' driver, where 'label' and 'imagelabel' are always identical (see virSecurityDACGenLabel()). So there's nothing TODO here Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c89030b60c..6695f32c01 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10701,7 +10701,6 @@ qemuDomainOpenFile(virQEMUDriverConfig *cfg, bool dynamicOwnership =3D cfg->dynamicOwnership; virSecurityLabelDef *seclabel; =20 - /* TODO: Take imagelabel into account? */ if (def && (seclabel =3D virDomainDefGetSecurityLabelDef(def, "dac")) !=3D NU= LL && seclabel->label !=3D NULL && --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143604; cv=none; d=zohomail.com; s=zohoarc; b=IFRhZOoKQBGOTzamsMQplnlgM3yh0wlixndxtcjTQnHZERneff0Z/UpuoTHESzk7ylXETXo1A+4CyWYqz22SKlRD08OKJn34ULJ7nWdFDzQX+AIf6Kf/3+yO6D35tu1ksvdLyxH4zX0otZMCT3pxmjPIs6stB54txAlEP6NOhNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143604; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=Wbv6gSkzNB4E6ISj2ZKO41wt6JokLkNxhWjsqwvLCyU=; b=KxCclzedUau/jUO20cyUDjt7bgl2SftLQv6P2fr7g85VX5SyA0wsysgKfGEdMmEBJymcZbxFLIRgLxn/hM9PBQkqdNvLDwf69ibx0bgGdaxziurVJK+EKYB8VSDk8IgsK4SmVYr8soErwf97Md+sXDZbV1Ielv2vmUjv1FINTlo= 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 1775143604691361.4115581253527; Thu, 2 Apr 2026 08:26:44 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B9F4E41B2B; Thu, 2 Apr 2026 11:25:44 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id F3BEA41CCD; Thu, 2 Apr 2026 11:14:15 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 8CAEB41A09; Thu, 2 Apr 2026 11:13:26 -0400 (EDT) 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 1BF343F86E for ; Thu, 2 Apr 2026 11:13:01 -0400 (EDT) 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-304-Bj8XCQk5PLuqGhyAw6HYvg-1; Thu, 02 Apr 2026 11:12:59 -0400 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 ABE8B19560AF for ; Thu, 2 Apr 2026 15:12:58 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2628518001FE; Thu, 2 Apr 2026 15:12:58 +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=-1.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_SBL_CSS,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775142780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wbv6gSkzNB4E6ISj2ZKO41wt6JokLkNxhWjsqwvLCyU=; b=ZWyWH8T5ALG00RYsVVONJnNiY6cApCjqfyBPU3CkCOh2wTClsh9X7DDaWuDHvGsj771K+s nhl4qW1uiXVAcPrPkMzzLHhDniIcD7TtqdRgVTn9xv+D9Kj4ciPsI+F70e6ujoOaUxk98I GSKao+zdiZvPa2BgpFcOwv2iolOxfCg= X-MC-Unique: Bj8XCQk5PLuqGhyAw6HYvg-1 X-Mimecast-MFC-AGG-ID: Bj8XCQk5PLuqGhyAw6HYvg_1775142778 To: devel@lists.libvirt.org Subject: [PATCH 15/16] qemu: don't check virParseOwnershipIds() error Date: Thu, 2 Apr 2026 11:12:39 -0400 Message-ID: <1ce7691ca745d40f83012b21363a6a4f518d30b2.1775142729.git.crobinso@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: OGmA83H3v4PCnJLc_x9f2rjKBqRP5ra1ZRTO91oz0zQ_1775142778 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Z656BKFE2AQDNVY7DS4KIHB6PEUK5CNH X-Message-ID-Hash: Z656BKFE2AQDNVY7DS4KIHB6PEUK5CNH X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143607747154101 Content-Type: text/plain; charset="utf-8"; x-default="true" This matches the behavior of qemuDomainGetImageIds() which we are about to convert to. I think it's safe to depend on the security driver to have already validated this for us. Signed-off-by: Cole Robinson --- src/qemu/qemu_domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6695f32c01..a0f41c436e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10703,9 +10703,8 @@ qemuDomainOpenFile(virQEMUDriverConfig *cfg, =20 if (def && (seclabel =3D virDomainDefGetSecurityLabelDef(def, "dac")) !=3D NU= LL && - seclabel->label !=3D NULL && - (virParseOwnershipIds(seclabel->label, &user, &group) < 0)) - return -EINVAL; + seclabel->label !=3D NULL) + virParseOwnershipIds(seclabel->label, &user, &group); =20 return virQEMUFileOpenAs(user, group, dynamicOwnership, path, oflags, needUnlink); --=20 2.53.0 From nobody Wed Apr 15 07:00:21 2026 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=1775143898; cv=none; d=zohomail.com; s=zohoarc; b=LSiNyqrddnPoSaToHYSsnyhNFFnl9gx3rasHoI2xDlx4rFO9KLBGQka5h4qb9cFXLOKhhecmx6xPPuFQSI0/HyWhsEqZsxdVfhfmYUn/OxNtzni7D93dm4005rAnW9MKjpUZ3n4Pd3WDsJMpD/cfzo7IoVrVdkRGaxTFI20eooA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775143898; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=8kImFGjMBwfnupkztHK4FiF6VoSq15Y6Y9+j0ZAs3Vc=; b=IeuJabhCkNRYMXkoKYhLX+jVesC16zdvSxp59qB6zCDwiRde4iOuK38CNzX3x/vravEJUa/h5xbiS2S749SLG9JQpx9t1osIRV7NBYDlDw2KUstOn8I6woQwFzuwuyWImnSzRkdirMR2bca1I1TXJSmAw2VpG66dVxl6AlRCz9Y= 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 177514389826295.83091966733741; Thu, 2 Apr 2026 08:31:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 9F57641B00; Thu, 2 Apr 2026 11:30:56 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 10792423E3; Thu, 2 Apr 2026 11:14:49 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 75E343F83E; Thu, 2 Apr 2026 11:13:38 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 386183F87A for ; Thu, 2 Apr 2026 11:13:07 -0400 (EDT) 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-325-CpB0tmXEN5abSixVNLP9Zg-1; Thu, 02 Apr 2026 11:13:00 -0400 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 C71B019560B2 for ; Thu, 2 Apr 2026 15:12:59 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E2E68180036E; Thu, 2 Apr 2026 15:12:58 +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=-1.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_SBL_CSS,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775142781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8kImFGjMBwfnupkztHK4FiF6VoSq15Y6Y9+j0ZAs3Vc=; b=WRXmigx8vTYy1Mrbulb1gvIyr3Cy71nLn5F/omcWeVhh6RQuIlqC29cH//hflzWDZVJRYL eoJ6T69aWnQfxRcDjYaY+njpTlNbm7cWcTkd93YO0ZkEk42vu4tx+hBS27NG0OPgpVFuGS SRhh5aAGuW7hCGNZsp/6IpTaEX2DgE8= X-MC-Unique: CpB0tmXEN5abSixVNLP9Zg-1 X-Mimecast-MFC-AGG-ID: CpB0tmXEN5abSixVNLP9Zg_1775142779 To: devel@lists.libvirt.org Subject: [PATCH 16/16] qemu: use qemuDomainGetImageIds() in qemuDomainOpenFile() Date: Thu, 2 Apr 2026 11:12:40 -0400 Message-ID: <672d8240373255b035dba94d2ada2a3de68be4ae.1775142729.git.crobinso@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: _hzAhe-i83nPkSNUVX2DAq4LZhqSWW5tRAknHurJdqg_1775142779 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 4VPE2THS43I6F6LLRCYUXXLCGOWXM346 X-Message-ID-Hash: 4VPE2THS43I6F6LLRCYUXXLCGOWXM346 X-MailFrom: crobinso@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 CC: Cole Robinson 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: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775143900162158500 Content-Type: text/plain; charset="utf-8"; x-default="true" This does not change behavior, but it eliminates direct usage of 'cfg->user' which makes for easier auditing Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a0f41c436e..83d4bb124e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10696,17 +10696,12 @@ qemuDomainOpenFile(virQEMUDriverConfig *cfg, int oflags, bool *needUnlink) { - uid_t user =3D cfg->user; - gid_t group =3D cfg->group; bool dynamicOwnership =3D cfg->dynamicOwnership; - virSecurityLabelDef *seclabel; + uid_t uid; + gid_t gid; =20 - if (def && - (seclabel =3D virDomainDefGetSecurityLabelDef(def, "dac")) !=3D NU= LL && - seclabel->label !=3D NULL) - virParseOwnershipIds(seclabel->label, &user, &group); - - return virQEMUFileOpenAs(user, group, dynamicOwnership, + qemuDomainGetImageIds(cfg, def, NULL, NULL, &uid, &gid); + return virQEMUFileOpenAs(uid, gid, dynamicOwnership, path, oflags, needUnlink); } =20 --=20 2.53.0