[libvirt] [PATCH] qemu: handle -1 for pid in qemuDomainGetMachineName

[Michal Privoznik]

On 08/31/2017 11:29 AM, Daniel P. Berrange wrote:
> On Thu, Aug 31, 2017 at 12:01:44PM +0300, Nikolay Shirokovskiy wrote:
>> 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.
>>

Well, you need to fix your systemd too since anybody can issue the call
with pid = -1 ;-)

>> This behaviour is triggered by eaf2c9f89.
>> ---
>>  src/qemu/qemu_domain.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
>> index e580a5b..fe44d36 100644
>> --- a/src/qemu/qemu_domain.c
>> +++ b/src/qemu/qemu_domain.c
>> @@ -9696,7 +9696,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();
> 
> Reviewed-by: Daniel P. Berrange <berrange at redhat.com>
> 
> 
> Worth pushing for this release too IMHO

Yep. I've just pushed this. Thanks,

Michal