From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 qemu-server 3/4] qmeventd: VMID from PID: don't fail immediately when encountering unexpected entry
Date: Mon, 10 Jul 2023 10:53:01 +0200 [thread overview]
Message-ID: <20230710085302.27606-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230710085302.27606-1-f.ebner@proxmox.com>
While such entries shuoldn't exist in practice without manually
messing around, it's not hard to imagine, and there's still a good
chance the actual VMID can still be found.
It's still unexpected to encounter such entries so keep the log line.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
New in v2.
qmeventd/qmeventd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/qmeventd/qmeventd.c b/qmeventd/qmeventd.c
index 0130103d..76a894cb 100644
--- a/qmeventd/qmeventd.c
+++ b/qmeventd/qmeventd.c
@@ -105,7 +105,7 @@ get_vmid_from_pid(pid_t pid)
char *cgroup_path = strrchr(buf, ':');
if (!cgroup_path) {
fprintf(stderr, "unexpected cgroup entry %s\n", buf);
- goto ret;
+ continue;
}
cgroup_path++;
@@ -116,13 +116,13 @@ get_vmid_from_pid(pid_t pid)
char *vmid_start = strrchr(buf, '/');
if (!vmid_start) {
fprintf(stderr, "unexpected cgroup entry %s\n", buf);
- goto ret;
+ continue;
}
vmid_start++;
if (vmid_start[0] == '-' || vmid_start[0] == '\0') {
fprintf(stderr, "invalid vmid in cgroup entry %s\n", buf);
- goto ret;
+ continue;
}
errno = 0;
--
2.39.2
next prev parent reply other threads:[~2023-07-10 8:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-10 8:52 [pve-devel] [PATCH v2 qemu-server 1/4] qmeventd: improve getting VMID from PID in presence of legacy cgroup entries Fiona Ebner
2023-07-10 8:53 ` [pve-devel] [PATCH v2 qemu-server 2/4] qmeventd: further improve getting VMID from PID Fiona Ebner
2023-07-10 8:53 ` Fiona Ebner [this message]
2023-07-10 8:53 ` [pve-devel] [PATCH v2 qemu-server 4/4] qmeventd: VMID from PID: avoid goto Fiona Ebner
2023-07-17 9:40 ` [pve-devel] applied-series: [PATCH v2 qemu-server 1/4] qmeventd: improve getting VMID from PID in presence of legacy cgroup entries Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230710085302.27606-3-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox