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

libxl: fix return value error Attach|DetachDeviceFlags 

Code logic in libxlDomainAttachDeviceFlags and libxlDomainDetachDeviceFlags
is wrong with return value in error cases.

'ret' was being set to 0 if 'flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG' was
false. Then if something like virDomainDeviceDefParse() failed in the
VIR_DOMAIN_DEVICE_MODIFY_LIVE logic, the error would be reported but the
function would return success.

Signed-off-by: Chunyan Liu <cyliu@suse.com>
This commit is contained in:
Chunyan Liu 2014-07-15 13:03:16 +08:00 committed by Jim Fehlig
parent b0d2454023
commit 2f97ea328f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libxl/libxl_driver.c
View File

@ -3285,10 +3285,8 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
driver->xmlopt))) driver->xmlopt)))
goto endjob; goto endjob;
if ((ret = libxlDomainAttachDeviceConfig(vmdef, dev)) < 0) if (libxlDomainAttachDeviceConfig(vmdef, dev) < 0)
goto endjob; goto endjob;
} else {
ret = 0;
} }
if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
@ -3299,7 +3297,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
VIR_DOMAIN_XML_INACTIVE))) VIR_DOMAIN_XML_INACTIVE)))
goto endjob; goto endjob;
if ((ret = libxlDomainAttachDeviceLive(driver, priv, vm, dev)) < 0) if (libxlDomainAttachDeviceLive(driver, priv, vm, dev) < 0)
goto endjob; goto endjob;
/* /*
@ -3307,11 +3305,13 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
* changed even if we attach the device failed. * changed even if we attach the device failed.
*/ */
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
ret = -1; goto endjob;
} }
ret = 0;
/* Finally, if no error until here, we can save config. */ /* Finally, if no error until here, we can save config. */
if (!ret && (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG)) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
ret = virDomainSaveConfig(cfg->configDir, vmdef); ret = virDomainSaveConfig(cfg->configDir, vmdef);
if (!ret) { if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL); virDomainObjAssignDef(vm, vmdef, false, NULL);
@ -3396,10 +3396,8 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
driver->xmlopt))) driver->xmlopt)))
goto endjob; goto endjob;
if ((ret = libxlDomainDetachDeviceConfig(vmdef, dev)) < 0) if (libxlDomainDetachDeviceConfig(vmdef, dev) < 0)
goto endjob; goto endjob;
} else {
ret = 0;
} }
if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
@ -3410,7 +3408,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
VIR_DOMAIN_XML_INACTIVE))) VIR_DOMAIN_XML_INACTIVE)))
goto endjob; goto endjob;
if ((ret = libxlDomainDetachDeviceLive(driver, priv, vm, dev)) < 0) if (libxlDomainDetachDeviceLive(driver, priv, vm, dev) < 0)
goto endjob; goto endjob;
/* /*
@ -3418,11 +3416,13 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
* changed even if we attach the device failed. * changed even if we attach the device failed.
*/ */
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
ret = -1; goto endjob;
} }
ret = 0;
/* Finally, if no error until here, we can save config. */ /* Finally, if no error until here, we can save config. */
if (!ret && (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG)) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
ret = virDomainSaveConfig(cfg->configDir, vmdef); ret = virDomainSaveConfig(cfg->configDir, vmdef);
if (!ret) { if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL); virDomainObjAssignDef(vm, vmdef, false, NULL);