mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
qemu: Shorten domain name for watchdog coredump
Similarly to commit d294f6b0dff7, if the name is long enough, the filename can be longer than filesystem's limit. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1334237 Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
parent
e6001cc557
commit
ab74f60a36
@ -3906,6 +3906,10 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in
|
|||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||||
|
char *domname = virDomainObjGetShortName(vm);
|
||||||
|
|
||||||
|
if (!domname)
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case VIR_DOMAIN_WATCHDOG_ACTION_DUMP:
|
case VIR_DOMAIN_WATCHDOG_ACTION_DUMP:
|
||||||
@ -3915,7 +3919,7 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in
|
|||||||
|
|
||||||
if (virAsprintf(&dumpfile, "%s/%s-%u",
|
if (virAsprintf(&dumpfile, "%s/%s-%u",
|
||||||
cfg->autoDumpPath,
|
cfg->autoDumpPath,
|
||||||
vm->def->name,
|
domname,
|
||||||
(unsigned int)time(NULL)) < 0)
|
(unsigned int)time(NULL)) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
@ -3959,6 +3963,7 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in
|
|||||||
qemuDomainObjEndAsyncJob(driver, vm);
|
qemuDomainObjEndAsyncJob(driver, vm);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
|
VIR_FREE(domname);
|
||||||
virObjectUnref(cfg);
|
virObjectUnref(cfg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user