From nobody Sun Feb 8 12:15:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618587512; cv=none; d=zohomail.com; s=zohoarc; b=BR44sW7P8Uj1Ra5rAV8hQGKExCVVuw3pRB+1s+NApWDo5BS8/xxFQAdHQBWUtktcptKgX+jDDyhYbgxrqA+2eWy+oDZlX5v5DOr0S2pjeNnMVfvFMt8zoCRzvmJ/aaOHxXOwj1+ULYETJm70JvwoiFNQKYhdtD2sq0kYf8ph4CQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618587512; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=d3cYQ1hOdwb5myWV+uSgIDZOFYimW6fa1QoCfYtrSbY=; b=Tky6V7h7SKkXM4p8jNzJMTL8jQVnP1JCEEpmLiPqEJSyiQ7fGsXL1t95tdwuN9eBANsk+c76q7erJTe0/uztjjY7368oEjpAIL7nEEvmHaZFf1UwCtEvXhdUZ3sT3WQCX0oW7RSByHw9bB3RjZSSoGC1MB/ybHdRUwhvHhWyvh0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 161858751238429.11797560497064; Fri, 16 Apr 2021 08:38:32 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-257-5iMlYoyXMi2RjbCYPmC2RA-1; Fri, 16 Apr 2021 11:38:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE519108BD06; Fri, 16 Apr 2021 15:38:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C0EF213470; Fri, 16 Apr 2021 15:38:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 886C01806D17; Fri, 16 Apr 2021 15:38:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13GFYsXV009256 for ; Fri, 16 Apr 2021 11:34:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 80EE91C4; Fri, 16 Apr 2021 15:34:54 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id E302D5C3DF for ; Fri, 16 Apr 2021 15:34:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618587511; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=d3cYQ1hOdwb5myWV+uSgIDZOFYimW6fa1QoCfYtrSbY=; b=HxinWZ5pqFqvF59GThtCufBIPXI1F/1c5ehJNIZ4C5YIXD3NqV3LjTDRm9PUGjG1wdD0ob l8dsgewvt7tMnqR/t2EOkaV5lvCP9wVUi3jp7yT5WwB6pLaVeIQFIBhmJKuJPVQVZtrxW/ 8tRTzpdH92WHida5Vbx2CTW1RQn1IDA= X-MC-Unique: 5iMlYoyXMi2RjbCYPmC2RA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/25] conf: domain: Introduce an internal variant of virDomainDiskDefNew Date: Fri, 16 Apr 2021 17:34:23 +0200 Message-Id: <4edd7fbf396d6e4e10db557330b89dfcaef1e054.1618587222.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The XML element parser is going to be modified so that the virStorageSource bits are pre-parsed. Add virDomainDiskDefNewSource, which uses an existing 'src' pointer. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 57cad6ffde..f59d17930b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2230,25 +2230,32 @@ virDomainDefGetVcpusTopology(const virDomainDef *de= f, } -virDomainDiskDef * -virDomainDiskDefNew(virDomainXMLOption *xmlopt) +static virDomainDiskDef * +virDomainDiskDefNewSource(virDomainXMLOption *xmlopt, + virStorageSource **src) { + void *privateData =3D NULL; virDomainDiskDef *ret; - ret =3D g_new0(virDomainDiskDef, 1); - - ret->src =3D virStorageSourceNew(); - if (xmlopt && xmlopt->privateData.diskNew && - !(ret->privateData =3D xmlopt->privateData.diskNew())) - goto error; + !(privateData =3D xmlopt->privateData.diskNew())) + return NULL; + + ret =3D g_new0(virDomainDiskDef, 1); + ret->src =3D g_steal_pointer(src); + ret->privateData =3D privateData; return ret; +} - error: - virDomainDiskDefFree(ret); - return NULL; + +virDomainDiskDef * +virDomainDiskDefNew(virDomainXMLOption *xmlopt) +{ + g_autoptr(virStorageSource) src =3D virStorageSourceNew(); + + return virDomainDiskDefNewSource(xmlopt, &src); } --=20 2.30.2