mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-25 01:34:11 +03:00
Fix crashing upgrading from older libvirts with running guests
If upgrading from a libvirt that is older than 1.0.5, we can not assume that vm->def->resource is non-NULL. This bogus assumption caused libvirtd to crash Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
b4ca299902
commit
1166eeba61
@ -1204,7 +1204,9 @@ int virLXCProcessStart(virConnectPtr conn,
|
||||
}
|
||||
|
||||
if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid,
|
||||
vm->def->resource->partition,
|
||||
vm->def->resource ?
|
||||
vm->def->resource->partition :
|
||||
NULL,
|
||||
-1, &priv->cgroup) < 0)
|
||||
goto error;
|
||||
|
||||
@ -1413,7 +1415,9 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm,
|
||||
goto error;
|
||||
|
||||
if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid,
|
||||
vm->def->resource->partition,
|
||||
vm->def->resource ?
|
||||
vm->def->resource->partition :
|
||||
NULL,
|
||||
-1, &priv->cgroup) < 0)
|
||||
goto error;
|
||||
|
||||
|
@ -707,7 +707,9 @@ qemuConnectCgroup(virQEMUDriverPtr driver,
|
||||
if (virCgroupNewDetectMachine(vm->def->name,
|
||||
"qemu",
|
||||
vm->pid,
|
||||
vm->def->resource->partition,
|
||||
vm->def->resource ?
|
||||
vm->def->resource->partition :
|
||||
NULL,
|
||||
cfg->cgroupControllers,
|
||||
&priv->cgroup) < 0)
|
||||
goto cleanup;
|
||||
|
Loading…
Reference in New Issue
Block a user