]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: tpm: Sanitize error values in qemuTPMEmulatorGetPid
authorPeter Krempa <pkrempa@redhat.com>
Wed, 13 Nov 2019 12:17:11 +0000 (13:17 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 14 Nov 2019 11:42:09 +0000 (12:42 +0100)
The callers don't care about the actual return value, so return -1
rather than errno.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_tpm.c

index 40136c4410684c65c459028056afb793fdede0e6..2f92542470a2a1194678ae2122489e884e7df9c9 100644 (file)
@@ -266,7 +266,7 @@ qemuTPMEmulatorCreatePidFilename(const char *swtpmStateDir,
  * @shortName: short name of the domain
  * @pid: pointer to pid
  *
- * Return -errno upon error, or zero on successful reading of the pidfile.
+ * Return -1 upon error, or zero on successful reading of the pidfile.
  * If the PID was not still alive, zero will be returned, and @pid will be
  * set to -1;
  */
@@ -275,16 +275,16 @@ qemuTPMEmulatorGetPid(const char *swtpmStateDir,
                       const char *shortName,
                       pid_t *pid)
 {
-    int ret;
     g_autofree char *swtpm = virTPMGetSwtpm();
     g_autofree char *pidfile = qemuTPMEmulatorCreatePidFilename(swtpmStateDir,
                                                                 shortName);
     if (!pidfile)
-        return -ENOMEM;
+        return -1;
 
-    ret = virPidFileReadPathIfAlive(pidfile, pid, swtpm);
+    if (virPidFileReadPathIfAlive(pidfile, pid, swtpm) < 0)
+        return -1;
 
-    return ret;
+    return 0;
 }