From: Fiona Ebner <f.ebner@proxmox.com>
Date: Mon, 10 Jul 2023 08:53:00 +0000 (+0200)
Subject: qmeventd: further improve getting VMID from PID
X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=commitdiff_plain;h=a9f2e2d6f99ea4a5a47ec78ffa434afbbb59565f

qmeventd: further improve getting VMID from PID

by also expecting the ".scope" part and trying the next entry if it is
not present instead of immediately failing.

It's still unexpected to encounter such entries, so keep the log line.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

diff --git a/qmeventd/qmeventd.c b/qmeventd/qmeventd.c
index 503bce6..0130103 100644
--- a/qmeventd/qmeventd.c
+++ b/qmeventd/qmeventd.c
@@ -128,12 +128,14 @@ get_vmid_from_pid(pid_t pid)
 	errno = 0;
 	char *endptr = NULL;
 	vmid = strtoul(vmid_start, &endptr, 10);
+	if (!endptr || strncmp(endptr, ".scope", 6)) {
+	    fprintf(stderr, "unexpected cgroup entry %s\n", buf);
+	    vmid = 0;
+	    continue;
+	}
 	if (errno != 0) {
 	    fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno));
 	    vmid = 0;
-	} else if (*endptr != '.') {
-	    fprintf(stderr, "unexpected cgroup entry %s\n", buf);
-	    vmid = 0;
 	}
 
 	goto ret;