From nobody Fri Mar 29 08:07:30 2024 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 1652437898602624.2858867150912; Fri, 13 May 2022 03:31:38 -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-12-E2s3CNC6M8yMJAV4DVbRSQ-1; Fri, 13 May 2022 06:31:35 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9FE6439F9CB9; Fri, 13 May 2022 10:31:32 +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 31D97400E87E; Fri, 13 May 2022 10:31:31 +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 BCE1C1932207; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6EB94194975B for ; Fri, 13 May 2022 10:31:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 516C3C53361; Fri, 13 May 2022 10:31:29 +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 4D57EC53360 for ; Fri, 13 May 2022 10:31:29 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 350678032E5 for ; Fri, 13 May 2022 10:31:29 +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-164-iqAQypEfPjWnDWiqvRbG8A-1; Fri, 13 May 2022 06:31:27 -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 24DASiD8002821 for ; Fri, 13 May 2022 10:31:26 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1nm2g1mc-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 pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DANQVt027541 for ; Fri, 13 May 2022 10:31:24 GMT Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by ppma03fra.de.ibm.com with ESMTP id 3g0kn79yrj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:24 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 24DAVLNO56820158 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 May 2022 10:31:21 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9EC6511C04C; Fri, 13 May 2022 10:31:21 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 81D5211C058; Fri, 13 May 2022 10:31:21 +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:21 +0000 (GMT) X-MC-Unique: E2s3CNC6M8yMJAV4DVbRSQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: iqAQypEfPjWnDWiqvRbG8A-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 01/17] nodedev: fix reported error msg in css cap XML parsing Date: Fri, 13 May 2022 12:31:00 +0200 Message-Id: <20220513103116.3751-2-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: L9ub88tQ8WRLB7srNCUlgxYeEbWE1Xmr X-Proofpoint-ORIG-GUID: L9ub88tQ8WRLB7srNCUlgxYeEbWE1Xmr 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=1011 mlxscore=0 suspectscore=0 spamscore=0 adultscore=0 mlxlogscore=999 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.8 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.1 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: 1652437899118100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Boris Fiuczynski Reviewed-by: Marc Hartmayer Reviewed-by: Michal Privoznik --- src/conf/node_device_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 8b20a7bee9..67c8c4a3fd 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1195,7 +1195,7 @@ virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt, if (virStrToLong_uip(ssid, NULL, 0, &ccw_dev->ssid) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid ssid value '%s' for '%s'"), - cssid, def->name); + ssid, def->name); return -1; } =20 --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 1652437901613619.6136056775822; Fri, 13 May 2022 03:31:41 -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-288-hNSQ90IPPjGvAiMJKYTrsw-1; Fri, 13 May 2022 06:31:39 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9F83D86B8C2; Fri, 13 May 2022 10:31:34 +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 8808F438BF2; Fri, 13 May 2022 10:31:34 +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 6553A192B8D8; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D86C7193222E for ; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C4206C53361; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BEA94C53360 for ; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 A3535811E78 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-425-t867URpLNlSm6RYKlZ0QoQ-1; Fri, 13 May 2022 06:31:28 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24D9puFQ021203 for ; Fri, 13 May 2022 10:31:27 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 3g1n2u0qab-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 24DAOUBv010740 for ; Fri, 13 May 2022 10:31:25 GMT Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by ppma01fra.de.ibm.com with ESMTP id 3fwgd8pkwg-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 b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 24DAVL9558392938 (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 DAD6011C04C; Fri, 13 May 2022 10:31:21 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AC2F111C05B; Fri, 13 May 2022 10:31:21 +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:21 +0000 (GMT) X-MC-Unique: hNSQ90IPPjGvAiMJKYTrsw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: t867URpLNlSm6RYKlZ0QoQ-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 02/17] util: refactor virDomainDeviceCCWAddress into virccw.h Date: Fri, 13 May 2022 12:31:01 +0200 Message-Id: <20220513103116.3751-3-fiuczy@linux.ibm.com> In-Reply-To: <20220513103116.3751-1-fiuczy@linux.ibm.com> References: <20220513103116.3751-1-fiuczy@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: p2p9CULN8oSqmrxvVK_vKAT9oTbWD2oO X-Proofpoint-ORIG-GUID: p2p9CULN8oSqmrxvVK_vKAT9oTbWD2oO X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 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 lowpriorityscore=0 malwarescore=0 adultscore=0 spamscore=0 clxscore=1015 impostorscore=0 suspectscore=0 priorityscore=1501 mlxlogscore=995 mlxscore=0 phishscore=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.8 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.85 on 10.11.54.9 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: 1652437903047100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Refactor ccw data structure virDomainDeviceCCWAddress into util virccw.h and rename it as virCCWDeviceAddress. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/conf/device_conf.c | 8 +++---- src/conf/device_conf.h | 19 ++++++----------- src/conf/domain_addr.c | 6 +++--- src/conf/domain_addr.h | 4 ++-- src/conf/domain_conf.c | 6 +++--- src/conf/domain_conf.h | 6 +++--- src/node_device/node_device_driver.c | 2 +- src/qemu/qemu_agent.c | 4 ++-- src/qemu/qemu_agent.h | 2 +- src/util/virccw.h | 31 ++++++++++++++++++++++++++++ 10 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 src/util/virccw.h diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index cb523d3a0d..92b908b2e6 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -259,7 +259,7 @@ virPCIDeviceAddressFormat(virBuffer *buf, } =20 bool -virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddress *addr) +virDomainDeviceCCWAddressIsValid(virCCWDeviceAddress *addr) { return addr->cssid <=3D VIR_DOMAIN_DEVICE_CCW_MAX_CSSID && addr->ssid <=3D VIR_DOMAIN_DEVICE_CCW_MAX_SSID && @@ -268,7 +268,7 @@ virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddr= ess *addr) =20 int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, - virDomainDeviceCCWAddress *addr) + virCCWDeviceAddress *addr) { int cssid; int ssid; @@ -307,8 +307,8 @@ virDomainDeviceCCWAddressParseXML(xmlNodePtr node, } =20 bool -virDomainDeviceCCWAddressEqual(virDomainDeviceCCWAddress *addr1, - virDomainDeviceCCWAddress *addr2) +virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1, + virCCWDeviceAddress *addr2) { if (addr1->cssid =3D=3D addr2->cssid && addr1->ssid =3D=3D addr2->ssid && diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index b6b710d313..60d90bbf19 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -27,6 +27,7 @@ #include "internal.h" #include "virthread.h" #include "virbuffer.h" +#include "virccw.h" #include "virpci.h" #include "virnetdev.h" #include "virenum.h" @@ -73,14 +74,6 @@ struct _virDomainDeviceVirtioSerialAddress { #define VIR_DOMAIN_DEVICE_CCW_MAX_SSID 3 #define VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO 65535 =20 -typedef struct _virDomainDeviceCCWAddress virDomainDeviceCCWAddress; -struct _virDomainDeviceCCWAddress { - unsigned int cssid; - unsigned int ssid; - unsigned int devno; - bool assigned; -}; - typedef struct _virDomainDeviceCcidAddress virDomainDeviceCcidAddress; struct _virDomainDeviceCcidAddress { unsigned int controller; @@ -136,7 +129,7 @@ struct _virDomainDeviceInfo { virDomainDeviceCcidAddress ccid; virDomainDeviceUSBAddress usb; virDomainDeviceSpaprVioAddress spaprvio; - virDomainDeviceCCWAddress ccw; + virCCWDeviceAddress ccw; virDomainDeviceISAAddress isa; virDomainDeviceDimmAddress dimm; } addr; @@ -204,11 +197,11 @@ void virPCIDeviceAddressFormat(virBuffer *buf, virPCIDeviceAddress addr, bool includeTypeInAddr); =20 -bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddress *addr); +bool virDomainDeviceCCWAddressIsValid(virCCWDeviceAddress *addr); int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, - virDomainDeviceCCWAddress *addr); -bool virDomainDeviceCCWAddressEqual(virDomainDeviceCCWAddress *addr1, - virDomainDeviceCCWAddress *addr2); + virCCWDeviceAddress *addr); +bool virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1, + virCCWDeviceAddress *addr2); #define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x" =20 int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 1173143635..e51056b0a9 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1304,15 +1304,15 @@ virDomainPCIAddressSetAllMulti(virDomainDef *def) =20 =20 char* -virDomainCCWAddressAsString(virDomainDeviceCCWAddress *addr) +virDomainCCWAddressAsString(virCCWDeviceAddress *addr) { return g_strdup_printf("%x.%x.%04x", addr->cssid, addr->ssid, addr->de= vno); } =20 static int -virDomainCCWAddressIncrement(virDomainDeviceCCWAddress *addr) +virDomainCCWAddressIncrement(virCCWDeviceAddress *addr) { - virDomainDeviceCCWAddress ccwaddr =3D *addr; + virCCWDeviceAddress ccwaddr =3D *addr; =20 /* We are not touching subchannel sets and channel subsystems */ if (++ccwaddr.devno > VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO) diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index 1772ea7088..8a6e80a84d 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -199,7 +199,7 @@ void virDomainPCIAddressSetAllMulti(virDomainDef *def) =20 struct _virDomainCCWAddressSet { GHashTable *defined; - virDomainDeviceCCWAddress next; + virCCWDeviceAddress next; }; typedef struct _virDomainCCWAddressSet virDomainCCWAddressSet; =20 @@ -209,7 +209,7 @@ int virDomainCCWAddressAssign(virDomainDeviceInfo *dev, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); void virDomainCCWAddressSetFree(virDomainCCWAddressSet *addrs); =20 -char* virDomainCCWAddressAsString(virDomainDeviceCCWAddress *addr) +char* virDomainCCWAddressAsString(virCCWDeviceAddress *addr) ATTRIBUTE_NONNULL(1); =20 virDomainCCWAddressSet * diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bd2884088c..7ef65ebed5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15368,7 +15368,7 @@ virDomainDiskControllerMatch(int controller_type, i= nt disk_bus) int virDomainDiskIndexByAddress(virDomainDef *def, virPCIDeviceAddress *pci_address, - virDomainDeviceCCWAddress *ccw_addr, + virCCWDeviceAddress *ccw_addr, unsigned int bus, unsigned int target, unsigned int unit) { @@ -15412,7 +15412,7 @@ virDomainDiskIndexByAddress(virDomainDef *def, virDomainDiskDef * virDomainDiskByAddress(virDomainDef *def, virPCIDeviceAddress *pci_address, - virDomainDeviceCCWAddress *ccw_addr, + virCCWDeviceAddress *ccw_addr, unsigned int bus, unsigned int target, unsigned int unit) @@ -16011,7 +16011,7 @@ virDomainControllerFindByType(virDomainDef *def, =20 int virDomainControllerFindByCCWAddress(virDomainDef *def, - virDomainDeviceCCWAddress *addr) + virCCWDeviceAddress *addr) { size_t i; =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 88a411d00c..5f782a7bf9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3655,12 +3655,12 @@ void virDomainRNGDefFree(virDomainRNGDef *def); =20 int virDomainDiskIndexByAddress(virDomainDef *def, virPCIDeviceAddress *pci_controller, - virDomainDeviceCCWAddress *ccw_addr, + virCCWDeviceAddress *ccw_addr, unsigned int bus, unsigned int target, unsigned int unit); virDomainDiskDef *virDomainDiskByAddress(virDomainDef *def, virPCIDeviceAddress *pci_controll= er, - virDomainDeviceCCWAddress *ccw_ad= dr, + virCCWDeviceAddress *ccw_addr, unsigned int bus, unsigned int target, unsigned int unit); @@ -3745,7 +3745,7 @@ void virDomainControllerInsertPreAlloced(virDomainDef= *def, int virDomainControllerFind(const virDomainDef *def, int type, int idx); int virDomainControllerFindByType(virDomainDef *def, int type); int virDomainControllerFindByCCWAddress(virDomainDef *def, - virDomainDeviceCCWAddress *addr); + virCCWDeviceAddress *addr); int virDomainControllerFindByPCIAddress(virDomainDef *def, virPCIDeviceAddress *addr); int virDomainControllerFindUnusedIndex(virDomainDef const *def, int type); diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 1eb452b989..b9c46376f5 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -661,7 +661,7 @@ nodeDeviceObjFormatAddress(virNodeDeviceObj *obj) } =20 case VIR_NODE_DEV_CAP_CSS_DEV: { - virDomainDeviceCCWAddress ccw_addr =3D { + virCCWDeviceAddress ccw_addr =3D { .cssid =3D caps->data.ccw_dev.cssid, .ssid =3D caps->data.ccw_dev.ssid, .devno =3D caps->data.ccw_dev.devno diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4156cb0dca..f57a8d5f25 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1764,9 +1764,9 @@ qemuAgentGetDiskAddress(virJSONValue *json) GET_DISK_ADDR(pci, &addr->pci_controller.function, "function"); =20 if ((ccw =3D virJSONValueObjectGet(json, "ccw-address"))) { - g_autofree virDomainDeviceCCWAddress *ccw_addr =3D NULL; + g_autofree virCCWDeviceAddress *ccw_addr =3D NULL; =20 - ccw_addr =3D g_new0(virDomainDeviceCCWAddress, 1); + ccw_addr =3D g_new0(virCCWDeviceAddress, 1); =20 GET_DISK_ADDR(ccw, &ccw_addr->cssid, "cssid"); if (ccw_addr->cssid =3D=3D 0) /* Guest CSSID 0 is 0xfe on host */ diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 862f6b0a95..c07d8507ba 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -72,7 +72,7 @@ struct _qemuAgentDiskAddress { unsigned int target; unsigned int unit; char *devnode; - virDomainDeviceCCWAddress *ccw_addr; + virCCWDeviceAddress *ccw_addr; }; void qemuAgentDiskAddressFree(qemuAgentDiskAddress *addr); G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuAgentDiskAddress, qemuAgentDiskAddressFr= ee); diff --git a/src/util/virccw.h b/src/util/virccw.h new file mode 100644 index 0000000000..701e13284b --- /dev/null +++ b/src/util/virccw.h @@ -0,0 +1,31 @@ +/* + * virccw.h: helper APIs for managing host CCW devices + * + * Copyright (C) 2022 IBM Corporation + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#pragma once + +#include "internal.h" + +typedef struct _virCCWDeviceAddress virCCWDeviceAddress; +struct _virCCWDeviceAddress { + unsigned int cssid; + unsigned int ssid; + unsigned int devno; + bool assigned; +}; --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 1652437901464975.5341054243518; Fri, 13 May 2022 03:31:41 -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-92-fDq7FaSsONqyXpu6pTRz6A-1; Fri, 13 May 2022 06:31:36 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4104880419F; Fri, 13 May 2022 10:31:33 +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 28EC9416364; Fri, 13 May 2022 10:31:33 +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 955A2193211D; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 96015194975B for ; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7ADD640D2822; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 766DD40D2821 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 5E71E811E7A 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-495-EOOYiozWM_a0UER1p7pIQw-1; Fri, 13 May 2022 06:31:28 -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 24D9gFE5031596 for ; Fri, 13 May 2022 10:31:27 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 3g1mx40vfx-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 24DANig9019495 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 3fwgd90ef6-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 24DAVMCw36110826 (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 138C411C058; 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 E8DAE11C052; Fri, 13 May 2022 10:31:21 +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:21 +0000 (GMT) X-MC-Unique: fDq7FaSsONqyXpu6pTRz6A-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: EOOYiozWM_a0UER1p7pIQw-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 03/17] util: refactor virDomainCCWAddressAsString into virccw Date: Fri, 13 May 2022 12:31:02 +0200 Message-Id: <20220513103116.3751-4-fiuczy@linux.ibm.com> In-Reply-To: <20220513103116.3751-1-fiuczy@linux.ibm.com> References: <20220513103116.3751-1-fiuczy@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Vc7vhySKjlK7bEwPUSubKyY-5PMS3hf9 X-Proofpoint-ORIG-GUID: Vc7vhySKjlK7bEwPUSubKyY-5PMS3hf9 X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 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=999 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.84 on 10.11.54.2 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.85 on 10.11.54.10 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: 1652437903026100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Move virDomainCCWAddressAsString into virccw and rename method as virCCWDeviceAddressAsString. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/conf/domain_addr.c | 12 +++--------- src/conf/domain_addr.h | 3 --- src/conf/domain_conf.c | 2 +- src/libvirt_private.syms | 5 ++++- src/node_device/node_device_driver.c | 2 +- src/util/meson.build | 1 + src/util/virccw.c | 29 ++++++++++++++++++++++++++++ src/util/virccw.h | 3 +++ 8 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 src/util/virccw.c diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index e51056b0a9..7dd26c3271 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1303,12 +1303,6 @@ virDomainPCIAddressSetAllMulti(virDomainDef *def) } =20 =20 -char* -virDomainCCWAddressAsString(virCCWDeviceAddress *addr) -{ - return g_strdup_printf("%x.%x.%04x", addr->cssid, addr->ssid, addr->de= vno); -} - static int virDomainCCWAddressIncrement(virCCWDeviceAddress *addr) { @@ -1334,7 +1328,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfo *dev, return 0; =20 if (!autoassign && dev->addr.ccw.assigned) { - if (!(addr =3D virDomainCCWAddressAsString(&dev->addr.ccw))) + if (!(addr =3D virCCWDeviceAddressAsString(&dev->addr.ccw))) return -1; =20 if (virHashLookup(addrs->defined, addr)) { @@ -1344,7 +1338,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfo *dev, return -1; } } else if (autoassign && !dev->addr.ccw.assigned) { - if (!(addr =3D virDomainCCWAddressAsString(&addrs->next))) + if (!(addr =3D virCCWDeviceAddressAsString(&addrs->next))) return -1; =20 while (virHashLookup(addrs->defined, addr)) { @@ -1354,7 +1348,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfo *dev, return -1; } VIR_FREE(addr); - if (!(addr =3D virDomainCCWAddressAsString(&addrs->next))) + if (!(addr =3D virCCWDeviceAddressAsString(&addrs->next))) return -1; } dev->addr.ccw =3D addrs->next; diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index 8a6e80a84d..e72fb48847 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -209,9 +209,6 @@ int virDomainCCWAddressAssign(virDomainDeviceInfo *dev, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); void virDomainCCWAddressSetFree(virDomainCCWAddressSet *addrs); =20 -char* virDomainCCWAddressAsString(virCCWDeviceAddress *addr) - ATTRIBUTE_NONNULL(1); - virDomainCCWAddressSet * virDomainCCWAddressSetCreateFromDomain(virDomainDef *def) ATTRIBUTE_NONNULL(1); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7ef65ebed5..115a670683 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15620,7 +15620,7 @@ virDomainNetFindIdx(virDomainDef *def, virDomainNet= Def *net) alias =3D net->info.alias; =20 if (CCWAddrSpecified) - addr =3D virDomainCCWAddressAsString(&net->info.addr.ccw); + addr =3D virCCWDeviceAddressAsString(&net->info.addr.ccw); else if (PCIAddrSpecified) addr =3D virPCIDeviceAddressAsString(&net->info.addr.pci); else diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 97bfca906b..eaf4a1da9c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -147,7 +147,6 @@ virPCIDeviceAddressParseXML; =20 # conf/domain_addr.h virDomainCCWAddressAssign; -virDomainCCWAddressAsString; virDomainCCWAddressSetCreateFromDomain; virDomainCCWAddressSetFree; virDomainPCIAddressBusIsFullyReserved; @@ -1925,6 +1924,10 @@ virBufferUse; virBufferVasprintf; =20 =20 +# util/virccw.h +virCCWDeviceAddressAsString; + + # util/vircgroup.h virCgroupAddMachineProcess; virCgroupAddProcess; diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index b9c46376f5..4b31cd5695 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -667,7 +667,7 @@ nodeDeviceObjFormatAddress(virNodeDeviceObj *obj) .devno =3D caps->data.ccw_dev.devno }; =20 - addr =3D virDomainCCWAddressAsString(&ccw_addr); + addr =3D virCCWDeviceAddressAsString(&ccw_addr); break; } =20 diff --git a/src/util/meson.build b/src/util/meson.build index 17755373c8..07ae94631c 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -9,6 +9,7 @@ util_sources =3D [ 'virbitmap.c', 'virbpf.c', 'virbuffer.c', + 'virccw.c', 'vircgroup.c', 'vircgroupbackend.c', 'vircgroupv1.c', diff --git a/src/util/virccw.c b/src/util/virccw.c new file mode 100644 index 0000000000..409287b380 --- /dev/null +++ b/src/util/virccw.c @@ -0,0 +1,29 @@ +/* + * virccw.c: helper APIs for managing host CCW devices + * + * Copyright (C) 2022 IBM Corporation + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#include +#include "virccw.h" + + +char* +virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) +{ + return g_strdup_printf("%x.%x.%04x", addr->cssid, addr->ssid, addr->de= vno); +} diff --git a/src/util/virccw.h b/src/util/virccw.h index 701e13284b..21a03406fa 100644 --- a/src/util/virccw.h +++ b/src/util/virccw.h @@ -29,3 +29,6 @@ struct _virCCWDeviceAddress { unsigned int devno; bool assigned; }; + +char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) + ATTRIBUTE_NONNULL(1); --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 1652437897145134.13686382785647; Fri, 13 May 2022 03:31:37 -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-621-8uB-DdiRPO2ltS7xydwQ2g-1; Fri, 13 May 2022 06:31:34 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A034586B8B9; Fri, 13 May 2022 10:31:32 +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 7C924415F5E; Fri, 13 May 2022 10:31:32 +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 318D51932115; Fri, 13 May 2022 10:31:31 +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 DC716194975B for ; Fri, 13 May 2022 10:31:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C05FC438BE0; Fri, 13 May 2022 10:31:29 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BC1B4438BDE for ; Fri, 13 May 2022 10:31:29 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 A4C643C11C68 for ; Fri, 13 May 2022 10:31:29 +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-212-RwGBhukbNy-o16Z9087Mkg-1; Fri, 13 May 2022 06:31:28 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24D8EFlD011521 for ; Fri, 13 May 2022 10:31:27 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1kmvjfun-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 (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DANMpE027511 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 ppma03fra.de.ibm.com with ESMTP id 3g0kn79yrk-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 24DAVMSn36110828 (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 3D4A611C052; 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 1FCA511C054; 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: 8uB-DdiRPO2ltS7xydwQ2g-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: RwGBhukbNy-o16Z9087Mkg-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 04/17] util: make reuse of ccw device address format constant Date: Fri, 13 May 2022 12:31:03 +0200 Message-Id: <20220513103116.3751-5-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: _CG5apjHNdN1A-s5e5Ge2qwzCkc1mPPF X-Proofpoint-ORIG-GUID: _CG5apjHNdN1A-s5e5Ge2qwzCkc1mPPF 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 suspectscore=0 mlxlogscore=936 adultscore=0 impostorscore=0 priorityscore=1501 spamscore=0 clxscore=1015 bulkscore=0 phishscore=0 lowpriorityscore=0 mlxscore=0 malwarescore=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.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.85 on 10.11.54.10 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: 1652437899337100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/conf/device_conf.h | 1 - src/qemu/qemu_command.c | 2 +- src/util/virccw.c | 2 +- src/util/virccw.h | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 60d90bbf19..950d333e2e 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -202,7 +202,6 @@ int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virCCWDeviceAddress *addr); bool virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1, virCCWDeviceAddress *addr2); -#define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x" =20 int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, virDomainDeviceDriveAddress *addr); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3746f02ff0..a1aa5e7cd2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -600,7 +600,7 @@ qemuBuildDeviceAddressProps(virJSONValue *props, return 0; =20 case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: { - g_autofree char *devno =3D g_strdup_printf("%x.%x.%04x", + g_autofree char *devno =3D g_strdup_printf(VIR_CCW_DEVICE_ADDRESS_= FMT, info->addr.ccw.cssid, info->addr.ccw.ssid, info->addr.ccw.devno); diff --git a/src/util/virccw.c b/src/util/virccw.c index 409287b380..5a19d3a112 100644 --- a/src/util/virccw.c +++ b/src/util/virccw.c @@ -25,5 +25,5 @@ char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) { - return g_strdup_printf("%x.%x.%04x", addr->cssid, addr->ssid, addr->de= vno); + return g_strdup_printf(VIR_CCW_DEVICE_ADDRESS_FMT, addr->cssid, addr->= ssid, addr->devno); } diff --git a/src/util/virccw.h b/src/util/virccw.h index 21a03406fa..127359c299 100644 --- a/src/util/virccw.h +++ b/src/util/virccw.h @@ -22,6 +22,8 @@ =20 #include "internal.h" =20 +#define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x" + typedef struct _virCCWDeviceAddress virCCWDeviceAddress; struct _virCCWDeviceAddress { unsigned int cssid; --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 Reviewed-by: Michal Privoznik --- 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 From nobody Fri Mar 29 08:07:30 2024 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 1652437911088891.8502876581546; Fri, 13 May 2022 03:31:51 -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-294-9jk4st3bN7WOk8uoGJdzzQ-1; Fri, 13 May 2022 06:31:43 -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 6B8D0803B22; Fri, 13 May 2022 10:31:39 +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 56D3B40D2820; Fri, 13 May 2022 10:31:39 +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 138A0193220C; Fri, 13 May 2022 10:31:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 166521932238 for ; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EC38040D2822; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E70CD40D2821 for ; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 D0742185A79C 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-372-xom_lIG1N8iXa8EH8toBaQ-1; Fri, 13 May 2022 06:31:29 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24D9ps3j021125 for ; Fri, 13 May 2022 10:31:28 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1n2u0qaf-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 (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DAMj9r015744 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 ppma03ams.nl.ibm.com with ESMTP id 3fwgd90ew9-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 24DAVMe536110834 (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 9119511C04C; 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 7389511C054; 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: 9jk4st3bN7WOk8uoGJdzzQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: xom_lIG1N8iXa8EH8toBaQ-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 06/17] util: refactor virDomainCCWAddressIncrement into virccw Date: Fri, 13 May 2022 12:31:05 +0200 Message-Id: <20220513103116.3751-7-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: 1tGTex__lIX7S51Fq2E6xnCd7YnWi7WS X-Proofpoint-ORIG-GUID: 1tGTex__lIX7S51Fq2E6xnCd7YnWi7WS 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 lowpriorityscore=0 malwarescore=0 adultscore=0 spamscore=0 clxscore=1015 impostorscore=0 suspectscore=0 priorityscore=1501 mlxlogscore=763 mlxscore=0 phishscore=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.84 on 10.11.54.2 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: 1652437913106100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Refactor virDomainCCWAddressIncrement into virccw and rename method as virCCWDeviceAddressIncrement. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/conf/domain_addr.c | 16 +--------------- src/libvirt_private.syms | 1 + src/util/virccw.c | 13 +++++++++++++ src/util/virccw.h | 1 + 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 65b438f13c..edc254a6ee 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1303,20 +1303,6 @@ virDomainPCIAddressSetAllMulti(virDomainDef *def) } =20 =20 -static int -virDomainCCWAddressIncrement(virCCWDeviceAddress *addr) -{ - virCCWDeviceAddress ccwaddr =3D *addr; - - /* We are not touching subchannel sets and channel subsystems */ - if (++ccwaddr.devno > VIR_CCW_DEVICE_MAX_DEVNO) - return -1; - - *addr =3D ccwaddr; - return 0; -} - - int virDomainCCWAddressAssign(virDomainDeviceInfo *dev, virDomainCCWAddressSet *addrs, @@ -1342,7 +1328,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfo *dev, return -1; =20 while (virHashLookup(addrs->defined, addr)) { - if (virDomainCCWAddressIncrement(&addrs->next) < 0) { + if (virCCWDeviceAddressIncrement(&addrs->next) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("There are no more free CCW devnos.")); return -1; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index eaf4a1da9c..fae8edb6cd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1926,6 +1926,7 @@ virBufferVasprintf; =20 # util/virccw.h virCCWDeviceAddressAsString; +virCCWDeviceAddressIncrement; =20 =20 # util/vircgroup.h diff --git a/src/util/virccw.c b/src/util/virccw.c index 5a19d3a112..d14d432414 100644 --- a/src/util/virccw.c +++ b/src/util/virccw.c @@ -27,3 +27,16 @@ virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) { return g_strdup_printf(VIR_CCW_DEVICE_ADDRESS_FMT, addr->cssid, addr->= ssid, addr->devno); } + +int +virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr) +{ + virCCWDeviceAddress ccwaddr =3D *addr; + + /* We are not touching subchannel sets and channel subsystems */ + if (++ccwaddr.devno > VIR_CCW_DEVICE_MAX_DEVNO) + return -1; + + *addr =3D ccwaddr; + return 0; +} diff --git a/src/util/virccw.h b/src/util/virccw.h index c3a47127f1..4c48c9605e 100644 --- a/src/util/virccw.h +++ b/src/util/virccw.h @@ -37,3 +37,4 @@ struct _virCCWDeviceAddress { =20 char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) ATTRIBUTE_NONNULL(1); +int virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr); --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 Reviewed-by: Michal Privoznik --- 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 From nobody Fri Mar 29 08:07:30 2024 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 Reviewed-by: Michal Privoznik --- 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 From nobody Fri Mar 29 08:07:30 2024 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 1652437924028813.5192384992836; Fri, 13 May 2022 03:32:04 -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-635-m7iAMq1VOYWcVWytIzpmnA-1; Fri, 13 May 2022 06:31:39 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 97BFB83396A; 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 84A05415F5E; 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 11972192B8E9; Fri, 13 May 2022 10:31:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 92F64193211B for ; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6DD15C53361; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 693E8C53360 for ; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 510E439F9CB8 for ; Fri, 13 May 2022 10:31:31 +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-554-lD1-DGjgPvqz07lUTS507g-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 24D9fqRO031202 for ; Fri, 13 May 2022 10:31:28 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1mx40vgb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:28 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DAMm8I015766 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 ppma03ams.nl.ibm.com with ESMTP id 3fwgd90ewb-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 24DAVNEX44171634 (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 23BFE11C04C; Fri, 13 May 2022 10:31:23 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0304011C052; Fri, 13 May 2022 10:31:23 +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: m7iAMq1VOYWcVWytIzpmnA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: lD1-DGjgPvqz07lUTS507g-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 09/17] conf: adjust method name virDomainDeviceCCWAddressParseXML Date: Fri, 13 May 2022 12:31:08 +0200 Message-Id: <20220513103116.3751-10-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: PDKfD3f3XDhzN7wz8VKPPCbHMq8P5Mxp X-Proofpoint-ORIG-GUID: PDKfD3f3XDhzN7wz8VKPPCbHMq8P5Mxp 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=782 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.8 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.85 on 10.11.54.10 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: 1652437925119100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Adjust method name virDomainDeviceCCWAddressParseXML to virCCWDeviceAddressParseXML. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/conf/device_conf.c | 4 ++-- src/conf/device_conf.h | 4 ++-- src/conf/domain_conf.c | 3 +-- src/libvirt_private.syms | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 958e2f43cc..e93fd57341 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -259,8 +259,8 @@ virPCIDeviceAddressFormat(virBuffer *buf, } =20 int -virDomainDeviceCCWAddressParseXML(xmlNodePtr node, - virCCWDeviceAddress *addr) +virCCWDeviceAddressParseXML(xmlNodePtr node, + virCCWDeviceAddress *addr) { int cssid; int ssid; diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 01e2edccc9..910e6b7792 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -193,8 +193,8 @@ void virPCIDeviceAddressFormat(virBuffer *buf, virPCIDeviceAddress addr, bool includeTypeInAddr); =20 -int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, - virCCWDeviceAddress *addr); +int virCCWDeviceAddressParseXML(xmlNodePtr node, + virCCWDeviceAddress *addr); =20 int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, virDomainDeviceDriveAddress *addr); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 826ba4183d..73970e488e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6720,8 +6720,7 @@ virDomainDeviceAddressParseXML(xmlNodePtr address, break; =20 case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: - if (virDomainDeviceCCWAddressParseXML - (address, &info->addr.ccw) < 0) + if (virCCWDeviceAddressParseXML(address, &info->addr.ccw) < 0) return -1; break; =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 019f7c60e4..09867b7876 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -124,6 +124,7 @@ virCPUModeTypeToString; =20 =20 # conf/device_conf.h +virCCWDeviceAddressParseXML; virDeviceInfoPCIAddressExtensionIsPresent; virDeviceInfoPCIAddressExtensionIsWanted; virDeviceInfoPCIAddressIsPresent; @@ -131,7 +132,6 @@ virDeviceInfoPCIAddressIsWanted; virDomainDeviceAddressIsValid; virDomainDeviceAddressTypeToString; virDomainDeviceCcidAddressParseXML; -virDomainDeviceCCWAddressParseXML; virDomainDeviceDriveAddressParseXML; virDomainDeviceInfoAddressIsEqual; virDomainDeviceSpaprVioAddressParseXML; --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 1652437929450398.8185517067295; Fri, 13 May 2022 03:32:09 -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-480-q1s76fkcOkyOCt9t_RpOgw-1; Fri, 13 May 2022 06:31:41 -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 6F8118041A6; Fri, 13 May 2022 10:31:36 +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 5B3A240D2822; Fri, 13 May 2022 10:31:36 +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 95781193223C; Fri, 13 May 2022 10:31:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2A6AA1932107 for ; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 069CAC53363; 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 02779C53360 for ; Fri, 13 May 2022 10:31:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 DF54085A5A8 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-552-CoifsB9WOpOZJlruJKw9-g-1; Fri, 13 May 2022 06:31:29 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24D8EG6W011664 for ; Fri, 13 May 2022 10:31:28 GMT Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1kmvjfux-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:28 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DALtGD010394 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 ppma04fra.de.ibm.com with ESMTP id 3g0ma1hxra-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 24DAVNkM44171636 (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 5E7FB11C04C; Fri, 13 May 2022 10:31:23 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 39B3411C054; Fri, 13 May 2022 10:31:23 +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:23 +0000 (GMT) X-MC-Unique: q1s76fkcOkyOCt9t_RpOgw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: CoifsB9WOpOZJlruJKw9-g-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 10/17] util: add ccw device address parsing into virccw Date: Fri, 13 May 2022 12:31:09 +0200 Message-Id: <20220513103116.3751-11-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: Dcu0agAesxo2ogZAk8eGtZdcZQHfwcVM X-Proofpoint-ORIG-GUID: Dcu0agAesxo2ogZAk8eGtZdcZQHfwcVM 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 suspectscore=0 mlxlogscore=820 adultscore=0 impostorscore=0 priorityscore=1501 spamscore=0 clxscore=1015 bulkscore=0 phishscore=0 lowpriorityscore=0 mlxscore=0 malwarescore=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.8 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: 1652437931149100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Add virCCWDeviceAddressParseFromString and use it in nodedev udev. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 8 +++++--- src/util/virccw.c | 18 ++++++++++++++++++ src/util/virccw.h | 5 +++++ 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 09867b7876..148d016e0e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1927,6 +1927,7 @@ virCCWDeviceAddressAsString; virCCWDeviceAddressEqual; virCCWDeviceAddressIncrement; virCCWDeviceAddressIsValid; +virCCWDeviceAddressParseFromString; =20 =20 # util/vircgroup.h diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index b68dc12158..4bb841c66b 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -36,6 +36,7 @@ #include "viruuid.h" #include "virbuffer.h" #include "virfile.h" +#include "virccw.h" #include "virpci.h" #include "virpidfile.h" #include "virstring.h" @@ -1086,9 +1087,10 @@ udevGetCCWAddress(const char *sysfs_path, char *p; =20 if ((p =3D strrchr(sysfs_path, '/')) =3D=3D NULL || - virStrToLong_ui(p + 1, &p, 16, &data->ccw_dev.cssid) < 0 || p =3D= =3D NULL || - virStrToLong_ui(p + 1, &p, 16, &data->ccw_dev.ssid) < 0 || p =3D= =3D NULL || - virStrToLong_ui(p + 1, &p, 16, &data->ccw_dev.devno) < 0) { + virCCWDeviceAddressParseFromString(p + 1, + &data->ccw_dev.cssid, + &data->ccw_dev.ssid, + &data->ccw_dev.devno) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse the CCW address from sysfs path:= '%s'"), sysfs_path); diff --git a/src/util/virccw.c b/src/util/virccw.c index e2785bd9ab..33df1c2428 100644 --- a/src/util/virccw.c +++ b/src/util/virccw.c @@ -20,6 +20,7 @@ =20 #include #include "virccw.h" +#include "virstring.h" =20 =20 bool @@ -60,3 +61,20 @@ virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr) *addr =3D ccwaddr; return 0; } + +int +virCCWDeviceAddressParseFromString(const char *address, + unsigned int *cssid, + unsigned int *ssid, + unsigned int *devno) +{ + char *p; + + if (address =3D=3D NULL || virStrToLong_ui(address, &p, 16, cssid) < 0= || + p =3D=3D NULL || virStrToLong_ui(p + 1, &p, 16, ssid) < 0 || + p =3D=3D NULL || virStrToLong_ui(p + 1, &p, 16, devno) < 0) { + return -1; + } + + return 0; +} diff --git a/src/util/virccw.h b/src/util/virccw.h index aebbd4ab6d..df0273bcac 100644 --- a/src/util/virccw.h +++ b/src/util/virccw.h @@ -42,3 +42,8 @@ bool virCCWDeviceAddressEqual(virCCWDeviceAddress *addr1, char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) ATTRIBUTE_NONNULL(1); int virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr); + +int virCCWDeviceAddressParseFromString(const char *address, + unsigned int *cssid, + unsigned int *ssid, + unsigned int *devno); --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 16524379085231013.3196291758245; Fri, 13 May 2022 03:31:48 -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-187-lyRluAraMIep3AwCjoZdYw-1; Fri, 13 May 2022 06:31:43 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E5FC5100BABF; Fri, 13 May 2022 10:31:39 +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 D168D416157; Fri, 13 May 2022 10:31:39 +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 61C601932207; Fri, 13 May 2022 10:31:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2B50B1932109 for ; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 09B25C53360; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 05DF0C53361 for ; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (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 E264318E5380 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-554-MTYQASIzNqC-41wWbaVWew-1; Fri, 13 May 2022 06:31:29 -0400 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24D91wFK011865 for ; Fri, 13 May 2022 10:31:28 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1mbgsmhy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:28 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DAMkRA015753 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 ppma03ams.nl.ibm.com with ESMTP id 3fwgd90ewc-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 24DAVNVK44171638 (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 8F13A11C04C; Fri, 13 May 2022 10:31:23 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6AC0E11C052; Fri, 13 May 2022 10:31:23 +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:23 +0000 (GMT) X-MC-Unique: lyRluAraMIep3AwCjoZdYw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: MTYQASIzNqC-41wWbaVWew-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 11/17] util: add virCCWDeviceAddressFromString to virccw Date: Fri, 13 May 2022 12:31:10 +0200 Message-Id: <20220513103116.3751-12-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: Uyf153hyTvp6WdYc4x__4EtdKbKjsgmL X-Proofpoint-ORIG-GUID: Uyf153hyTvp6WdYc4x__4EtdKbKjsgmL 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 impostorscore=0 mlxscore=0 bulkscore=0 suspectscore=0 malwarescore=0 adultscore=0 clxscore=1015 mlxlogscore=804 spamscore=0 lowpriorityscore=0 priorityscore=1501 phishscore=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.8 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.85 on 10.11.54.10 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: 1652437909017100013 Content-Type: text/plain; charset="utf-8"; x-default="true" Add a method to parse a ccw device address from a string. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- po/POTFILES.in | 1 + src/libvirt_private.syms | 1 + src/util/virccw.c | 23 +++++++++++++++++++++++ src/util/virccw.h | 3 +++ 4 files changed, 28 insertions(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 0d9adb0758..71d113efa2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -247,6 +247,7 @@ @SRCDIR@src/util/virauth.c @SRCDIR@src/util/virauthconfig.c @SRCDIR@src/util/virbitmap.c +@SRCDIR@src/util/virccw.c @SRCDIR@src/util/vircgroup.c @SRCDIR@src/util/vircgroupbackend.c @SRCDIR@src/util/vircgroupbackend.h diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 148d016e0e..7c37763bd7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1925,6 +1925,7 @@ virBufferVasprintf; # util/virccw.h virCCWDeviceAddressAsString; virCCWDeviceAddressEqual; +virCCWDeviceAddressFromString; virCCWDeviceAddressIncrement; virCCWDeviceAddressIsValid; virCCWDeviceAddressParseFromString; diff --git a/src/util/virccw.c b/src/util/virccw.c index 33df1c2428..d741743050 100644 --- a/src/util/virccw.c +++ b/src/util/virccw.c @@ -20,8 +20,11 @@ =20 #include #include "virccw.h" +#include "virerror.h" #include "virstring.h" =20 +#define VIR_FROM_THIS VIR_FROM_NONE + =20 bool virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr) @@ -49,6 +52,26 @@ virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) return g_strdup_printf(VIR_CCW_DEVICE_ADDRESS_FMT, addr->cssid, addr->= ssid, addr->devno); } =20 +virCCWDeviceAddress * +virCCWDeviceAddressFromString(const char *address) +{ + g_autofree virCCWDeviceAddress *ccw =3D NULL; + + ccw =3D g_new0(virCCWDeviceAddress, 1); + + if (virCCWDeviceAddressParseFromString(address, + &ccw->cssid, + &ccw->ssid, + &ccw->devno) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to parse CCW address '%s'"), + address); + return NULL; + } + + return g_steal_pointer(&ccw); +} + int virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr) { diff --git a/src/util/virccw.h b/src/util/virccw.h index df0273bcac..80cc716811 100644 --- a/src/util/virccw.h +++ b/src/util/virccw.h @@ -41,6 +41,9 @@ bool virCCWDeviceAddressEqual(virCCWDeviceAddress *addr1, =20 char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) ATTRIBUTE_NONNULL(1); +virCCWDeviceAddress *virCCWDeviceAddressFromString(const char *address) + ATTRIBUTE_NONNULL(1); + int virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr); =20 int virCCWDeviceAddressParseFromString(const char *address, --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 1652437928683962.9816149513995; Fri, 13 May 2022 03:32:08 -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-121-rZAOrwzLM-KMnxelOTbjxA-1; Fri, 13 May 2022 06:31:41 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 86DC23AF42C5; Fri, 13 May 2022 10:31:37 +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 62538438BF2; Fri, 13 May 2022 10:31:37 +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 591DB1932119; Fri, 13 May 2022 10:31:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6DEC11932239 for ; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 61C0D40D2822; Fri, 13 May 2022 10:31:32 +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 5D4C340D2821 for ; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 42AA680A0AD for ; Fri, 13 May 2022 10:31:32 +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-246-UlFo5VNzNoWVNbAh7YDo4A-1; Fri, 13 May 2022 06:31:30 -0400 Received: from pps.filterd (m0187473.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24DAHKUY022158 for ; Fri, 13 May 2022 10:31:29 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 3g1netr7pd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:29 +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 24DANYsc019455 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 ppma04ams.nl.ibm.com with ESMTP id 3fwgd90ef9-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 24DAVNbp44171640 (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 BF30E11C04C; Fri, 13 May 2022 10:31:23 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9B16111C054; Fri, 13 May 2022 10:31:23 +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:23 +0000 (GMT) X-MC-Unique: rZAOrwzLM-KMnxelOTbjxA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: UlFo5VNzNoWVNbAh7YDo4A-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 12/17] nodedev: refactor css format from ccw format method Date: Fri, 13 May 2022 12:31:11 +0200 Message-Id: <20220513103116.3751-13-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: exVuhK1NQUTeWRKpNyr19xyO7PfeCVBr X-Proofpoint-ORIG-GUID: exVuhK1NQUTeWRKpNyr19xyO7PfeCVBr 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 lowpriorityscore=0 suspectscore=0 phishscore=0 clxscore=1015 malwarescore=0 bulkscore=0 mlxscore=0 mlxlogscore=926 spamscore=0 impostorscore=0 priorityscore=1501 adultscore=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.84 on 10.11.54.2 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.85 on 10.11.54.9 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: 1652437929133100001 Content-Type: text/plain; charset="utf-8"; x-default="true" In preparation for easier extension later. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/conf/node_device_conf.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 67c8c4a3fd..97779078e8 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -634,10 +634,21 @@ virNodeDeviceCapCCWDefFormat(virBuffer *buf, data->ccw_dev.ssid); virBufferAsprintf(buf, "0x%04x\n", data->ccw_dev.devno); - if (data->ccw_dev.flags & VIR_NODE_DEV_CAP_FLAG_CSS_MDEV) +} + + +static void +virNodeDeviceCapCSSDefFormat(virBuffer *buf, + const virNodeDevCapData *data) +{ + virNodeDevCapCCW ccw_dev =3D data->ccw_dev; + + virNodeDeviceCapCCWDefFormat(buf, data); + + if (ccw_dev.flags & VIR_NODE_DEV_CAP_FLAG_CSS_MDEV) virNodeDeviceCapMdevTypesFormat(buf, - data->ccw_dev.mdev_types, - data->ccw_dev.nmdev_types); + ccw_dev.mdev_types, + ccw_dev.nmdev_types); } =20 =20 @@ -726,9 +737,11 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def) virNodeDeviceCapMdevDefFormat(&buf, data); break; case VIR_NODE_DEV_CAP_CCW_DEV: - case VIR_NODE_DEV_CAP_CSS_DEV: virNodeDeviceCapCCWDefFormat(&buf, data); break; + case VIR_NODE_DEV_CAP_CSS_DEV: + virNodeDeviceCapCSSDefFormat(&buf, data); + break; case VIR_NODE_DEV_CAP_VDPA: virNodeDeviceCapVDPADefFormat(&buf, data); break; --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 165243790617959.191029674767265; Fri, 13 May 2022 03:31:46 -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-424-QdjSeDmSO2-Op-la6zZlzg-1; Fri, 13 May 2022 06:31:41 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 589BD86B8D8; Fri, 13 May 2022 10:31:37 +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 076A7438BE0; Fri, 13 May 2022 10:31:37 +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 ECD561932123; Fri, 13 May 2022 10:31:35 +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 E8BDC192B8FC for ; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CB637416156; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C627F416364 for ; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 AA2D139F9CBA for ; Fri, 13 May 2022 10:31:32 +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-588-ZdQ506WBPwSlZdCWQiaEgA-1; Fri, 13 May 2022 06:31:31 -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 24D9fp5j031106 for ; Fri, 13 May 2022 10:31:30 GMT Received: from ppma02fra.de.ibm.com (47.49.7a9f.ip4.static.sl-reverse.com [159.122.73.71]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1mx40vgq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:29 +0000 Received: from pps.filterd (ppma02fra.de.ibm.com [127.0.0.1]) by ppma02fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DAMlWE004282 for ; Fri, 13 May 2022 10:31:27 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma02fra.de.ibm.com with ESMTP id 3fwgd8xkjy-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 d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 24DAVOku53608894 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 May 2022 10:31:24 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F33FD11C04C; Fri, 13 May 2022 10:31:23 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CBDFD11C052; Fri, 13 May 2022 10:31:23 +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:23 +0000 (GMT) X-MC-Unique: QdjSeDmSO2-Op-la6zZlzg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ZdQ506WBPwSlZdCWQiaEgA-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 13/17] nodedev: refactor ccw device address parsing from XML Date: Fri, 13 May 2022 12:31:12 +0200 Message-Id: <20220513103116.3751-14-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: 2Oh-9nK_w3IM_NfgxtWfRWcKo3DnZIMc X-Proofpoint-ORIG-GUID: 2Oh-9nK_w3IM_NfgxtWfRWcKo3DnZIMc 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=999 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.85 on 10.11.54.9 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: 1652438809125100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Move ccw device address XML parsing into new method for later reuse. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/conf/node_device_conf.c | 96 ++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 38 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 97779078e8..8d160185eb 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1143,6 +1143,58 @@ virNodeDevAPMatrixCapabilityParseXML(xmlXPathContext= Ptr ctxt, } =20 =20 +static int +virNodeDevCCWDeviceAddressParseXML(xmlXPathContextPtr ctxt, + xmlNodePtr node, + const char *dev_name, + virCCWDeviceAddress *ccw_addr) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + g_autofree char *cssid =3D NULL; + g_autofree char *ssid =3D NULL; + g_autofree char *devno =3D NULL; + + ctxt->node =3D node; + + if (!(cssid =3D virXPathString("string(./cssid[1])", ctxt))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("missing cssid value for '%s'"), dev_name); + return -1; + } + if (virStrToLong_uip(cssid, NULL, 0, &ccw_addr->cssid) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid cssid value '%s' for '%s'"), + cssid, dev_name); + return -1; + } + + if (!(ssid =3D virXPathString("string(./ssid[1])", ctxt))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("missing ssid value for '%s'"), dev_name); + return -1; + } + if (virStrToLong_uip(ssid, NULL, 0, &ccw_addr->ssid) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid ssid value '%s' for '%s'"), + ssid, dev_name); + return -1; + } + + if (!(devno =3D virXPathString("string(./devno[1])", ctxt))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("missing devno value for '%s'"), dev_name); + return -1; + } + if (virStrToLong_uip(devno, NULL, 16, &ccw_addr->devno) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid devno value '%s' for '%s'"), + devno, dev_name); + return -1; + } + + return 0; +} + static int virNodeDevCSSCapabilityParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, @@ -1180,50 +1232,18 @@ virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt, g_autofree xmlNodePtr *nodes =3D NULL; int n =3D 0; size_t i =3D 0; - g_autofree char *cssid =3D NULL; - g_autofree char *ssid =3D NULL; - g_autofree char *devno =3D NULL; + g_autofree virCCWDeviceAddress *ccw_addr =3D NULL; =20 ctxt->node =3D node; =20 - if (!(cssid =3D virXPathString("string(./cssid[1])", ctxt))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing cssid value for '%s'"), def->name); - return -1; - } - - if (virStrToLong_uip(cssid, NULL, 0, &ccw_dev->cssid) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid cssid value '%s' for '%s'"), - cssid, def->name); - return -1; - } - - if (!(ssid =3D virXPathString("string(./ssid[1])", ctxt))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing ssid value for '%s'"), def->name); - return -1; - } + ccw_addr =3D g_new0(virCCWDeviceAddress, 1); =20 - if (virStrToLong_uip(ssid, NULL, 0, &ccw_dev->ssid) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid ssid value '%s' for '%s'"), - ssid, def->name); + if (virNodeDevCCWDeviceAddressParseXML(ctxt, node, def->name, ccw_addr= ) < 0) return -1; - } =20 - if (!(devno =3D virXPathString("string(./devno[1])", ctxt))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing devno value for '%s'"), def->name); - return -1; - } - - if (virStrToLong_uip(devno, NULL, 16, &ccw_dev->devno) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid devno value '%s' for '%s'"), - devno, def->name); - return -1; - } + ccw_dev->cssid =3D ccw_addr->cssid; + ccw_dev->ssid =3D ccw_addr->ssid; + ccw_dev->devno =3D ccw_addr->devno; =20 if ((n =3D virXPathNodeSet("./capability", ctxt, &nodes)) < 0) return -1; --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 1652437932399330.7756538901315; Fri, 13 May 2022 03:32:12 -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-404-wvWl-obeN5iz6CIpC4SKiA-1; Fri, 13 May 2022 06:32:08 -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 7B52B8032E5; Fri, 13 May 2022 10:32:06 +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 67EDD40D2820; Fri, 13 May 2022 10:32:06 +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 184111956B85; Fri, 13 May 2022 10:32:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5469C1932234 for ; Fri, 13 May 2022 10:32:04 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 33F17111F3DB; Fri, 13 May 2022 10:32:04 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F60E111F3D9 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 77E88811E76 for ; Fri, 13 May 2022 10:31:31 +0000 (UTC) Received: from mx0b-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-61-hmjl4xqfO-K0tNsFkcxYYw-1; Fri, 13 May 2022 06:31:29 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24D7UlIC006268 for ; Fri, 13 May 2022 10:31:29 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1k0s39xq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:29 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DAMkQk015757 for ; Fri, 13 May 2022 10:31:27 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma03ams.nl.ibm.com with ESMTP id 3fwgd90ewd-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 d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 24DAVOlh52167102 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 May 2022 10:31:24 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3116D11C052; Fri, 13 May 2022 10:31:24 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0B09A11C058; Fri, 13 May 2022 10:31:24 +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:23 +0000 (GMT) X-MC-Unique: wvWl-obeN5iz6CIpC4SKiA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: hmjl4xqfO-K0tNsFkcxYYw-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 14/17] nodedev: refactor css XML parsing from ccw XML parsing Date: Fri, 13 May 2022 12:31:13 +0200 Message-Id: <20220513103116.3751-15-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: PkREOZe-bZ-NYl_g-roT03cOGLgWjxTA X-Proofpoint-ORIG-GUID: PkREOZe-bZ-NYl_g-roT03cOGLgWjxTA 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 malwarescore=0 phishscore=0 priorityscore=1501 suspectscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 bulkscore=0 clxscore=1015 impostorscore=0 mlxlogscore=738 mlxscore=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.78 on 10.11.54.3 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: 1652437933201100005 Content-Type: text/plain; charset="utf-8"; x-default="true" In preparation for easier extension later. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/conf/node_device_conf.c | 40 +++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 8d160185eb..5aafcbb838 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1195,6 +1195,31 @@ virNodeDevCCWDeviceAddressParseXML(xmlXPathContextPt= r ctxt, return 0; } =20 + +static int +virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDef *def, + xmlNodePtr node, + virNodeDevCapCCW *ccw_dev) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + g_autofree virCCWDeviceAddress *ccw_addr =3D NULL; + + ctxt->node =3D node; + + ccw_addr =3D g_new0(virCCWDeviceAddress, 1); + + if (virNodeDevCCWDeviceAddressParseXML(ctxt, node, def->name, ccw_addr= ) < 0) + return -1; + + ccw_dev->cssid =3D ccw_addr->cssid; + ccw_dev->ssid =3D ccw_addr->ssid; + ccw_dev->devno =3D ccw_addr->devno; + + return 0; +} + + static int virNodeDevCSSCapabilityParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, @@ -1223,7 +1248,7 @@ virNodeDevCSSCapabilityParseXML(xmlXPathContextPtr ct= xt, =20 =20 static int -virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt, +virNodeDevCapCSSParseXML(xmlXPathContextPtr ctxt, virNodeDeviceDef *def, xmlNodePtr node, virNodeDevCapCCW *ccw_dev) @@ -1232,19 +1257,12 @@ virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt, g_autofree xmlNodePtr *nodes =3D NULL; int n =3D 0; size_t i =3D 0; - g_autofree virCCWDeviceAddress *ccw_addr =3D NULL; =20 ctxt->node =3D node; =20 - ccw_addr =3D g_new0(virCCWDeviceAddress, 1); - - if (virNodeDevCCWDeviceAddressParseXML(ctxt, node, def->name, ccw_addr= ) < 0) + if (virNodeDevCapCCWParseXML(ctxt, def, node, ccw_dev) < 0) return -1; =20 - ccw_dev->cssid =3D ccw_addr->cssid; - ccw_dev->ssid =3D ccw_addr->ssid; - ccw_dev->devno =3D ccw_addr->devno; - if ((n =3D virXPathNodeSet("./capability", ctxt, &nodes)) < 0) return -1; =20 @@ -2284,9 +2302,11 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, ret =3D virNodeDevCapMdevParseXML(ctxt, def, node, &caps->data.mde= v); break; case VIR_NODE_DEV_CAP_CCW_DEV: - case VIR_NODE_DEV_CAP_CSS_DEV: ret =3D virNodeDevCapCCWParseXML(ctxt, def, node, &caps->data.ccw_= dev); break; + case VIR_NODE_DEV_CAP_CSS_DEV: + ret =3D virNodeDevCapCSSParseXML(ctxt, def, node, &caps->data.ccw_= dev); + break; case VIR_NODE_DEV_CAP_AP_CARD: ret =3D virNodeDevCapAPCardParseXML(ctxt, def, node, &caps->data.ap_card); --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 1652437906391859.1641795769349; Fri, 13 May 2022 03:31:46 -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-99-Bh_lRlAEMu-cPMWvhYBalw-1; Fri, 13 May 2022 06:31:41 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E453E3C1905B; Fri, 13 May 2022 10:31:37 +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 C5546438BDF; Fri, 13 May 2022 10:31:37 +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 AEF53193211F; Fri, 13 May 2022 10:31:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1369D192B8FE for ; Fri, 13 May 2022 10:31:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D571DC53361; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0CD5C53360 for ; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 B7CF4804195 for ; Fri, 13 May 2022 10:31:32 +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-620-PTGHFD_ENf-jNSDGK-QBEQ-1; Fri, 13 May 2022 06:31:31 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24DAOR8P002644 for ; Fri, 13 May 2022 10:31:30 GMT Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1nj683wh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:29 +0000 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DANZLv012262 for ; Fri, 13 May 2022 10:31:27 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma06fra.de.ibm.com with ESMTP id 3fwg1hxkky-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 d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 24DAVOGi52167104 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 May 2022 10:31:24 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6268911C04C; Fri, 13 May 2022 10:31:24 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3D31A11C05B; Fri, 13 May 2022 10:31:24 +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:24 +0000 (GMT) X-MC-Unique: Bh_lRlAEMu-cPMWvhYBalw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: PTGHFD_ENf-jNSDGK-QBEQ-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 15/17] schemas: refactor out nodedev ccw address schema Date: Fri, 13 May 2022 12:31:14 +0200 Message-Id: <20220513103116.3751-16-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-ORIG-GUID: U5f_ANX3IrtxzF4tq-xYYcv7MNUgqAPz X-Proofpoint-GUID: U5f_ANX3IrtxzF4tq-xYYcv7MNUgqAPz 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 suspectscore=0 mlxlogscore=859 impostorscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 adultscore=0 bulkscore=0 spamscore=0 phishscore=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.8 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.85 on 10.11.54.9 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: 1652437907059100009 Content-Type: text/plain; charset="utf-8"; x-default="true" Refactor out nodedev ccw address schema for easy reuse later. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/conf/schemas/nodedev.rng | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/conf/schemas/nodedev.rng b/src/conf/schemas/nodedev.rng index 0d7d1168b6..a9f83e048c 100644 --- a/src/conf/schemas/nodedev.rng +++ b/src/conf/schemas/nodedev.rng @@ -658,10 +658,7 @@ =20 - - - ccw - + @@ -673,19 +670,18 @@ =20 + + + ccw + + + + css - - - - - - - - - + --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 1652437911974224.29845888322507; Fri, 13 May 2022 03:31:51 -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-484-0aANmLKaME6lqMNNQetTDQ-1; Fri, 13 May 2022 06:31:45 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 40F8A80378A; 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 2C851438BE1; 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 BD0041932232; Fri, 13 May 2022 10:31:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D4C34192B8E9 for ; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B0F2DC53365; Fri, 13 May 2022 10:31:32 +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 ABDB4C53361 for ; Fri, 13 May 2022 10:31:32 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 933662919EC0 for ; Fri, 13 May 2022 10:31:31 +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-624-aRVCJZj6OBSyWmbOBFebwQ-1; Fri, 13 May 2022 06:31:30 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24DA3TNx011442 for ; Fri, 13 May 2022 10:31:29 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1n898get-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:29 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DANS2B007310 for ; Fri, 13 May 2022 10:31:27 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma06ams.nl.ibm.com with ESMTP id 3fyrkk4aqg-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 d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 24DAVOt352167106 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 May 2022 10:31:24 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9187411C04C; Fri, 13 May 2022 10:31:24 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 711AE11C052; Fri, 13 May 2022 10:31:24 +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:24 +0000 (GMT) X-MC-Unique: 0aANmLKaME6lqMNNQetTDQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: aRVCJZj6OBSyWmbOBFebwQ-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 16/17] nodedev: add optional device address of channel device to css device Date: Fri, 13 May 2022 12:31:15 +0200 Message-Id: <20220513103116.3751-17-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-ORIG-GUID: cYYXDeuuFd9Ng-y2uroB7p8uj0UqluMH X-Proofpoint-GUID: cYYXDeuuFd9Ng-y2uroB7p8uj0UqluMH 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 clxscore=1015 mlxlogscore=800 spamscore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 mlxscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 adultscore=0 bulkscore=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.8 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.85 on 10.11.54.9 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: 1652437913127100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Add the new introduced sysfs attribute dev_busid which provides the address of the device in the subchannel independent from the bound device driver. It is added if available in the sysfs as optional channel_dev_addr element = into the css device capabilty providing the ccw deivce address attributes cssid, ssid and devno. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- src/conf/node_device_conf.c | 26 ++++++++++++++++++++++++++ src/conf/node_device_conf.h | 2 ++ src/conf/schemas/nodedev.rng | 5 +++++ src/node_device/node_device_udev.c | 8 ++++++++ 4 files changed, 41 insertions(+) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 5aafcbb838..d5ee8da3ee 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -645,6 +645,17 @@ virNodeDeviceCapCSSDefFormat(virBuffer *buf, =20 virNodeDeviceCapCCWDefFormat(buf, data); =20 + if (ccw_dev.channel_dev_addr) { + virCCWDeviceAddress *ccw =3D ccw_dev.channel_dev_addr; + virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); + virBufferAsprintf(buf, "0x%x\n", ccw->cssid); + virBufferAsprintf(buf, "0x%x\n", ccw->ssid); + virBufferAsprintf(buf, "0x%04x\n", ccw->devno); + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + } + if (ccw_dev.flags & VIR_NODE_DEV_CAP_FLAG_CSS_MDEV) virNodeDeviceCapMdevTypesFormat(buf, ccw_dev.mdev_types, @@ -1257,6 +1268,8 @@ virNodeDevCapCSSParseXML(xmlXPathContextPtr ctxt, g_autofree xmlNodePtr *nodes =3D NULL; int n =3D 0; size_t i =3D 0; + xmlNodePtr channel_ddno =3D NULL; + g_autofree virCCWDeviceAddress *channel_dev =3D NULL; =20 ctxt->node =3D node; =20 @@ -1271,6 +1284,19 @@ virNodeDevCapCSSParseXML(xmlXPathContextPtr ctxt, return -1; } =20 + // channel_dev_addr is optional + if ((channel_ddno =3D virXPathNode("./channel_dev_addr[1]", ctxt))) { + channel_dev =3D g_new0(virCCWDeviceAddress, 1); + + if (virNodeDevCCWDeviceAddressParseXML(ctxt, + channel_ddno, + def->name, + channel_dev) < 0) + return -1; + + ccw_dev->channel_dev_addr =3D g_steal_pointer(&channel_dev); + } + return 0; } =20 diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index e4d1f67d53..d1751ed874 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -24,6 +24,7 @@ =20 #include "internal.h" #include "virbitmap.h" +#include "virccw.h" #include "virpcivpd.h" #include "virscsihost.h" #include "virpci.h" @@ -279,6 +280,7 @@ struct _virNodeDevCapCCW { unsigned int flags; /* enum virNodeDevCCWCapFlags */ virMediatedDeviceType **mdev_types; size_t nmdev_types; + virCCWDeviceAddress *channel_dev_addr; }; =20 typedef struct _virNodeDevCapVDPA virNodeDevCapVDPA; diff --git a/src/conf/schemas/nodedev.rng b/src/conf/schemas/nodedev.rng index a9f83e048c..e40243e257 100644 --- a/src/conf/schemas/nodedev.rng +++ b/src/conf/schemas/nodedev.rng @@ -682,6 +682,11 @@ css + + + + + diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index 4bb841c66b..16314627ca 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1124,6 +1124,8 @@ static int udevProcessCSS(struct udev_device *device, virNodeDeviceDef *def) { + char *dev_busid; + /* only process IO subchannel and vfio-ccw devices to keep the list sa= ne */ if (!def->driver || (STRNEQ(def->driver, "io_subchannel") && @@ -1135,6 +1137,12 @@ udevProcessCSS(struct udev_device *device, =20 udevGenerateDeviceName(device, def, NULL); =20 + /* process optional channel devices information */ + udevGetStringSysfsAttr(device, "dev_busid", &dev_busid); + + if (dev_busid !=3D NULL) + def->caps->data.ccw_dev.channel_dev_addr =3D virCCWDeviceAddressFr= omString(dev_busid); + if (virNodeDeviceGetCSSDynamicCaps(def->sysfs_path, &def->caps->data.c= cw_dev) < 0) return -1; =20 --=20 2.33.1 From nobody Fri Mar 29 08:07:30 2024 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 1652437956269202.90242106358016; Fri, 13 May 2022 03:32:36 -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-249-HFyYh2u8O6WUfgs34RUGIQ-1; Fri, 13 May 2022 06:32:31 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 300AC101AA44; Fri, 13 May 2022 10:32:29 +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 1987F40CF8FA; Fri, 13 May 2022 10:32:29 +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 E7EA91932207; Fri, 13 May 2022 10:32:28 +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 7E3B1194975B for ; Fri, 13 May 2022 10:32:27 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 71BFC416156; Fri, 13 May 2022 10:32:27 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6D807415F5E for ; Fri, 13 May 2022 10:32:27 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 53B39803B22 for ; Fri, 13 May 2022 10:32:27 +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-118-ByQ2zYdzO42IjjGrQmvSDQ-1; Fri, 13 May 2022 06:32:25 -0400 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24D9VlNZ021891 for ; Fri, 13 May 2022 10:32:24 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1mseh0yr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:32:22 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DANbi9027609 for ; Fri, 13 May 2022 10:31:28 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma03fra.de.ibm.com with ESMTP id 3g0kn79yrr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 May 2022 10:31:28 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 24DAVOT848824798 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 May 2022 10:31:25 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DD74811C052; Fri, 13 May 2022 10:31:24 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9F3EC11C058; Fri, 13 May 2022 10:31:24 +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:24 +0000 (GMT) X-MC-Unique: HFyYh2u8O6WUfgs34RUGIQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ByQ2zYdzO42IjjGrQmvSDQ-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 17/17] nodedev: add tests for optional device address to css device Date: Fri, 13 May 2022 12:31:16 +0200 Message-Id: <20220513103116.3751-18-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: i4buGiIQ_pvtYzdkSg_Kl4Bcjz0raIqh X-Proofpoint-ORIG-GUID: i4buGiIQ_pvtYzdkSg_Kl4Bcjz0raIqh 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 clxscore=1015 mlxlogscore=851 priorityscore=1501 suspectscore=0 impostorscore=0 adultscore=0 lowpriorityscore=0 mlxscore=0 spamscore=0 malwarescore=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.1 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: 1652437957319100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Add nodedev schema parsing and format tests for the optional new device address on the css devices. Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- .../css_0_0_10000-invalid.xml | 10 +++++++++ ...s_0_0_fffe_mdev_types_channel_dev_addr.xml | 22 +++++++++++++++++++ .../css_0_0_ffff_channel_dev_addr-invalid.xml | 15 +++++++++++++ .../css_0_0_ffff_channel_dev_addr.xml | 15 +++++++++++++ ...s_0_0_fffe_mdev_types_channel_dev_addr.xml | 1 + .../css_0_0_ffff_channel_dev_addr.xml | 1 + tests/nodedevxml2xmltest.c | 2 ++ 7 files changed, 66 insertions(+) create mode 100644 tests/nodedevschemadata/css_0_0_10000-invalid.xml create mode 100644 tests/nodedevschemadata/css_0_0_fffe_mdev_types_channel= _dev_addr.xml create mode 100644 tests/nodedevschemadata/css_0_0_ffff_channel_dev_addr-i= nvalid.xml create mode 100644 tests/nodedevschemadata/css_0_0_ffff_channel_dev_addr.x= ml create mode 120000 tests/nodedevxml2xmlout/css_0_0_fffe_mdev_types_channel= _dev_addr.xml create mode 120000 tests/nodedevxml2xmlout/css_0_0_ffff_channel_dev_addr.x= ml diff --git a/tests/nodedevschemadata/css_0_0_10000-invalid.xml b/tests/node= devschemadata/css_0_0_10000-invalid.xml new file mode 100644 index 0000000000..740bb489a7 --- /dev/null +++ b/tests/nodedevschemadata/css_0_0_10000-invalid.xml @@ -0,0 +1,10 @@ + + css_0_0_10000 + /sys/devices/css0/0.0.10000 + computer + + 0x0 + 0x0 + 0x10000 + + diff --git a/tests/nodedevschemadata/css_0_0_fffe_mdev_types_channel_dev_ad= dr.xml b/tests/nodedevschemadata/css_0_0_fffe_mdev_types_channel_dev_addr.x= ml new file mode 100644 index 0000000000..198dcb0cb0 --- /dev/null +++ b/tests/nodedevschemadata/css_0_0_fffe_mdev_types_channel_dev_addr.xml @@ -0,0 +1,22 @@ + + css_0_0_fffe + /sys/devices/css0/0.0.fffe + computer + + 0x0 + 0x0 + 0xfffe + + 0x0 + 0x0 + 0x0815 + + + + I/O subchannel (Non-QDIO) + vfio-ccw + 1 + + + + diff --git a/tests/nodedevschemadata/css_0_0_ffff_channel_dev_addr-invalid.= xml b/tests/nodedevschemadata/css_0_0_ffff_channel_dev_addr-invalid.xml new file mode 100644 index 0000000000..3f2c5558c7 --- /dev/null +++ b/tests/nodedevschemadata/css_0_0_ffff_channel_dev_addr-invalid.xml @@ -0,0 +1,15 @@ + + css_0_0_ffff + /sys/devices/css0/0.0.ffff + computer + + 0x0 + 0x0 + 0xffff + + 0x0 + 0x0 + 0x10000 + + + diff --git a/tests/nodedevschemadata/css_0_0_ffff_channel_dev_addr.xml b/te= sts/nodedevschemadata/css_0_0_ffff_channel_dev_addr.xml new file mode 100644 index 0000000000..17a77cb282 --- /dev/null +++ b/tests/nodedevschemadata/css_0_0_ffff_channel_dev_addr.xml @@ -0,0 +1,15 @@ + + css_0_0_ffff + /sys/devices/css0/0.0.ffff + computer + + 0x0 + 0x0 + 0xffff + + 0x0 + 0x0 + 0x0815 + + + diff --git a/tests/nodedevxml2xmlout/css_0_0_fffe_mdev_types_channel_dev_ad= dr.xml b/tests/nodedevxml2xmlout/css_0_0_fffe_mdev_types_channel_dev_addr.x= ml new file mode 120000 index 0000000000..65ab582ee8 --- /dev/null +++ b/tests/nodedevxml2xmlout/css_0_0_fffe_mdev_types_channel_dev_addr.xml @@ -0,0 +1 @@ +../nodedevschemadata/css_0_0_fffe_mdev_types_channel_dev_addr.xml \ No newline at end of file diff --git a/tests/nodedevxml2xmlout/css_0_0_ffff_channel_dev_addr.xml b/te= sts/nodedevxml2xmlout/css_0_0_ffff_channel_dev_addr.xml new file mode 120000 index 0000000000..cbfe719777 --- /dev/null +++ b/tests/nodedevxml2xmlout/css_0_0_ffff_channel_dev_addr.xml @@ -0,0 +1 @@ +../nodedevschemadata/css_0_0_ffff_channel_dev_addr.xml \ No newline at end of file diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 557347fb07..ad9562cc82 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -125,7 +125,9 @@ mymain(void) DO_TEST("mdev_3627463d_b7f0_4fea_b468_f1da537d301b"); DO_TEST("ccw_0_0_ffff"); DO_TEST("css_0_0_ffff"); + DO_TEST("css_0_0_ffff_channel_dev_addr"); DO_TEST("css_0_0_fffe_mdev_types"); + DO_TEST("css_0_0_fffe_mdev_types_channel_dev_addr"); DO_TEST("ap_card07"); DO_TEST("ap_07_0038"); DO_TEST("ap_matrix"); --=20 2.33.1