From nobody Mon Feb 9 09:47:20 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1668589993; cv=none; d=zohomail.com; s=zohoarc; b=JN/Wef0fyUfwLGPKkHt8nf7m/DaJU0MH5Ln68YnZaH3qR43AsqrMjCvtgNrGWSWKTxzH+T7/NdiyCjDUvDuif31IdUDhMp8R3ikhcyidVw4bg5e32QHJPjFoDyHmTkFPyYa6iYjFplf+fNYfSR45ioOfB7vXQT2UgcF+zmC045g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668589993; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o4N9ffnDP/xPQ8nMkYGz3AOadtVrOF52CckZT2pRWyU=; b=BYbTE6ZHvuUVQcx0IkfmivIOE1brUtILm639sYj2VDrU4AWs1XLBEAGkhF/fUoOzylSOAfij6GCThEFuKIYtRoLt8tAAI2hfAJ8BOUB+2wOZzM6OVVhpke+coB4jU9GKokwvhQV76j9017lFympmye4WnFlbiJVnpB2H/idfTPw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1668589993402469.625689954163; Wed, 16 Nov 2022 01:13:13 -0800 (PST) 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-588-yKvK-dAVO_m9G2EjEixQeA-1; Wed, 16 Nov 2022 04:12:04 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E9167802534; Wed, 16 Nov 2022 09:11:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D21F7C2C8C5; Wed, 16 Nov 2022 09:11:59 +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 C6DD519465A3; Wed, 16 Nov 2022 09:11:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 85C3C1946A52 for ; Wed, 16 Nov 2022 09:11:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7695C40C83DC; Wed, 16 Nov 2022 09:11:49 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1ACE240C83D9 for ; Wed, 16 Nov 2022 09:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668589992; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=o4N9ffnDP/xPQ8nMkYGz3AOadtVrOF52CckZT2pRWyU=; b=dikDeEhyJetDetgQKh1/K4wmYKTHfy5bP3WV9oXpLT6u3VZYoVnH9CLYnMQ00moZjfF+ll qtnTVVQi6j4+o3LRPETvEbFRsjkdq2PJZpN0UAlTgVDHmMUrmHsDtRs17j3ETS3eoE9NAl nzlOjj1lYQNaLOODPZatU2rsSubcID4= X-MC-Unique: yKvK-dAVO_m9G2EjEixQeA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/7] vmx: Convert virVMXConfigScanResultsCollector() to use STRCASESKIP() Date: Wed, 16 Nov 2022 10:11:42 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1668589995122100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that we have STRCASESKIP() there's no need to open code it. Convert virVMXConfigScanResultsCollector() so that it uses this new macro. Signed-off-by: Michal Privoznik --- src/vmx/vmx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index bf0dba17d8..d3e452e3ef 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1321,12 +1321,13 @@ virVMXConfigScanResultsCollector(const char* name, void *opaque) { struct virVMXConfigScanResults *results =3D opaque; + const char *suffix =3D NULL; =20 - if (STRCASEPREFIX(name, "ethernet")) { + if ((suffix =3D STRCASESKIP(name, "ethernet"))) { unsigned int idx; char *p; =20 - if (virStrToLong_uip(name + 8, &p, 10, &idx) < 0 || + if (virStrToLong_uip(suffix, &p, 10, &idx) < 0 || *p !=3D '.') { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse the index of the VMX key '%s= '"), --=20 2.37.4