From nobody Sun Feb 8 18:30:23 2026 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 --- 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