From nobody Sun Feb 8 16:24:10 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 1652437910212425.6155816309706; Fri, 13 May 2022 03:31:50 -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-568-IJhHHEpIP4uar6mhOUPG1A-1; Fri, 13 May 2022 06:31:44 -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 CCB7E80418B; Fri, 13 May 2022 10:31:40 +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 80C3F40D2820; Fri, 13 May 2022 10:31:40 +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 512141932207; Fri, 13 May 2022 10:31:40 +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 1BB4D193223C for ; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 05F68416156; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast09.extmail.prod.ext.rdu2.redhat.com [10.11.55.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0198F415F5E for ; Fri, 13 May 2022 10:31:30 +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 DDAF32919EB4 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-125-ickY4OIWNlum0S9NctoEuA-1; Fri, 13 May 2022 06:31:29 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24D9gFE6031596 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 mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1mx40vg1-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 24DANnL8010242 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 ppma01fra.de.ibm.com with ESMTP id 3fwgd8pkwh-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 24DAVMSc36110830 (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 6719011C052; 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 4950D11C058; 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: IJhHHEpIP4uar6mhOUPG1A-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ickY4OIWNlum0S9NctoEuA-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 05/17] util: refactor ccw address constants into virccw Date: Fri, 13 May 2022 12:31:04 +0200 Message-Id: <20220513103116.3751-6-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: uh_WxhwwIX5NhmhVZiZy95HgnDqzgC9d X-Proofpoint-ORIG-GUID: uh_WxhwwIX5NhmhVZiZy95HgnDqzgC9d 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-12_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 suspectscore=0 mlxlogscore=761 malwarescore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 spamscore=0 clxscore=1015 mlxscore=0 bulkscore=0 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.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: 1652437911000100015 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Boris Fiuczynski --- src/conf/device_conf.c | 6 +++--- src/conf/device_conf.h | 4 ---- src/conf/domain_addr.c | 2 +- src/util/virccw.h | 3 +++ 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 92b908b2e6..bdc9219f84 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -261,9 +261,9 @@ virPCIDeviceAddressFormat(virBuffer *buf, bool virDomainDeviceCCWAddressIsValid(virCCWDeviceAddress *addr) { - return addr->cssid <=3D VIR_DOMAIN_DEVICE_CCW_MAX_CSSID && - addr->ssid <=3D VIR_DOMAIN_DEVICE_CCW_MAX_SSID && - addr->devno <=3D VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO; + 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; } =20 int diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 950d333e2e..5c4b7b2f8e 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -70,10 +70,6 @@ struct _virDomainDeviceVirtioSerialAddress { unsigned int port; }; =20 -#define VIR_DOMAIN_DEVICE_CCW_MAX_CSSID 254 -#define VIR_DOMAIN_DEVICE_CCW_MAX_SSID 3 -#define VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO 65535 - typedef struct _virDomainDeviceCcidAddress virDomainDeviceCcidAddress; struct _virDomainDeviceCcidAddress { unsigned int controller; diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 7dd26c3271..65b438f13c 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1309,7 +1309,7 @@ virDomainCCWAddressIncrement(virCCWDeviceAddress *add= r) virCCWDeviceAddress ccwaddr =3D *addr; =20 /* We are not touching subchannel sets and channel subsystems */ - if (++ccwaddr.devno > VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO) + if (++ccwaddr.devno > VIR_CCW_DEVICE_MAX_DEVNO) return -1; =20 *addr =3D ccwaddr; diff --git a/src/util/virccw.h b/src/util/virccw.h index 127359c299..c3a47127f1 100644 --- a/src/util/virccw.h +++ b/src/util/virccw.h @@ -22,6 +22,9 @@ =20 #include "internal.h" =20 +#define VIR_CCW_DEVICE_MAX_CSSID 254 +#define VIR_CCW_DEVICE_MAX_SSID 3 +#define VIR_CCW_DEVICE_MAX_DEVNO 65535 #define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x" =20 typedef struct _virCCWDeviceAddress virCCWDeviceAddress; --=20 2.33.1