External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 18:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Report errors if arguments of the schedinfo command are incorrect

Browse Source 
Libvirt's helper API's when called directly don't raise the error so
that virsh remembers it. Subsequent calls to libvirt API's might reset
the error.

In case of schedinfo virDomainFree() in the cleanup section resets the
error when virTypedParameterAssignFromStr() fails.

This patch adds function vshSaveLibvirtError() that can be called after
calling libvirt helper APIs to ensure the error is remembered.
This commit is contained in:
Peter Krempa 2012-12-03 14:17:52 +01:00
parent 8312435707
commit bf72095954
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/virsh-domain.c
View File

@ -3512,8 +3512,10 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
if (virTypedParameterAssign(&(params[nparams++]),
param->field,
param->type,
val) < 0)
val) < 0) {
vshSaveLibvirtError();
goto cleanup;
}
continue;
}
@ -3523,8 +3525,10 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
if (virTypedParameterAssignFromStr(&(params[nparams++]),
param->field,
param->type,
set_val) < 0)
set_val) < 0) {
vshSaveLibvirtError();
goto cleanup;
}
continue;
}

9
tools/virsh.c
View File

@ -240,6 +240,15 @@ virshErrorHandler(void *unused ATTRIBUTE_UNUSED, virErrorPtr error)
virDefaultErrorFunc(error);
}
/* Store a libvirt error that is from a helper API that doesn't raise errors
* so it doesn't get overwritten */
void
vshSaveLibvirtError(void)
{
virFreeError(last_error);
last_error = virSaveLastError();
}
/*
* Reset libvirt error on graceful fallback paths
*/

1
tools/virsh.h
View File

@ -346,6 +346,7 @@ struct _vshCtrlData {
extern virErrorPtr last_error;
void vshReportError(vshControl *ctl);
void vshResetLibvirtError(void);
void vshSaveLibvirtError(void);
/* allocation wrappers */
void *_vshMalloc(vshControl *ctl, size_t sz, const char *filename, int line);