From nobody Sun Feb 8 19:40:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=linux.ibm.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1652437909231972.8281871529069; Fri, 13 May 2022 03:31:49 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-119-IQs60WEVPli6DN2RYAkSeg-1; Fri, 13 May 2022 06:31:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BE48128B846E; Fri, 13 May 2022 10:31:41 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0D6A40D2825; Fri, 13 May 2022 10:31:41 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 76CFE193222E; Fri, 13 May 2022 10:31:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 23FD11932106 for ; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1917F438BDF; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 151EB438BDE for ; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F205A86B8AB for ; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-195-IKzmjHJVPo6IGPEbozBvWQ-1; Fri, 13 May 2022 06:31:29 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24DACMUF027329 for ; Fri, 13 May 2022 10:31:28 GMT Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1nc88asx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:27 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DANXgg019452 for ; Fri, 13 May 2022 10:31:25 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma04ams.nl.ibm.com with ESMTP id 3fwgd90ef8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:25 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 24DAVMKq36110836 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 May 2022 10:31:22 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C06FA11C04C; Fri, 13 May 2022 10:31:22 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A064A11C054; Fri, 13 May 2022 10:31:22 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.93.141]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 13 May 2022 10:31:22 +0000 (GMT) X-MC-Unique: IQs60WEVPli6DN2RYAkSeg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: IKzmjHJVPo6IGPEbozBvWQ-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 07/17] util: refactor virDomainDeviceCCWAddressIsValid into virccw Date: Fri, 13 May 2022 12:31:06 +0200 Message-Id: <20220513103116.3751-8-fiuczy@linux.ibm.com> In-Reply-To: <20220513103116.3751-1-fiuczy@linux.ibm.com> References: <20220513103116.3751-1-fiuczy@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: G03Eyhdf6hhuvTLCkYzXXovzSR7fIIcI X-Proofpoint-ORIG-GUID: G03Eyhdf6hhuvTLCkYzXXovzSR7fIIcI X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-05-13_04,2022-05-13_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=642 adultscore=0 malwarescore=0 suspectscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2205130046 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boris Fiuczynski Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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-ZM-MESSAGEID: 1652437911018100016 Content-Type: text/plain; charset="utf-8"; x-default="true" Refactor virDomainDeviceCCWAddressIsValid into virccw and rename method as virCCWDeviceAddressIsValid. Signed-off-by: Boris Fiuczynski --- src/conf/device_conf.c | 12 ++---------- src/conf/device_conf.h | 1 - src/libvirt_private.syms | 2 +- src/util/virccw.c | 8 ++++++++ src/util/virccw.h | 2 ++ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index bdc9219f84..2385e81994 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -258,14 +258,6 @@ virPCIDeviceAddressFormat(virBuffer *buf, addr.function); } =20 -bool -virDomainDeviceCCWAddressIsValid(virCCWDeviceAddress *addr) -{ - return addr->cssid <=3D VIR_CCW_DEVICE_MAX_CSSID && - addr->ssid <=3D VIR_CCW_DEVICE_MAX_SSID && - addr->devno <=3D VIR_CCW_DEVICE_MAX_DEVNO; -} - int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virCCWDeviceAddress *addr) @@ -288,7 +280,7 @@ virDomainDeviceCCWAddressParseXML(xmlNodePtr node, &addr->devno)) < 0) return -1; =20 - if (!virDomainDeviceCCWAddressIsValid(addr)) { + if (!virCCWDeviceAddressIsValid(addr)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid specification for virtio ccw address: cs= sid=3D'0x%x' ssid=3D'0x%x' devno=3D'0x%04x'"), addr->cssid, addr->ssid, addr->devno); @@ -453,7 +445,7 @@ virDomainDeviceAddressIsValid(virDomainDeviceInfo *info, return true; =20 case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: - return virDomainDeviceCCWAddressIsValid(&info->addr.ccw); + return virCCWDeviceAddressIsValid(&info->addr.ccw); =20 case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: return true; diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 5c4b7b2f8e..0ed6991c23 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -193,7 +193,6 @@ void virPCIDeviceAddressFormat(virBuffer *buf, virPCIDeviceAddress addr, bool includeTypeInAddr); =20 -bool virDomainDeviceCCWAddressIsValid(virCCWDeviceAddress *addr); int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virCCWDeviceAddress *addr); bool virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fae8edb6cd..8acb0e000d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -132,7 +132,6 @@ virDomainDeviceAddressIsValid; virDomainDeviceAddressTypeToString; virDomainDeviceCcidAddressParseXML; virDomainDeviceCCWAddressEqual; -virDomainDeviceCCWAddressIsValid; virDomainDeviceCCWAddressParseXML; virDomainDeviceDriveAddressParseXML; virDomainDeviceInfoAddressIsEqual; @@ -1927,6 +1926,7 @@ virBufferVasprintf; # util/virccw.h virCCWDeviceAddressAsString; virCCWDeviceAddressIncrement; +virCCWDeviceAddressIsValid; =20 =20 # util/vircgroup.h diff --git a/src/util/virccw.c b/src/util/virccw.c index d14d432414..c3dfda2613 100644 --- a/src/util/virccw.c +++ b/src/util/virccw.c @@ -22,6 +22,14 @@ #include "virccw.h" =20 =20 +bool +virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr) +{ + return addr->cssid <=3D VIR_CCW_DEVICE_MAX_CSSID && + addr->ssid <=3D VIR_CCW_DEVICE_MAX_SSID && + addr->devno <=3D VIR_CCW_DEVICE_MAX_DEVNO; +} + char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) { diff --git a/src/util/virccw.h b/src/util/virccw.h index 4c48c9605e..c4daaff7b3 100644 --- a/src/util/virccw.h +++ b/src/util/virccw.h @@ -35,6 +35,8 @@ struct _virCCWDeviceAddress { bool assigned; }; =20 +bool virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr); + char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) ATTRIBUTE_NONNULL(1); int virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr); --=20 2.33.1