External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 15:15:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemudDomainMigrateFinish2: handle a case of virDomainSaveStatus failure

Browse Source 
* src/qemu/qemu_driver.c (qemudDomainMigrateFinish2): Don't ignore
virDomainSaveStatus failure.
* src/conf/domain_conf.h (virDomainSaveStatus): Use
ATTRIBUTE_RETURN_CHECK, so this doesn't happen again.
This commit is contained in:
Jim Meyering 2010-05-19 17:48:03 +02:00
parent 33c721d323
commit 6aacf84a3b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_conf.h
View File

@ -1011,7 +1011,7 @@ int virDomainSaveConfig(const char *configDir,
virDomainDefPtr def); virDomainDefPtr def);
int virDomainSaveStatus(virCapsPtr caps, int virDomainSaveStatus(virCapsPtr caps,
const char *statusDir, const char *statusDir,
virDomainObjPtr obj); virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK;
typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom, typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom,
int newDomain, int newDomain,

5
src/qemu/qemu_driver.c
View File

@ -10816,7 +10816,10 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
} }
virDomainSaveStatus(driver->caps, driver->stateDir, vm); if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) {
VIR_WARN("Failed to save status on vm %s", vm->def->name);
goto endjob;
}
} else { } else {
qemudShutdownVMDaemon(driver, vm, 0); qemudShutdownVMDaemon(driver, vm, 0);
event = virDomainEventNewFromObj(vm, event = virDomainEventNewFromObj(vm,