public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 qemu-server 4/4] qmeventd: VMID from PID: avoid goto
Date: Mon, 10 Jul 2023 10:53:02 +0200	[thread overview]
Message-ID: <20230710085302.27606-4-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230710085302.27606-1-f.ebner@proxmox.com>

If strtol() returns an errno, make sure not to print the error message
twice after the refactoring.

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

New in v2.

 qmeventd/qmeventd.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/qmeventd/qmeventd.c b/qmeventd/qmeventd.c
index 76a894cb..002b2ac4 100644
--- a/qmeventd/qmeventd.c
+++ b/qmeventd/qmeventd.c
@@ -134,20 +134,18 @@ get_vmid_from_pid(pid_t pid)
 	    continue;
 	}
 	if (errno != 0) {
-	    fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno));
 	    vmid = 0;
 	}
 
-	goto ret;
+	break;
     }
 
     if (errno) {
 	fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno));
-    } else {
+    } else if (!vmid) {
 	fprintf(stderr, "error parsing vmid for %d: no matching qemu.slice cgroup entry\n", pid);
     }
 
-ret:
     free(buf);
     fclose(fp);
     return vmid;
-- 
2.39.2





  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 ` [pve-devel] [PATCH v2 qemu-server 3/4] qmeventd: VMID from PID: don't fail immediately when encountering unexpected entry Fiona Ebner
2023-07-10  8:53 ` Fiona Ebner [this message]
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-4-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal