proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-10-04 22:53:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qmeventd: send QMP 'quit' command instead of SIGTERM

Browse Source 
this is functionally the same, but sending SIGTERM has the ugly side
effect of printing the following to the log:

> QEMU[<pid>]: kvm: terminating on signal 15 from pid <pid> (/usr/sbin/qmeventd)

while sending a QMP quit command does not.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2022-09-23 11:51:15 +02:00 committed by Wolfgang Bumiller
parent 0a1641aee5
commit b5c39b22f0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmeventd/qmeventd.c
View File

@ -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); VERBOSE_PRINT("%s: QMP handshake complete\n", client->qemu.vmid);
break; break;
case STATE_IDLE: // we expect an empty return object after sending quit
case STATE_TERMINATING: case STATE_TERMINATING:
break;
case STATE_IDLE:
VERBOSE_PRINT("%s: spurious return value received\n", VERBOSE_PRINT("%s: spurious return value received\n",
client->qemu.vmid); client->qemu.vmid);
break; break;
@ -477,8 +479,14 @@ terminate_client(struct Client *client)
} }
} }
// 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); int err = kill(client->pid, SIGTERM);
log_neg(err, "kill"); log_neg(err, "kill");
}
time_t timeout = time(NULL) + kill_timeout; time_t timeout = time(NULL) + kill_timeout;