From nobody Wed May 14 21:33:49 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1516714293154719.7275134950127; Tue, 23 Jan 2018 05:31:33 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F04CB77350; Tue, 23 Jan 2018 13:31:31 +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 AF07D7BB4E; Tue, 23 Jan 2018 13:31:31 +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 3E4D71800B65; Tue, 23 Jan 2018 13:31:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0NDOQVV026997 for ; Tue, 23 Jan 2018 08:24:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id 649AA7B14E; Tue, 23 Jan 2018 13:24:26 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DFF27BB60; Tue, 23 Jan 2018 13:24:21 +0000 (UTC) From: "Daniel P. Berrange" To: libvir-list@redhat.com Date: Tue, 23 Jan 2018 13:23:38 +0000 Message-Id: <20180123132347.21944-3-berrange@redhat.com> In-Reply-To: <20180123132347.21944-1-berrange@redhat.com> References: <20180123132347.21944-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 02/11] libvirtd: rename virNetServerClient callback impls to match type names 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: , MIME-Version: 1.0 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 23 Jan 2018 13:31:32 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrange --- daemon/libvirtd.c | 8 ++++---- daemon/remote.c | 6 +++--- daemon/remote.h | 6 +++--- src/admin/admin_server_dispatch.c | 6 +++--- src/admin/admin_server_dispatch.h | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 48bdc27a5f..c5bb12b8ce 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1311,9 +1311,9 @@ int main(int argc, char **argv) { config->keepalive_interval, config->keepalive_count, config->mdns_adv ? config->mdns_name : NUL= L, - remoteClientInitHook, + remoteClientNew, NULL, - remoteClientFreeFunc, + remoteClientFree, NULL))) { ret =3D VIR_DAEMON_ERR_INIT; goto cleanup; @@ -1385,9 +1385,9 @@ int main(int argc, char **argv) { config->admin_keepalive_interval, config->admin_keepalive_count, NULL, - remoteAdmClientInitHook, + remoteAdmClientNew, NULL, - remoteAdmClientFreeFunc, + remoteAdmClientFree, dmn))) { ret =3D VIR_DAEMON_ERR_INIT; goto cleanup; diff --git a/daemon/remote.c b/daemon/remote.c index b6fe6d8539..6de4bd00d4 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1734,7 +1734,7 @@ remoteClientFreePrivateCallbacks(struct daemonClientP= rivate *priv) * We keep the libvirt connection open until any async * jobs have finished, then clean it up elsewhere */ -void remoteClientFreeFunc(void *data) +void remoteClientFree(void *data) { struct daemonClientPrivate *priv =3D data; =20 @@ -1757,8 +1757,8 @@ static void remoteClientCloseFunc(virNetServerClientP= tr client) } =20 =20 -void *remoteClientInitHook(virNetServerClientPtr client, - void *opaque ATTRIBUTE_UNUSED) +void *remoteClientNew(virNetServerClientPtr client, + void *opaque ATTRIBUTE_UNUSED) { struct daemonClientPrivate *priv; =20 diff --git a/daemon/remote.h b/daemon/remote.h index d42a19e92e..c1bce9ba2e 100644 --- a/daemon/remote.h +++ b/daemon/remote.h @@ -38,8 +38,8 @@ extern size_t lxcNProcs; extern virNetServerProgramProc qemuProcs[]; extern size_t qemuNProcs; =20 -void remoteClientFreeFunc(void *data); -void *remoteClientInitHook(virNetServerClientPtr client, - void *opaque); +void remoteClientFree(void *data); +void *remoteClientNew(virNetServerClientPtr client, + void *opaque); =20 #endif /* __LIBVIRTD_REMOTE_H__ */ diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dis= patch.c index 068358b049..9f110025a2 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -52,7 +52,7 @@ struct daemonAdmClientPrivate { }; =20 void -remoteAdmClientFreeFunc(void *data) +remoteAdmClientFree(void *data) { struct daemonAdmClientPrivate *priv =3D data; =20 @@ -62,8 +62,8 @@ remoteAdmClientFreeFunc(void *data) } =20 void * -remoteAdmClientInitHook(virNetServerClientPtr client ATTRIBUTE_UNUSED, - void *opaque) +remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED, + void *opaque) { struct daemonAdmClientPrivate *priv; =20 diff --git a/src/admin/admin_server_dispatch.h b/src/admin/admin_server_dis= patch.h index 01723e5c43..ff6cfcd607 100644 --- a/src/admin/admin_server_dispatch.h +++ b/src/admin/admin_server_dispatch.h @@ -31,7 +31,7 @@ extern virNetServerProgramProc adminProcs[]; extern size_t adminNProcs; =20 -void remoteAdmClientFreeFunc(void *data); -void *remoteAdmClientInitHook(virNetServerClientPtr client, void *opaque); +void remoteAdmClientFree(void *data); +void *remoteAdmClientNew(virNetServerClientPtr client, void *opaque); =20 #endif /* __ADMIN_SERVER_DISPATCH_H__ */ --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list