From nobody Mon Feb 9 05:22:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1738689206260120.3466811139624; Tue, 4 Feb 2025 09:13:26 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2531E1D9F; Tue, 4 Feb 2025 12:13:25 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BAA7D1C90; Tue, 4 Feb 2025 12:11:58 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 758A71B5C; Tue, 4 Feb 2025 12:11:50 -0500 (EST) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E82551A8E for ; Tue, 4 Feb 2025 12:11:49 -0500 (EST) Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 514GElm0028527 for ; Tue, 4 Feb 2025 17:11:49 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 44knqtrf7n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 04 Feb 2025 17:11:49 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 514GRL4C024492 for ; Tue, 4 Feb 2025 17:11:48 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 44hxxn4jb4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 04 Feb 2025 17:11:48 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 514HBid640829430 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 4 Feb 2025 17:11:45 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D5F0D200B8; Tue, 4 Feb 2025 17:11:44 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CD96C200BA; Tue, 4 Feb 2025 17:11:44 +0000 (GMT) Received: from fiuczyvm.. (unknown [9.152.222.247]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 4 Feb 2025 17:11:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=t2yC+gFYvigaWLUgG 7Y8VBPH0LSSTho2hkrNvEaew2Q=; b=r+gtPmjvYhny7uDzPxh3Z4VOen8cgp5c8 JCqX0cYhKRxPHEqhbUAOyOxJz2Eadlv2xERkrDdOoR6TC8ZCdmYNZwkeEq+IGibj u1ANc/hrGNpX0PZd3J/LcM7kI2zr7w6646Muv8ZsLd3ObU7CPTc3AKZJYfKG8sYg 3yvFJApla3mMXMR7UZyl06Nt9JA21E3BV/QI686u+kH1kIDEg6+swA1pwnvoIAcg XEqhCasBUix2NfSHAR1sTtKyVi7JXTHYqLDvtduQjs5x0D6wjxelk0rsQjNPonLc 8LP6Dlo83ApM0liXrcvtyRFS7d4bo4+qIgSapD5FiwozHm7QU/ZHw== From: Boris Fiuczynski To: devel@lists.libvirt.org Subject: [PATCH 8/8] nodedev: add qeth layer2 and layer3 device types Date: Tue, 4 Feb 2025 18:11:43 +0100 Message-ID: <20250204171143.93141-9-fiuczy@linux.ibm.com> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250204171143.93141-1-fiuczy@linux.ibm.com> References: <20250204171143.93141-1-fiuczy@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: ybeNb7ZNBXi1ynbGwILbRUkqvCoQyF4o X-Proofpoint-ORIG-GUID: ybeNb7ZNBXi1ynbGwILbRUkqvCoQyF4o X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-04_08,2025-02-04_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 clxscore=1015 mlxlogscore=898 phishscore=0 malwarescore=0 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502040131 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: P4RA3I2XUFH3MDPRJ3XQV4SUI63LVJYT X-Message-ID-Hash: P4RA3I2XUFH3MDPRJ3XQV4SUI63LVJYT X-MailFrom: fiuczy@linux.ibm.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Boris Fiuczynski X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1738689248368019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Boris Fiuczynski --- src/conf/node_device_conf.c | 8 ++++++++ src/conf/node_device_conf.h | 2 ++ src/conf/schemas/nodedev.rng | 6 +++++- src/node_device/node_device_udev.c | 6 +++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 3e88f5da87..30c2b4440e 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -78,6 +78,8 @@ VIR_ENUM_IMPL(virNodeDevCap, VIR_ENUM_IMPL(virNodeDevCCWGroupCap, VIR_NODE_DEV_CAP_CCWGROUP_LAST, "qeth_generic", + "qeth_layer2", + "qeth_layer3", ); =20 VIR_ENUM_IMPL(virNodeDevNetCap, @@ -731,6 +733,8 @@ virNodeDeviceCapCCWGroupDefFormat(virBuffer *buf, virBufferAdjustIndent(buf, 2); switch (ccwgroup_dev.type) { case VIR_NODE_DEV_CAP_CCWGROUP_QETH_GENERIC: + case VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER2: + case VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER3: virNodeDeviceCapCCWGroupQethFormat(buf, &ccwgroup_dev.qeth); break; case VIR_NODE_DEV_CAP_CCWGROUP_LAST: @@ -1509,6 +1513,8 @@ virNodeDevCapCCWGroupParseXML(xmlXPathContextPtr ctxt, =20 switch (ccwgroup_dev->type) { case VIR_NODE_DEV_CAP_CCWGROUP_QETH_GENERIC: + case VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER2: + case VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER3: if (virNodeDevCapCCWGroupQethParseXML(ctxt, cap_node, &ccwgroup_de= v->qeth) < 0) return -1; break; @@ -2865,6 +2871,8 @@ virNodeDevCapsDefFree(virNodeDevCapsDef *caps) g_free(data->ccwgroup_dev.members); switch (data->ccwgroup_dev.type) { case VIR_NODE_DEV_CAP_CCWGROUP_QETH_GENERIC: + case VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER2: + case VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER3: virCCWGroupTypeQethFree(&data->ccwgroup_dev.qeth); break; case VIR_NODE_DEV_CAP_CCWGROUP_LAST: diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index a6cef57b95..c66660342f 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -80,6 +80,8 @@ typedef enum { typedef enum { /* Keep in sync with VIR_ENUM_IMPL in node_device_conf.c */ VIR_NODE_DEV_CAP_CCWGROUP_QETH_GENERIC, /* s390 CCWGROUP QETH gene= ric device */ + VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER2, /* s390 CCWGROUP QETH laye= r 2 device */ + VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER3, /* s390 CCWGROUP QETH laye= r 3 device */ VIR_NODE_DEV_CAP_CCWGROUP_LAST } virNodeDevCCWGroupCapType; =20 diff --git a/src/conf/schemas/nodedev.rng b/src/conf/schemas/nodedev.rng index f52c6ab752..31ce517e4d 100644 --- a/src/conf/schemas/nodedev.rng +++ b/src/conf/schemas/nodedev.rng @@ -672,7 +672,11 @@ =20 - qeth_generic + + qeth_generic + qeth_layer2 + qeth_layer3 + diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index ba5727ed8f..082f9d5cf0 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1410,6 +1410,8 @@ udevProcessCCWGroup(struct udev_device *device, =20 switch (data->ccwgroup_dev.type) { case VIR_NODE_DEV_CAP_CCWGROUP_QETH_GENERIC: + case VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER2: + case VIR_NODE_DEV_CAP_CCWGROUP_QETH_LAYER3: { virCCWGroupTypeQeth *qeth =3D &data->ccwgroup_dev.qeth; /* process qeth device information */ @@ -1487,7 +1489,9 @@ udevGetDeviceType(struct udev_device *device, *type =3D VIR_NODE_DEV_CAP_AP_CARD; else if (STREQ(devtype, "ap_queue")) *type =3D VIR_NODE_DEV_CAP_AP_QUEUE; - else if (STREQ(devtype, "qeth_generic")) + else if (STREQ(devtype, "qeth_generic") || + STREQ(devtype, "qeth_layer2") || + STREQ(devtype, "qeth_layer3")) *type =3D VIR_NODE_DEV_CAP_CCWGROUP_DEV; } else { /* PCI devices don't set the DEVTYPE property. */ --=20 2.47.0