From nobody Mon Feb 9 20:59:12 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=1618575721; cv=none; d=zohomail.com; s=zohoarc; b=HSosVGayYbNcJGoFCEkZMCOrDGOZLzDR1THWxIqBOKNrsWY64OWH0x5//opOhbqyebX+r1t4HT5IDL5BLfxk1yGQTzKO/uiQlfUqkV5fMNcPHdZwjGi+j1nGZR/v5ulz//0cRpO3LufGT31X+CoqYxsjQwjBd7rGl9neuTVtoOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618575721; 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=gz8MoE/6NmIrB1g6Iqu35qIu7w3FQCMHI+bQ+psH/90=; b=Pb00omjZckz9soW1ZX4JDKusYTa7DPF/5JYN1r6l1+qlysmN7xd+SoQFpOa5hi+iMcoWUrDQ4HTQCCpu7HzVslgL3uxqHb05MmbbBXyUMp3a1jnwPYS6ASPoVTOrrliF+6u2mXNEspPS2PurnXdLxpu5aocKhFilEcpbaHwEzJk= 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 1618575721776255.91351439684672; Fri, 16 Apr 2021 05:22:01 -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-595-aEhccuxiOnSCO7o-FMMfdQ-1; Fri, 16 Apr 2021 08:21:58 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AE09D8189C6; Fri, 16 Apr 2021 12:21:52 +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 5BD39614FF; Fri, 16 Apr 2021 12:21:52 +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 2019844A62; Fri, 16 Apr 2021 12:21:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13GCLAId020610 for ; Fri, 16 Apr 2021 08:21:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 22C1817C08; Fri, 16 Apr 2021 12:21:10 +0000 (UTC) Received: from work.redhat.com (ovpn-113-12.ams2.redhat.com [10.36.113.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A6745D9C0; Fri, 16 Apr 2021 12:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618575720; 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=gz8MoE/6NmIrB1g6Iqu35qIu7w3FQCMHI+bQ+psH/90=; b=IEVoAWpkgvOG+k76PXZl/FAeMIkU0WDJxZEn/Rs38YlLQ3dj0GcvHH+a7DHX9HxyYkwJn7 E9nHkOOxgvKIcrkBdg+D1BoXLtAPnrFB7LBH2qC6DJzNccLFIsl89YpGMRZooNRbyiTRXL oq8UBXAZ8EvzL86ARHl6RiKUnW9Nqp8= X-MC-Unique: aEhccuxiOnSCO7o-FMMfdQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 04/10] virPCIDeviceAddressParseXML: Use virXMLProp* Date: Fri, 16 Apr 2021 14:20:54 +0200 Message-Id: <20210416122100.360154-5-twiederh@redhat.com> In-Reply-To: <20210416122100.360154-1-twiederh@redhat.com> References: <20210416122100.360154-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.13 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 | 47 +++++++++++------------------------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 8d3d012e4a..951b7a348e 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -199,52 +199,29 @@ virPCIDeviceAddressParseXML(xmlNodePtr node, { xmlNodePtr cur; xmlNodePtr zpci =3D NULL; - g_autofree char *domain =3D virXMLPropString(node, "domain"); - 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"); =20 memset(addr, 0, sizeof(*addr)); =20 - if (domain && - virStrToLong_uip(domain, NULL, 0, &addr->domain) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'domain' attribute")); + if (virXMLPropUInt(node, "domain", 0, VIR_XML_PROP_OPTIONAL, + &addr->domain) < 0) return -1; - } =20 - if (bus && - virStrToLong_uip(bus, NULL, 0, &addr->bus) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'bus' attribute")); + if (virXMLPropUInt(node, "bus", 0, VIR_XML_PROP_OPTIONAL, + &addr->bus) < 0) return -1; - } =20 - if (slot && - virStrToLong_uip(slot, NULL, 0, &addr->slot) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'slot' attribute")); + if (virXMLPropUInt(node, "slot", 0, VIR_XML_PROP_OPTIONAL, + &addr->slot) < 0) return -1; - } =20 - if (function && - virStrToLong_uip(function, NULL, 0, &addr->function) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'function' attribute")); + if (virXMLPropUInt(node, "function", 0, VIR_XML_PROP_OPTIONAL, + &addr->function) < 0) + return -1; + + if (virXMLPropTristateSwitch(node, "multifunction", VIR_XML_PROP_OPTIO= NAL, + &addr->multi) < 0) return -1; - } =20 - if (multi) { - int value; - if ((value =3D virTristateSwitchTypeFromString(multi)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown value '%s' for
'multifunct= ion' attribute"), - multi); - return -1; - } - addr->multi =3D value; - } if (!virPCIDeviceAddressIsEmpty(addr) && !virPCIDeviceAddressIsValid(a= ddr, true)) return -1; =20 --=20 2.26.2