From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Thu, 31 Aug 2017 09:01:44 +0000 (+0300)
Subject: qemu: handle -1 for pid in qemuDomainGetMachineName
X-Git-Tag: v3.7.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9820756cd33467815af6d68b2ceef4e567646ec4;p=thirdparty%2Flibvirt.git

qemu: handle -1 for pid in qemuDomainGetMachineName

We call qemuDomainGetMachineName on domain start. On first
start (after daemon start) pid is 0 and virSystemdGetMachineNameByPID
don't get called. But after domain shutting down pid became -1 so
on next start virSystemdGetMachineNameByPID is called and returned an error.
Error is ignored so it is not critical. But at least on my system
(systemd-219 with extra patches) systemd-machined is crashed on
this request.

This behaviour is triggered by eaf2c9f89.

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index cbee151f5d..b98ffffae2 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9781,7 +9781,7 @@ qemuDomainGetMachineName(virDomainObjPtr vm)
     virQEMUDriverPtr driver = priv->driver;
     char *ret = NULL;
 
-    if (vm->pid) {
+    if (vm->pid > 0) {
         ret = virSystemdGetMachineNameByPID(vm->pid);
         if (!ret)
             virResetLastError();