From nobody Sun Feb 8 21:27:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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.133.124]) by mx.zohomail.com with SMTPS id 1652437904208506.9090800460157; Fri, 13 May 2022 03:31:44 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-316-ik5oJtJePcWDhcxb-Sf78Q-1; Fri, 13 May 2022 06:31:39 -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 453FC85A5A8; Fri, 13 May 2022 10:31:35 +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 2CC9340D2822; Fri, 13 May 2022 10:31:35 +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 C081B192B8E6; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 63708194975B for ; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 53BD1415F5E; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4FE7D416156 for ; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 36B198032EA for ; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-589-g_kuS2q_N32_q7ngOcPkKQ-1; Fri, 13 May 2022 06:31:28 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24DASoln003129 for ; Fri, 13 May 2022 10:31:28 GMT Received: from ppma01fra.de.ibm.com (46.49.7a9f.ip4.static.sl-reverse.com [159.122.73.70]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1nm2g1mq-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 (ppma01fra.de.ibm.com [127.0.0.1]) by ppma01fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DANnL9010242 for ; Fri, 13 May 2022 10:31:26 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma01fra.de.ibm.com with ESMTP id 3fwgd8pkwj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:26 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 24DAVN7436897122 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 May 2022 10:31:23 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EBFD211C064; 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 CCE1611C05B; 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: ik5oJtJePcWDhcxb-Sf78Q-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: g_kuS2q_N32_q7ngOcPkKQ-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 08/17] util: refactor virDomainDeviceCCWAddressEqual into virccw Date: Fri, 13 May 2022 12:31:07 +0200 Message-Id: <20220513103116.3751-9-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: Ug4hiQ_W0ayZ-B8SMvT2BNeA5qzSK-_V X-Proofpoint-ORIG-GUID: Ug4hiQ_W0ayZ-B8SMvT2BNeA5qzSK-_V 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 clxscore=1015 mlxscore=0 suspectscore=0 spamscore=0 adultscore=0 mlxlogscore=886 bulkscore=0 malwarescore=0 phishscore=0 impostorscore=0 priorityscore=1501 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2205130043 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.10 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: 1652437905017100006 Content-Type: text/plain; charset="utf-8"; x-default="true" Refactor virDomainDeviceCCWAddressEqual into virccw and rename method as virCCWDeviceAddressEqual. Signed-off-by: Boris Fiuczynski --- src/conf/device_conf.c | 12 ------------ src/conf/device_conf.h | 2 -- src/conf/domain_conf.c | 8 ++++---- src/libvirt_private.syms | 2 +- src/util/virccw.c | 12 ++++++++++++ src/util/virccw.h | 2 ++ 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 2385e81994..958e2f43cc 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -298,18 +298,6 @@ virDomainDeviceCCWAddressParseXML(xmlNodePtr node, return 0; } =20 -bool -virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1, - virCCWDeviceAddress *addr2) -{ - if (addr1->cssid =3D=3D addr2->cssid && - addr1->ssid =3D=3D addr2->ssid && - addr1->devno =3D=3D addr2->devno) { - return true; - } - return false; -} - int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, virDomainDeviceDriveAddress *addr) diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 0ed6991c23..01e2edccc9 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -195,8 +195,6 @@ void virPCIDeviceAddressFormat(virBuffer *buf, =20 int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virCCWDeviceAddress *addr); -bool virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1, - virCCWDeviceAddress *addr2); =20 int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, virDomainDeviceDriveAddress *addr); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 115a670683..826ba4183d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15393,7 +15393,7 @@ virDomainDiskIndexByAddress(virDomainDef *def, return i; if (vdisk->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && ccw_addr && - virDomainDeviceCCWAddressEqual(&vdisk->info.addr.ccw, ccw_addr= )) { + virCCWDeviceAddressEqual(&vdisk->info.addr.ccw, ccw_addr)) { return i; } if (vdisk->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { @@ -15582,8 +15582,8 @@ virDomainNetFindIdx(virDomainDef *def, virDomainNet= Def *net) continue; =20 if (CCWAddrSpecified && - !virDomainDeviceCCWAddressEqual(&def->nets[i]->info.addr.ccw, - &net->info.addr.ccw)) + !virCCWDeviceAddressEqual(&def->nets[i]->info.addr.ccw, + &net->info.addr.ccw)) continue; =20 if (net->info.alias && def->nets[i]->info.alias && @@ -16019,7 +16019,7 @@ virDomainControllerFindByCCWAddress(virDomainDef *d= ef, virDomainDeviceInfo *info =3D &def->controllers[i]->info; =20 if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - virDomainDeviceCCWAddressEqual(&info->addr.ccw, addr)) + virCCWDeviceAddressEqual(&info->addr.ccw, addr)) return i; } =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8acb0e000d..019f7c60e4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -131,7 +131,6 @@ virDeviceInfoPCIAddressIsWanted; virDomainDeviceAddressIsValid; virDomainDeviceAddressTypeToString; virDomainDeviceCcidAddressParseXML; -virDomainDeviceCCWAddressEqual; virDomainDeviceCCWAddressParseXML; virDomainDeviceDriveAddressParseXML; virDomainDeviceInfoAddressIsEqual; @@ -1925,6 +1924,7 @@ virBufferVasprintf; =20 # util/virccw.h virCCWDeviceAddressAsString; +virCCWDeviceAddressEqual; virCCWDeviceAddressIncrement; virCCWDeviceAddressIsValid; =20 diff --git a/src/util/virccw.c b/src/util/virccw.c index c3dfda2613..e2785bd9ab 100644 --- a/src/util/virccw.c +++ b/src/util/virccw.c @@ -30,6 +30,18 @@ virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr) addr->devno <=3D VIR_CCW_DEVICE_MAX_DEVNO; } =20 +bool +virCCWDeviceAddressEqual(virCCWDeviceAddress *addr1, + virCCWDeviceAddress *addr2) +{ + if (addr1->cssid =3D=3D addr2->cssid && + addr1->ssid =3D=3D addr2->ssid && + addr1->devno =3D=3D addr2->devno) { + return true; + } + return false; +} + char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) { diff --git a/src/util/virccw.h b/src/util/virccw.h index c4daaff7b3..aebbd4ab6d 100644 --- a/src/util/virccw.h +++ b/src/util/virccw.h @@ -36,6 +36,8 @@ struct _virCCWDeviceAddress { }; =20 bool virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr); +bool virCCWDeviceAddressEqual(virCCWDeviceAddress *addr1, + virCCWDeviceAddress *addr2); =20 char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) ATTRIBUTE_NONNULL(1); --=20 2.33.1