openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: add return value check 

* src/qemu/qemu_migration.c: if 'vmdef' is NULL, the function
  virDomainSaveConfig still dereferences it, it doesn't make
  sense, so should add return value check to make sure 'vmdef'
  is non-NULL before calling virDomainSaveConfig, in addition,
  in order to debug later, also should record error information
  into log.

Signed-off-by: Alex Jia <ajia@redhat.com>
This commit is contained in:
Alex Jia 2011-09-28 16:00:49 +08:00 committed by Eric Blake
parent 4ee8092dde
commit b6dd366ad2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_migration.c
View File

@ -2583,7 +2583,7 @@ qemuMigrationFinish(struct qemud_driver *driver,
vm->newDef = vmdef = mig->persistent; vm->newDef = vmdef = mig->persistent;
else else
vmdef = virDomainObjGetPersistentDef(driver->caps, vm); vmdef = virDomainObjGetPersistentDef(driver->caps, vm);
if (virDomainSaveConfig(driver->configDir, vmdef) < 0) { if (!vmdef || virDomainSaveConfig(driver->configDir, vmdef) < 0) {
/* Hmpf. Migration was successful, but making it persistent /* Hmpf. Migration was successful, but making it persistent
* was not. If we report successful, then when this domain * was not. If we report successful, then when this domain
* shuts down, management tools are in for a surprise. On the * shuts down, management tools are in for a surprise. On the
@ -2604,6 +2604,9 @@ qemuMigrationFinish(struct qemud_driver *driver,
if (newVM) if (newVM)
vm->persistent = 0; vm->persistent = 0;
} }
if (!vmdef)
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("can't get vmdef"));
goto endjob; goto endjob;
} }