From nobody Mon Feb 9 14:38:26 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=1619007014; cv=none; d=zohomail.com; s=zohoarc; b=MzLXvSpFikt9IGl1COS4UCFEBUJeecasXekUeRK6CDVazjY/yjSTigbn9eXx67yWJVlR12EPvx7zKb+LR7DaLFK0HGYHBVgVJvRGqYqinKr5+XVwukN4YQ0p0fPCfcw19Cn4HheHNAp4h5vIvNIZf0zjaq9+XYZFRV9kcCRq7lo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619007014; 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=aIrJBiWBHWBR2zJl//r+Iyi7viHZet7irSjWBcmiKz0=; b=AIFgUNL9nwQRXb8XEemOZu/cXs2t4NlcVYQ2hr0uxm+Atbt3V318IWEJRzn2L/UwnLfjuFepRI+X/w+NkfixfsRbx4fZTHpdXpc8+Qkfq72tgqwLwMu/UwORSmvTVa8qxm4EkeuF2JYOuAI6E6uc2yo7pJL2T9SVFgioo7czMps= 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 1619007014636315.62152976863536; Wed, 21 Apr 2021 05:10:14 -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-339-Z3qDgmJcNGaMLBj1XRYE3Q-1; Wed, 21 Apr 2021 08:09:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5246D107ACFC; Wed, 21 Apr 2021 12:09:03 +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 1E46F19744; Wed, 21 Apr 2021 12:09:03 +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 D6B1B5533F; Wed, 21 Apr 2021 12:09:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13LC8HNR008641 for ; Wed, 21 Apr 2021 08:08:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6DCCF6091B; Wed, 21 Apr 2021 12:08:17 +0000 (UTC) Received: from work.redhat.com (ovpn-112-172.ams2.redhat.com [10.36.112.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B6A160871; Wed, 21 Apr 2021 12:08:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619007012; 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=aIrJBiWBHWBR2zJl//r+Iyi7viHZet7irSjWBcmiKz0=; b=jQC9hWUgLBFXukOjucIyjmYl8OfHK7M48cCTN+9+D/ZARFKhlGXjuvyKD6lwyuv6kSG49c nTor9m/3BwqnmG001A27AsNlsr3JnyoeL4Yc2AmEm7bw4S9Bex9qyu1AHExVhh7mJJEFhe J+8+pUvTO+8R6NRdC9/Yy/HY4Gr7I64= X-MC-Unique: Z3qDgmJcNGaMLBj1XRYE3Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 03/10] virZPCIDeviceAddressParseXML: Use virXMLProp* Date: Wed, 21 Apr 2021 14:08:01 +0200 Message-Id: <20210421120808.35786-4-twiederh@redhat.com> In-Reply-To: <20210421120808.35786-1-twiederh@redhat.com> References: <20210421120808.35786-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Peter Krempa , 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.84 on 10.5.11.23 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 Reviewed-by: Peter Krempa --- src/conf/device_conf.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 6a4b14cfda..9abbd5ebb7 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -52,32 +52,22 @@ static int virZPCIDeviceAddressParseXML(xmlNodePtr node, virPCIDeviceAddress *addr) { - virZPCIDeviceAddress def =3D { .uid =3D { 0 }, .fid =3D { 0 } }; - g_autofree char *uid =3D NULL; - g_autofree char *fid =3D NULL; + int retUid; + int retFid; =20 - uid =3D virXMLPropString(node, "uid"); - fid =3D virXMLPropString(node, "fid"); + if ((retUid =3D virXMLPropUInt(node, "uid", 0, VIR_XML_PROP_NONE, + &addr->zpci.uid.value)) < 0) + return -1; =20 - if (uid) { - if (virStrToLong_uip(uid, NULL, 0, &def.uid.value) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'uid' attribute")); - return -1; - } - def.uid.isSet =3D true; - } + if (retUid > 0) + addr->zpci.uid.isSet =3D true; =20 - if (fid) { - if (virStrToLong_uip(fid, NULL, 0, &def.fid.value) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'fid' attribute")); - return -1; - } - def.fid.isSet =3D true; - } + if ((retFid =3D virXMLPropUInt(node, "fid", 0, VIR_XML_PROP_NONE, + &addr->zpci.fid.value)) < 0) + return -1; =20 - addr->zpci =3D def; + if (retFid > 0) + addr->zpci.fid.isSet =3D true; =20 return 0; } --=20 2.26.3