From nobody Mon Feb 9 16:13:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1616054599; cv=none; d=zohomail.com; s=zohoarc; b=Oka1GxXFKMI4EMm9g2mxdNy8/2f2T6iwTq4T271GQhizdzqe1U+lr2A2uy5dL+GQSSXy2zvdcn1PHbRdkf4bnzhmoiqxfLWsTiJxQljYNXlq+5Y7SBjiO5QX/UQD+6atGKtIY3ns96H0v0tJCXaX8BiZYZQofxB+X+Bj7xv86WU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054599; h=Content-Type:Content-Transfer-Encoding:Cc: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=C9MNgAxRUFsLoCgNVFLr7p4sXV+v13O+vAeBQl1rvs8=; b=LXfxKMNkTYgkX+b5wSEAYdDmt7W8TYjRbGG6Cyvu/ZOvD5+RgTKWa3B1V/W6nVHklx/Jlh+pgitx+Og/Ib6TMB8WyuSC2rGdqjGPd4Qd6NxhDsclMGUxraeEO7zcVKbtJMrdoBfdOI0ro0pgBC2CIWoGEtG28TxATMjYsIwsCmA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 161605459949084.11471898489697; Thu, 18 Mar 2021 01:03:19 -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-352-CCfhVdoAPhePlcX2Ck7QBA-1; Thu, 18 Mar 2021 04:03:16 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 27D2783DD20; Thu, 18 Mar 2021 08:03:11 +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 F3EA3610F0; Thu, 18 Mar 2021 08:03:10 +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 AF91550044; Thu, 18 Mar 2021 08:03:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12I839fe029305 for ; Thu, 18 Mar 2021 04:03:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id CBAC969321; Thu, 18 Mar 2021 08:03:09 +0000 (UTC) Received: from work.redhat.com (ovpn-112-180.ams2.redhat.com [10.36.112.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2332B66A16; Thu, 18 Mar 2021 08:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054598; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=C9MNgAxRUFsLoCgNVFLr7p4sXV+v13O+vAeBQl1rvs8=; b=NqAJ8mMnrnFLq34P01r+CkmNcnN/nwgbAZ35uHBfiN86/ZjdxsYhAlJ/wIiL6F0EA/LdFX 4qxWNx6DOsBD4G5jypsgNlPx/DaReAPEgo75EbaHp1Oeu00vh/oe5hK2/tcqrtXZ9JH39N 8tMs3ZGA2E7Yoz74HVUADy2UYrxxiag= X-MC-Unique: CCfhVdoAPhePlcX2Ck7QBA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 34/38] device_conf: Use virXMLProp(OnOff|YesNo) in virPCIDeviceAddressParseXML Date: Thu, 18 Mar 2021 09:01:13 +0100 Message-Id: <20210318080117.70255-35-twiederh@redhat.com> In-Reply-To: <20210318080117.70255-1-twiederh@redhat.com> References: <20210318080117.70255-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.12 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: Tim Wiederhake --- src/conf/device_conf.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 714ac50762..ee248648bd 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -214,7 +214,7 @@ virPCIDeviceAddressParseXML(xmlNodePtr node, g_autofree char *bus =3D virXMLPropString(node, "bus"); g_autofree char *slot =3D virXMLPropString(node, "slot"); g_autofree char *function =3D virXMLPropString(node, "function"); - g_autofree char *multi =3D virXMLPropString(node, "multifunction"); + virTristateSwitch multifunction =3D VIR_TRISTATE_SWITCH_ABSENT; =20 memset(addr, 0, sizeof(*addr)); =20 @@ -246,14 +246,10 @@ virPCIDeviceAddressParseXML(xmlNodePtr node, return -1; } =20 - if (multi && - ((addr->multi =3D virTristateSwitchTypeFromString(multi)) <=3D 0))= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown value '%s' for
'multifunction'= attribute"), - multi); + if (virXMLPropOnOff(node, "multifunction", &multifunction) < 0) return -1; + addr->multi =3D multifunction; =20 - } if (!virPCIDeviceAddressIsEmpty(addr) && !virPCIDeviceAddressIsValid(a= ddr, true)) return -1; =20 --=20 2.26.2