From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5F98090C87 for ; Fri, 23 Sep 2022 11:51:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 04C5E22D4A for ; Fri, 23 Sep 2022 11:51:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 23 Sep 2022 11:51:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 752DE44312 for ; Fri, 23 Sep 2022 11:51:16 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 23 Sep 2022 11:51:15 +0200 Message-Id: <20220923095115.1974215-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220923095115.1974215-1-d.csapak@proxmox.com> References: <20220923095115.1974215-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.071 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v4 2/2] qmeventd: send QMP 'quit' command instead of SIGTERM X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Sep 2022 09:51:18 -0000 this is functionally the same, but sending SIGTERM has the ugly side effect of printing the following to the log: > QEMU[]: kvm: terminating on signal 15 from pid (/usr/sbin/qmeventd) while sending a QMP quit command does not. Signed-off-by: Dominik Csapak --- qmeventd/qmeventd.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/qmeventd/qmeventd.c b/qmeventd/qmeventd.c index 3256d42..499376a 100644 --- a/qmeventd/qmeventd.c +++ b/qmeventd/qmeventd.c @@ -287,8 +287,10 @@ handle_qmp_return(struct Client *client, struct json_object *data, bool error) VERBOSE_PRINT("%s: QMP handshake complete\n", client->qemu.vmid); break; - case STATE_IDLE: + // we expect an empty return object after sending quit case STATE_TERMINATING: + break; + case STATE_IDLE: VERBOSE_PRINT("%s: spurious return value received\n", client->qemu.vmid); break; @@ -477,8 +479,14 @@ terminate_client(struct Client *client) } } - int err = kill(client->pid, SIGTERM); - log_neg(err, "kill"); + // try to send a 'quit' command first, fallback to SIGTERM of the pid + static const char qmp_quit_command[] = "{\"execute\":\"quit\"}\n"; + VERBOSE_PRINT("%s: sending 'quit' via QMP\n", client->qemu.vmid); + if (!must_write(client->fd, qmp_quit_command, sizeof(qmp_quit_command) - 1)) { + VERBOSE_PRINT("%s: sending 'SIGTERM' to pid %d\n", client->qemu.vmid, client->pid); + int err = kill(client->pid, SIGTERM); + log_neg(err, "kill"); + } time_t timeout = time(NULL) + kill_timeout; -- 2.30.2