From nobody Fri Nov 21 10:09:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1762514980; cv=none; d=zohomail.com; s=zohoarc; b=COK88mhVR2S665NTCykUW74+qo7HzmW3IfbSWlgZjV5XJUqBpT5mHFWi60kiCCSQnh2AbqEHcy0iN31HtIjKaPyiUDOXDZfYQTs5xzVKGgCjzJdnx/JJivysmaum1Re5JjspgZOLxvXA/g+qSQvwpDJhgenh8DVjBczhAa9mi+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762514980; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=wZq20wX+eyNWAXqGY4CNkDjzVztCLzL3eanFbBuo3Jc=; b=QeonGoLlhQlWX+o9doxQF56MEWS9DmB+pL9AQkdIAd9aMKPFF0kouy7cpf/wRDyAwIuUjiASt5UD19F8X+AWSUDvIj1MNoprxaszmjcNBctwxsoJNxmVjf5et6l6ElCnqTX8vwSD0eqfx1ivpzyMukmWDUFdxCkQlYFI9wyBCVM= 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 1762514980011315.8637452906288; Fri, 7 Nov 2025 03:29:40 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 33D01443F0; Fri, 7 Nov 2025 06:29:37 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id B2C4C4438E; Fri, 7 Nov 2025 06:26:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 37D0D41A2A; Fri, 7 Nov 2025 06:25:08 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0C1BF4406A for ; Fri, 7 Nov 2025 06:25:07 -0500 (EST) 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-164-1XfQh4zKN-a9iEgda-4W1w-1; Fri, 07 Nov 2025 06:25:05 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 B188E1800561 for ; Fri, 7 Nov 2025 11:25:04 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0990918002B6 for ; Fri, 7 Nov 2025 11:25:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762514706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wZq20wX+eyNWAXqGY4CNkDjzVztCLzL3eanFbBuo3Jc=; b=IsOLZN4psNt26k7jbgtceBe2PfBm0PjzwprEk+WzXQpntxLMGtSqNGoJieO/m+BTjN2Ti9 0TaoCyCwu4Z/E32rIvtYTpRsT5+VH0jXN9ZPclt4DZaS04aFc0QH+yD02ow1sIl1sJGDRQ F3/f6AGsbLDnXSUoLmZgTXYVKc927TE= X-MC-Unique: 1XfQh4zKN-a9iEgda-4W1w-1 X-Mimecast-MFC-AGG-ID: 1XfQh4zKN-a9iEgda-4W1w_1762514704 To: devel@lists.libvirt.org Subject: [PATCH 2/5] ch: Use correct domain definition in chDomainGetXMLDesc() Date: Fri, 7 Nov 2025 12:24:56 +0100 Message-ID: <40654ea234061d00ff80b40bd83072ffda83fd30.1762514684.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: kDK0HnVqAdow23YihAFwg_eA5Toix5i_bXTYAd4yQrI_1762514704 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TGKCFG6DUK535GLJQX7BPB4WKABXPP6D X-Message-ID-Hash: TGKCFG6DUK535GLJQX7BPB4WKABXPP6D X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1762514983266158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The chDomainGetXMLDesc() function claims to support VIR_DOMAIN_XML_INACTIVE to obtain the persistent definition of a running domain (in its call to virCheckFlags()) but in fact, it's always passing vm->def to virDomainDefFormat(). So far, there's no harm done because CH driver never sets domain def as transient. But that'll change. Signed-off-by: Michal Privoznik --- src/ch/ch_driver.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index ad13306c4c..8ec90e1192 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -1277,6 +1277,7 @@ static char *chDomainGetXMLDesc(virDomainPtr dom, { virCHDriver *driver =3D dom->conn->privateData; virDomainObj *vm; + virDomainDef *def; char *ret =3D NULL; =20 virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS, NULL); @@ -1287,7 +1288,13 @@ static char *chDomainGetXMLDesc(virDomainPtr dom, if (virDomainGetXMLDescEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; =20 - ret =3D virDomainDefFormat(vm->def, driver->xmlopt, + if ((flags & VIR_DOMAIN_XML_INACTIVE) && vm->newDef) { + def =3D vm->newDef; + } else { + def =3D vm->def; + } + + ret =3D virDomainDefFormat(def, driver->xmlopt, virDomainDefFormatConvertXMLFlags(flags)); =20 cleanup: --=20 2.51.0