From nobody Mon Dec 15 09:41:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741800173477292.05503812074176; Wed, 12 Mar 2025 10:22:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DF50B18B9; Wed, 12 Mar 2025 13:22:52 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E29201E1B; Wed, 12 Mar 2025 13:19:02 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6BFA71B3C; Wed, 12 Mar 2025 13:18:54 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4BD801DA3 for ; Wed, 12 Mar 2025 13:18:33 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-147-Jxnpqt5hOfi6Mhazw4ws9w-1; Wed, 12 Mar 2025 13:18:31 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 130691954216 for ; Wed, 12 Mar 2025 17:18:31 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.57]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E0CD318001DE; Wed, 12 Mar 2025 17:18:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741799912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UWCpiDjdnGnP7LhMSEa3N3dGvlj5rZky3d7pLKIStzs=; b=bBaCX3JGZGMboSdcY3pjxKc3LdnzLOk/16o2H8LpcD1kcQ+Y4IIiY9I/2PqXwWZRN42gyZ FufRWpL3CJ9wZ6OpZFpUK/i75/xb4KhpB6kpEPpL6IXItXtA9pnCoyH5fQunNm2SzvPooh 2RbRhMwfqsriMx/PG3aC+PFWj4jQB5E= X-MC-Unique: Jxnpqt5hOfi6Mhazw4ws9w-1 X-Mimecast-MFC-AGG-ID: Jxnpqt5hOfi6Mhazw4ws9w_1741799911 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 16/22] rpc: rename virNetDaemonSetShutdownCallbacks Date: Wed, 12 Mar 2025 17:17:56 +0000 Message-ID: <20250312171802.1854985-17-berrange@redhat.com> In-Reply-To: <20250312171802.1854985-1-berrange@redhat.com> References: <20250312171802.1854985-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: cTsryJNtV0OlxfbeHaUODeoJwj5TEVL2LkAzV1WgjQc_1741799911 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CACHNGN44U2ADL57JP24BDA6IVLDU3HF X-Message-ID-Hash: CACHNGN44U2ADL57JP24BDA6IVLDU3HF X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741800174686019000 Content-Type: text/plain; charset="utf-8" The next patch will be introducing a new callback, so rename the method to virNetDaemonSetLifecycleCallbacks to reflect the more general usage. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- src/libvirt_remote.syms | 2 +- src/remote/remote_daemon.c | 6 +++--- src/rpc/virnetdaemon.c | 10 +++++----- src/rpc/virnetdaemon.h | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index f0f90815cf..c4053fdcb2 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -94,7 +94,7 @@ virNetDaemonQuit; virNetDaemonQuitExecRestart; virNetDaemonRemoveShutdownInhibition; virNetDaemonRun; -virNetDaemonSetShutdownCallbacks; +virNetDaemonSetLifecycleCallbacks; virNetDaemonSetStateStopWorkerThread; virNetDaemonUpdateServices; =20 diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 2f6cef1828..9c0025a3bc 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -624,9 +624,9 @@ static void daemonRunStateInit(void *opaque) =20 g_atomic_int_set(&driversInitialized, 1); =20 - virNetDaemonSetShutdownCallbacks(dmn, - virStateShutdownPrepare, - virStateShutdownWait); + virNetDaemonSetLifecycleCallbacks(dmn, + virStateShutdownPrepare, + virStateShutdownWait); =20 /* Signal for VM shutdown when desktop session is terminated, in * unprivileged daemons */ diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index e6bdfe0f88..6d20edf28b 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -65,8 +65,8 @@ struct _virNetDaemon { GHashTable *servers; virJSONValue *srvObject; =20 - virNetDaemonShutdownCallback shutdownPrepareCb; - virNetDaemonShutdownCallback shutdownWaitCb; + virNetDaemonLifecycleCallback shutdownPrepareCb; + virNetDaemonLifecycleCallback shutdownWaitCb; virThread *stateStopThread; int finishTimer; bool quit; @@ -873,9 +873,9 @@ virNetDaemonHasClients(virNetDaemon *dmn) } =20 void -virNetDaemonSetShutdownCallbacks(virNetDaemon *dmn, - virNetDaemonShutdownCallback prepareCb, - virNetDaemonShutdownCallback waitCb) +virNetDaemonSetLifecycleCallbacks(virNetDaemon *dmn, + virNetDaemonLifecycleCallback prepareCb, + virNetDaemonLifecycleCallback waitCb) { VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h index 31a355adb4..0f4ebb6df7 100644 --- a/src/rpc/virnetdaemon.h +++ b/src/rpc/virnetdaemon.h @@ -82,8 +82,8 @@ ssize_t virNetDaemonGetServers(virNetDaemon *dmn, virNetS= erver ***servers); bool virNetDaemonHasServer(virNetDaemon *dmn, const char *serverName); =20 -typedef int (*virNetDaemonShutdownCallback)(void); +typedef int (*virNetDaemonLifecycleCallback)(void); =20 -void virNetDaemonSetShutdownCallbacks(virNetDaemon *dmn, - virNetDaemonShutdownCallback prepare= Cb, - virNetDaemonShutdownCallback waitCb); +void virNetDaemonSetLifecycleCallbacks(virNetDaemon *dmn, + virNetDaemonLifecycleCallback prepa= reCb, + virNetDaemonLifecycleCallback waitC= b); --=20 2.48.1