From nobody Sun Feb 8 22:05:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=linux.ibm.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 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 --- 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