From nobody Mon Feb 9 00:06:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1655128624; cv=none; d=zohomail.com; s=zohoarc; b=JcbeDStmT/O5FuuOzBZPTRW5WEdfQwlQ7xQDX0bQbEDMKqUlCV+IodT3jy3XidBCqrg/JOJvp6rXZSWETMzvlEs48L4IYh78NF4S3uDmg02ywS8VGOP51Gv4WCzzKPpTDtlsFiom4XB8ZC8/IxKpHM72+JIWFbAAOoqZEMX+tx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655128624; 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=wofBAGe3HP2jVohjgHN8mheXlpLj6wD7+cS4UrIx/X8=; b=ALePiNlXl3EKCd7ybhaHoApHKvfFim46XpLdMdCskNjI4jFPXe2ctApc0nncDgsBKIwVAB5YhRwOLW0NLixqT+R0Ys9McOiDrs3H0M9/7wuW/G6EMLZLQxpw+cg5wXUAvPU/gAHLQQ4GlKNXcIQvdctEXU/fbB5Lj/bLxMsAttU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1655128623997406.8929549560363; Mon, 13 Jun 2022 06:57:03 -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-217-v6mVos1PPkimTDtxFv3zLQ-1; Mon, 13 Jun 2022 09:56:55 -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 226C785A581; Mon, 13 Jun 2022 13:56:52 +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 0EADE492C3B; Mon, 13 Jun 2022 13:56:52 +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 C8D411947062; Mon, 13 Jun 2022 13:56:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 760F6194705B for ; Mon, 13 Jun 2022 13:56:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 57540492CA6; Mon, 13 Jun 2022 13:56:50 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CB67492CA2 for ; Mon, 13 Jun 2022 13:56:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655128623; 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=wofBAGe3HP2jVohjgHN8mheXlpLj6wD7+cS4UrIx/X8=; b=YmoP6P/OPpcGMXJoCdlzYfNp7vYLl36DL6on+xxsSQSsTxQA+feEOnD/v8HwNdGfSYZhRW SCaVl4XWqKCh+th3/a0qo9lBvhbLlQq0p6EXazvB5TGxeD0tMR+3r3GEVw04SNHw9WbPeY qbComnTp7N75YEtUf6YlYLuHq+Xz/BY= X-MC-Unique: v6mVos1PPkimTDtxFv3zLQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/6] admin: Introduce virAdmConnectSetDaemonTimeout Date: Mon, 13 Jun 2022 15:56:31 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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 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-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655128624414100003 Content-Type: text/plain; charset="utf-8" Use of the admin APIs to modify logging temporarily has a rather serious deficiency when the daemon whose config is being changed is using auto-shutdown (default with socket-activated deployments) as the configuration is discarded if there is no client or VM/other object blocking auto shutdown. This API allows users to disable/postpone shutdown timeout so that the configuration doesn't change under their hands. Signed-off-by: Peter Krempa --- include/libvirt/libvirt-admin.h | 4 ++++ src/admin/admin_protocol.x | 12 +++++++++- src/admin/admin_server_dispatch.c | 12 ++++++++++ src/admin/libvirt-admin.c | 34 +++++++++++++++++++++++++++++ src/admin/libvirt_admin_public.syms | 5 +++++ src/admin_protocol-structs | 5 +++++ 6 files changed, 71 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admi= n.h index 8533658932..ae4703f89b 100644 --- a/include/libvirt/libvirt-admin.h +++ b/include/libvirt/libvirt-admin.h @@ -480,6 +480,10 @@ int virAdmConnectSetLoggingFilters(virAdmConnectPtr co= nn, const char *filters, unsigned int flags); +int virAdmConnectSetDaemonTimeout(virAdmConnectPtr conn, + unsigned int timeout, + unsigned int flags); + # ifdef __cplusplus } # endif diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x index 7dc6724032..f3130efd2d 100644 --- a/src/admin/admin_protocol.x +++ b/src/admin/admin_protocol.x @@ -214,6 +214,11 @@ struct admin_connect_set_logging_filters_args { unsigned int flags; }; +struct admin_connect_set_daemon_timeout_args { + unsigned int timeout; + unsigned int flags; +}; + /* Define the program number, protocol version and procedure numbers here.= */ const ADMIN_PROGRAM =3D 0x06900690; const ADMIN_PROTOCOL_VERSION =3D 1; @@ -324,5 +329,10 @@ enum admin_procedure { /** * @generate: both */ - ADMIN_PROC_SERVER_UPDATE_TLS_FILES =3D 18 + ADMIN_PROC_SERVER_UPDATE_TLS_FILES =3D 18, + + /** + * @generate: both + */ + ADMIN_PROC_CONNECT_SET_DAEMON_TIMEOUT =3D 19 }; diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dis= patch.c index 893c7f1de2..8ab243c8eb 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -466,6 +466,18 @@ adminConnectSetLoggingFilters(virNetDaemon *dmn G_GNUC= _UNUSED, return virLogSetFilters(filters); } + +static int +adminConnectSetDaemonTimeout(virNetDaemon *dmn, + unsigned int timeout, + unsigned int flags) +{ + virCheckFlags(0, -1); + + return virNetDaemonAutoShutdown(dmn, timeout); +} + + static int adminDispatchConnectGetLoggingOutputs(virNetServer *server G_GNUC_UNUSED, virNetServerClient *client G_GNUC_UN= USED, diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c index 5f64784a13..4b5d615e9d 100644 --- a/src/admin/libvirt-admin.c +++ b/src/admin/libvirt-admin.c @@ -1329,3 +1329,37 @@ virAdmConnectSetLoggingFilters(virAdmConnectPtr conn, virDispatchError(NULL); return -1; } + + +/** + * virAdmConnectSetDaemonTimeout: + * @conn: pointer to an active admin connection + * @timeout: timeout to set in seconds (0 disables timeout) + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Reconfigure the existing timeout of the daemon to @timeout. Setting tim= eout + * to 0 disables the daemon timeout. + * + * Returns 0 on success, -1 on error. + * + * Since: 8.5.0 + */ +int +virAdmConnectSetDaemonTimeout(virAdmConnectPtr conn, + unsigned int timeout, + unsigned int flags) +{ + int ret; + + VIR_DEBUG("conn=3D%p, timeout=3D%u, flags=3D0x%x", conn, timeout, flag= s); + + virResetLastError(); + virCheckAdmConnectReturn(conn, -1); + + if ((ret =3D remoteAdminConnectSetDaemonTimeout(conn, timeout, flags))= < 0) { + virDispatchError(NULL); + return -1; + } + + return ret; +} diff --git a/src/admin/libvirt_admin_public.syms b/src/admin/libvirt_admin_= public.syms index 8126973e5b..554269613c 100644 --- a/src/admin/libvirt_admin_public.syms +++ b/src/admin/libvirt_admin_public.syms @@ -48,3 +48,8 @@ LIBVIRT_ADMIN_3.0.0 { virAdmConnectSetLoggingOutputs; virAdmConnectSetLoggingFilters; } LIBVIRT_ADMIN_2.0.0; + +LIBVIRT_ADMIN_8.5.0 { + global: + virAdmConnectSetDaemonTimeout; +} LIBVIRT_ADMIN_3.0.0; diff --git a/src/admin_protocol-structs b/src/admin_protocol-structs index 76c511babf..8caac59824 100644 --- a/src/admin_protocol-structs +++ b/src/admin_protocol-structs @@ -144,6 +144,10 @@ struct admin_connect_set_logging_filters_args { admin_string filters; u_int flags; }; +struct admin_connect_set_daemon_timeout_args { + u_int timeout; + u_int flags; +}; enum admin_procedure { ADMIN_PROC_CONNECT_OPEN =3D 1, ADMIN_PROC_CONNECT_CLOSE =3D 2, @@ -163,4 +167,5 @@ enum admin_procedure { ADMIN_PROC_CONNECT_SET_LOGGING_OUTPUTS =3D 16, ADMIN_PROC_CONNECT_SET_LOGGING_FILTERS =3D 17, ADMIN_PROC_SERVER_UPDATE_TLS_FILES =3D 18, + ADMIN_PROC_CONNECT_SET_DAEMON_TIMEOUT =3D 19, }; --=20 2.36.1