From nobody Mon Feb 9 05:41:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1649405526; cv=none; d=zohomail.com; s=zohoarc; b=SPnirq9HB8vLfGUrw/bldIlDj7f4KVoj4Dy47i6BJ4MPvgIxbhMH/tH9wXFD6v4ziWQqHnSHF4WoD0nerX01eJ6CIBqGZZCX+ONRDatEmYDdG1+X3cqiCq5CSd2rMzmp08KGWy8X5FqTsk5y7/DFc9pDktdWPetuJZwz0v4j9/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649405526; 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=pCDSyI+Emzd3OHzpmybgziaajVLQonoe1ZiIfbRzqgY=; b=NyDLejRYOnsaxNm92RxSce+sOLbGIbOxY5zsNsrdd6uXsyTeznoC/krzjlZEMQvU/C3ZX2Qj8Qlg1D56F9f3uqjLIViYssaYSsnECDuS+MxRFTR8mRCJbrNn/2O+Ha0uO5OUJ9fH4uvchETBEDAR+sDoD9ufegxw10/VX7fAJ+g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1649405526795339.3988905728678; Fri, 8 Apr 2022 01:12:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-587-wEJqXIxCPs-ilb4vE4xcQg-1; Fri, 08 Apr 2022 04:10:57 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBAF280418F; Fri, 8 Apr 2022 08:10:54 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB5A0C4C7BD; Fri, 8 Apr 2022 08:10:54 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 03EE21940357; Fri, 8 Apr 2022 08:10:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 499F11940341 for ; Fri, 8 Apr 2022 08:10:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3D55154ACBC; Fri, 8 Apr 2022 08:10:53 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id D95ED54ACBF for ; Fri, 8 Apr 2022 08:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649405525; 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=pCDSyI+Emzd3OHzpmybgziaajVLQonoe1ZiIfbRzqgY=; b=TOkdaPY/+EVFg6wxYGtAZj8RcmK4g+OSInRyiZL4Hbzqk8uOjdiLLunD6GvHF0vqwbQ4ZO jQw60mJpAmlArcATVYwOyfsI0o9pSvv0ASm1Gz8sJ0DilDp2ETZzB8L76CrGcdZR+cwT43 sPt9oft2iqzXNntXiF6kCfmSTA1fIC8= X-MC-Unique: wEJqXIxCPs-ilb4vE4xcQg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 10/17] virDomainDiskSourcePoolDefParse: Switch to virXMLPropEnumDefault() Date: Fri, 8 Apr 2022 10:08:49 +0200 Message-Id: <5714b41d6ec9cc3640a472d8c824f2a0248925f3.1649405101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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) X-ZM-MESSAGEID: 1649405528771100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The virDomainDiskSourcePoolDefParse() function uses old style of parsing XML (virXMLPropString + str2enum conversion). Use virXMLPropEnumDefault() which encapsulates those steps. Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 12 ++++-------- src/conf/storage_source_conf.h | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cb4b43ea23..3bbc5f2214 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8157,7 +8157,6 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node, { virStorageSourcePoolDef *source; int ret =3D -1; - g_autofree char *mode =3D NULL; =20 *srcpool =3D NULL; =20 @@ -8165,7 +8164,6 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node, =20 source->pool =3D virXMLPropString(node, "pool"); source->volume =3D virXMLPropString(node, "volume"); - mode =3D virXMLPropString(node, "mode"); =20 /* CD-ROM and Floppy allows no source */ if (!source->pool && !source->volume) { @@ -8180,13 +8178,11 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node, goto cleanup; } =20 - if (mode && - (source->mode =3D virStorageSourcePoolModeTypeFromString(mode)) <= =3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown source mode '%s' for volume type disk"), - mode); + if (virXMLPropEnum(node, "mode", + virStorageSourcePoolModeTypeFromString, + VIR_XML_PROP_NONZERO, + &source->mode) < 0) goto cleanup; - } =20 *srcpool =3D g_steal_pointer(&source); ret =3D 0; diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index 3afad96bdb..b99a952702 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -200,7 +200,7 @@ struct _virStorageSourcePoolDef { int voltype; /* virStorageVolType, internal only */ int pooltype; /* virStoragePoolType from storage_conf.h, internal only= */ virStorageType actualtype; /* internal only */ - int mode; /* virStorageSourcePoolMode, currently makes sense only for = iscsi pool */ + virStorageSourcePoolMode mode; /* currently makes sense only for iscsi= pool */ }; =20 =20 --=20 2.35.1