From nobody Sun Feb 8 17:03:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1563526138; cv=none; d=zoho.com; s=zohoarc; b=j3L5utRtKkJa4DOVoKjrRnu++cYDhIHgClUSzyjav+qK4LgPKiEp5EzEgwG9++rnF+CUI91OnNOoqGYxieoA34xMtb3HNBEoLnQho3usQQmE9orVflKfx4uiOseRjviUz3q3LJgGeDVv9tx24EMuBzBSz1JMQqIYrONmNbOxZfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563526138; 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:ARC-Authentication-Results; bh=Rj34uCYBL03eKqYGJ6PkmdHn2WDkHwdsuSOdcvhydPQ=; b=Bnd1oHlC4PJwSW7rzoeYWBrgjSflHokLC5QwqD5jfY65+kzHxN9y5ldIu5dKYzVEtBXoChe5A0nAs7YtyuKFyPIInhuxFwJJ42RpYyEVeUhCaRzITWC3wGu3hx3O9G15K9RFZp/ApdeF+ZTOuNFGQUlflc+bOlm2jYfR1DdyLrQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15635261388245.607079439211361; Fri, 19 Jul 2019 01:48:58 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F24818831E; Fri, 19 Jul 2019 08:48:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C24F06136A; Fri, 19 Jul 2019 08:48:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7B8671800208; Fri, 19 Jul 2019 08:48:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6J8mhS4005175 for ; Fri, 19 Jul 2019 04:48:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9D83660126; Fri, 19 Jul 2019 08:48:43 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2976461376 for ; Fri, 19 Jul 2019 08:48:43 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 19 Jul 2019 10:48:25 +0200 Message-Id: <079406baf747eafc12bacd71f0aeb893768a29a3.1563525985.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/14] tools: s/Nodedev/NodeDevice/ X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 19 Jul 2019 08:48:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The proper name is [vir|virsh]NodeDevice* and not Nodedev. Fortunately, there are only handful of offenders. Signed-off-by: Michal Privoznik --- tools/virsh-completer.c | 14 +++++++------- tools/virsh-completer.h | 12 ++++++------ tools/virsh-nodedev.c | 16 ++++++++-------- tools/virsh-nodedev.h | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 37f946d4b6..63e2fe17e6 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -953,9 +953,9 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, =20 =20 char ** -virshNodedevEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, - const vshCmd *cmd ATTRIBUTE_UNUSED, - unsigned int flags) +virshNodeDeviceEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) { size_t i =3D 0; char **ret =3D NULL; @@ -967,7 +967,7 @@ virshNodedevEventNameCompleter(vshControl *ctl ATTRIBUT= E_UNUSED, return NULL; =20 for (i =3D 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) { - if (VIR_STRDUP(tmp[i], virshNodedevEventCallbacks[i].name) < 0) + if (VIR_STRDUP(tmp[i], virshNodeDeviceEventCallbacks[i].name) < 0) return NULL; } =20 @@ -977,9 +977,9 @@ virshNodedevEventNameCompleter(vshControl *ctl ATTRIBUT= E_UNUSED, =20 =20 char ** -virshNodedevCapabilityNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags) +virshNodeDeviceCapabilityNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags) { VIR_AUTOSTRINGLIST tmp =3D NULL; const char *cap_str =3D NULL; diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index cb7aafcc8c..1b4694d44d 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -102,13 +102,13 @@ char ** virshDomainInterfaceStateCompleter(vshControl= *ctl, const vshCmd *cmd, unsigned int flags); =20 -char ** virshNodedevEventNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** virshNodeDeviceEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); =20 -char ** virshNodedevCapabilityNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** virshNodeDeviceCapabilityNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); =20 char ** virshDomainDeviceAliasCompleter(vshControl *ctl, const vshCmd *cmd, diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index e8372a4daf..b21e2e2fcc 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -375,7 +375,7 @@ static const vshCmdOptDef opts_node_list_devices[] =3D { }, {.name =3D "cap", .type =3D VSH_OT_STRING, - .completer =3D virshNodedevCapabilityNameCompleter, + .completer =3D virshNodeDeviceCapabilityNameCompleter, .help =3D N_("capability names, separated by comma") }, {.name =3D NULL} @@ -775,7 +775,7 @@ struct virshNodeDeviceEventData { bool loop; bool timestamp; int count; - virshNodedevEventCallback *cb; + virshNodeDeviceEventCallback *cb; }; typedef struct virshNodeDeviceEventData virshNodeDeviceEventData; =20 @@ -841,12 +841,12 @@ vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNU= SED, vshEventDone(data->ctl); } =20 -virshNodedevEventCallback virshNodedevEventCallbacks[] =3D { +virshNodeDeviceEventCallback virshNodeDeviceEventCallbacks[] =3D { { "lifecycle", VIR_NODE_DEVICE_EVENT_CALLBACK(vshEventLifecyclePrint), }, { "update", vshEventGenericPrint, } }; -verify(VIR_NODE_DEVICE_EVENT_ID_LAST =3D=3D ARRAY_CARDINALITY(virshNodedev= EventCallbacks)); +verify(VIR_NODE_DEVICE_EVENT_ID_LAST =3D=3D ARRAY_CARDINALITY(virshNodeDev= iceEventCallbacks)); =20 =20 static const vshCmdInfo info_node_device_event[] =3D { @@ -867,7 +867,7 @@ static const vshCmdOptDef opts_node_device_event[] =3D { }, {.name =3D "event", .type =3D VSH_OT_STRING, - .completer =3D virshNodedevEventNameCompleter, + .completer =3D virshNodeDeviceEventNameCompleter, .help =3D N_("which event type to wait for") }, {.name =3D "loop", @@ -906,7 +906,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) size_t i; =20 for (i =3D 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) - vshPrint(ctl, "%s\n", virshNodedevEventCallbacks[i].name); + vshPrint(ctl, "%s\n", virshNodeDeviceEventCallbacks[i].name); return true; } =20 @@ -918,7 +918,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) } =20 for (event =3D 0; event < VIR_NODE_DEVICE_EVENT_ID_LAST; event++) - if (STREQ(eventName, virshNodedevEventCallbacks[event].name)) + if (STREQ(eventName, virshNodeDeviceEventCallbacks[event].name)) break; if (event =3D=3D VIR_NODE_DEVICE_EVENT_ID_LAST) { vshError(ctl, _("unknown event type %s"), eventName); @@ -929,7 +929,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) data.loop =3D vshCommandOptBool(cmd, "loop"); data.timestamp =3D vshCommandOptBool(cmd, "timestamp"); data.count =3D 0; - data.cb =3D &virshNodedevEventCallbacks[event]; + data.cb =3D &virshNodeDeviceEventCallbacks[event]; if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) return false; if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) diff --git a/tools/virsh-nodedev.h b/tools/virsh-nodedev.h index 9691b0db4d..95ff3bf526 100644 --- a/tools/virsh-nodedev.h +++ b/tools/virsh-nodedev.h @@ -22,12 +22,12 @@ =20 #include "virsh.h" =20 -struct virshNodedevEventCallback { +struct virshNodeDeviceEventCallback { const char *name; virConnectNodeDeviceEventGenericCallback cb; }; -typedef struct virshNodedevEventCallback virshNodedevEventCallback; +typedef struct virshNodeDeviceEventCallback virshNodeDeviceEventCallback; =20 -extern virshNodedevEventCallback virshNodedevEventCallbacks[]; +extern virshNodeDeviceEventCallback virshNodeDeviceEventCallbacks[]; =20 extern const vshCmdDef nodedevCmds[]; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list