From nobody Wed May 15 21:29:21 2024 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=1621515051; cv=none; d=zohomail.com; s=zohoarc; b=ALceZ6sGxxzlxNKwtGDSukOE7D8ne70kdXUcHcCjPUmuWyrQk2J3/LWcrbQdBMrw1HidDD0fX0WFw7EI1wxdysGLN4G2e0siW8WumDlNGXVokgJbjVGyM29Zh4/1+rBsethyn1Jy9dilFDb1KWls7SKQ+sCc8JLkz/Va7qPfFQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621515051; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=lq8/n01rC5WCZqs7UqZDJkPKI3AsKHjrUBa8nSAqnHo=; b=RDNkdcXwL6UEFqylLz8FvOOKVI/f+YXUgCqa3lrE/aOmi69ZWcZaX8nXMKyqEQ3SrdzSlmnPzYL9X2XPY5tPdbEmEJSAY3OiRMZNVQ1klTTSintCjE3WevI0VfvEX61gJtS1324UhAOFvmvJ3vr/3UnRJAJ0vD2Pk5eR4wwdu1Q= 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 1621515051663468.02726185006213; Thu, 20 May 2021 05:50:51 -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-269-ArOtNqCNN_WP9HpAlKMbiw-1; Thu, 20 May 2021 08:50:46 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0BE7E107ACCA; Thu, 20 May 2021 12:50:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 40402100238C; Thu, 20 May 2021 12:50:37 +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 B338955353; Thu, 20 May 2021 12:50:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14KCk8dr001122 for ; Thu, 20 May 2021 08:46:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7C2E319718; Thu, 20 May 2021 12:46:08 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.244]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE7381A87B for ; Thu, 20 May 2021 12:46:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621515050; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lq8/n01rC5WCZqs7UqZDJkPKI3AsKHjrUBa8nSAqnHo=; b=DqI1ekThIgCEOhgpj5RMMx+9HdB+gjX1gYxVpuKrQNDKcci3WL0LLfPCZRHTkhEJzQBAgx 9HGT1zacGPKb+j9TQGMXMPSI0/nNIxTYHU16MA4Gvgs7gQlO3hapsLEmnlrrHJMKltduh7 9b1Ui7+WARaxYY8XKd/OFlNisFyAZak= X-MC-Unique: ArOtNqCNN_WP9HpAlKMbiw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2] virNodeDevCapMdevParseXML: Use virXMLPropEnum() for ./start/@type Date: Thu, 20 May 2021 14:46:02 +0200 Message-Id: <27e7ae5b83c6e53f93507f89e4bdc095dfb7e041.1621514713.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.84 on 10.5.11.22 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" Signed-off-by: Michal Privoznik Reviewed-by: Boris Fiuczynski Reviewed-by: Peter Krempa --- v2 of: https://listman.redhat.com/archives/libvir-list/2021-May/msg00604.html diff to v1: - Switch from virXMLPropEnum() to virXMLPropEnumDefault() per Peter's review src/conf/node_device_conf.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 5598d420fe..af72e160a5 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1919,7 +1919,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, g_autofree xmlNodePtr *attrs =3D NULL; size_t i; g_autofree char *uuidstr =3D NULL; - g_autofree char *starttype =3D NULL; + xmlNodePtr startNode =3D NULL; =20 ctxt->node =3D node; =20 @@ -1941,17 +1941,15 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, virUUIDFormat(uuidbuf, mdev->uuid); } =20 - if ((starttype =3D virXPathString("string(./start[1]/@type)", ctxt))) { - int tmp; - if ((tmp =3D virNodeDevMdevStartTypeFromString(starttype)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown mdev start type '%s' for '%s'"), sta= rttype, def->name); - return -1; - } + mdev->start =3D VIR_NODE_DEV_MDEV_START_MANUAL; =20 - mdev->start =3D tmp; - } else { - mdev->start =3D VIR_NODE_DEV_MDEV_START_MANUAL; + startNode =3D virXPathNode("./start[1]", ctxt); + if (startNode && + virXMLPropEnumDefault(startNode, "type", + virNodeDevMdevStartTypeFromString, + VIR_XML_PROP_NONE, &mdev->start, + VIR_NODE_DEV_MDEV_START_MANUAL) < 0) { + return -1; } =20 /* 'iommuGroup' is optional, only report an error if the supplied valu= e is --=20 2.26.3