From nobody Tue Feb 10 02:43:48 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=1618575725; cv=none; d=zohomail.com; s=zohoarc; b=VpmTHEgrCgwqyQC9v6Ny/QmYpSBIdeXLEYRfybHqSTl73FJrEUfNPVFlO21KT+ZdWmqwN2AmIxgucQ3SsfTxuxJQng/oQwLM0m7XESVf2T2ytO6L+Br21I+CgwSVYVsojXoI+SzQy0RQfSaFtSprO83vmbyHg6wCUkMZOlRN4/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618575725; 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=DBuR5s+HSwVzic/dlcmikeBXZzpTmF6FBhZdjFD6z7U=; b=CeUdvfjv7/KpdxYhy2rHmfFZP7Z/Ab78phQL0Ifol2Uo5zbARimcXECyaNI7dKSC68jr/Ao0ATPBfgpVjo/tdviv/bZODgPON2PIHlpGaVuIX3zwk2z5O/OjU4/c0Ncvz4AhB0Uc9vz4Ac1Jen+O8pOG6pNJ1Gj9U2nu4GqW3vs= 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 1618575725933748.805861790879; Fri, 16 Apr 2021 05:22:05 -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-175-Pf6UBptyMT-4BYbHlkabog-1; Fri, 16 Apr 2021 08:22:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C11486D241; Fri, 16 Apr 2021 12:21:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A3FFB669F2; Fri, 16 Apr 2021 12:21:55 +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 6DCE51806D0F; Fri, 16 Apr 2021 12:21:55 +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 13GCLEs6020634 for ; Fri, 16 Apr 2021 08:21:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id A68325D9E3; Fri, 16 Apr 2021 12:21:14 +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 ED6435D9C0; Fri, 16 Apr 2021 12:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618575724; 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=DBuR5s+HSwVzic/dlcmikeBXZzpTmF6FBhZdjFD6z7U=; b=OPJHj6P+kES9Hj+1yU+vHwwG0owMGWFsZOfbscGS0Yl15CLmQeSHdk01xfguYN7om8qC4G CZQA0lOYi/ogp1WFOfTqeFuhi/5VvbP++v3OxqVMojzUy+mAfHn8Jmva613KbnyHAGxwcB ASC+CaBjU+w8+AQQy9G9pxCShV+cDCw= X-MC-Unique: Pf6UBptyMT-4BYbHlkabog-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 05/10] virDomainDeviceCCWAddressParseXML: Use virXMLProp* Date: Fri, 16 Apr 2021 14:20:55 +0200 Message-Id: <20210416122100.360154-6-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.15 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 | 51 +++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 951b7a348e..621ff1b476 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -266,43 +266,34 @@ int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virDomainDeviceCCWAddress *addr) { - g_autofree char *cssid =3D virXMLPropString(node, "cssid"); - g_autofree char *ssid =3D virXMLPropString(node, "ssid"); - g_autofree char *devno =3D virXMLPropString(node, "devno"); + int cssid, ssid, devno; =20 memset(addr, 0, sizeof(*addr)); =20 + if ((cssid =3D virXMLPropUInt(node, "cssid", 0, VIR_XML_PROP_OPTIONAL, + &addr->cssid)) < 0) + return -1; + + if ((ssid =3D virXMLPropUInt(node, "ssid", 0, VIR_XML_PROP_OPTIONAL, + &addr->ssid)) < 0) + return -1; + + if ((devno =3D virXMLPropUInt(node, "devno", 0, VIR_XML_PROP_OPTIONAL, + &addr->devno)) < 0) + return -1; + + if (!virDomainDeviceCCWAddressIsValid(addr)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid specification for virtio ccw address: cs= sid=3D'%u' ssid=3D'%u' devno=3D'%u'"), + addr->cssid, addr->ssid, addr->devno); + return -1; + } + if (cssid && ssid && devno) { - if (cssid && - virStrToLong_uip(cssid, NULL, 0, &addr->cssid) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'cssid' attribute")); - return -1; - } - if (ssid && - virStrToLong_uip(ssid, NULL, 0, &addr->ssid) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'ssid' attribute")); - return -1; - } - if (devno && - virStrToLong_uip(devno, NULL, 0, &addr->devno) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'devno' attribute")); - return -1; - } - if (!virDomainDeviceCCWAddressIsValid(addr)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid specification for virtio ccw" - " address: cssid=3D'%s' ssid=3D'%s' devno=3D'= %s'"), - cssid, ssid, devno); - return -1; - } addr->assigned =3D true; } else if (cssid || ssid || devno) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Invalid partial specification for virtio ccw" - " address")); + _("Invalid partial specification for virtio ccw add= ress")); return -1; } =20 --=20 2.26.2