NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Show errors reported by nonAPI functions

Browse Source 
Only API calls trigger the error callback, which is required for
proper virsh error reporting. Since we use non API functions from
util/, make sure we properly report these errors.

Fixes lack of error message from 'virsh create idontexit.xml'
This commit is contained in:
Cole Robinson
2010-02-24 11:13:00 -05:00
parent c56cf8d55f
commit 482869633a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/virsh.c
View File

@@ -352,8 +352,16 @@ virshErrorHandler(void *unused ATTRIBUTE_UNUSED, virErrorPtr error)
static void static void
virshReportError(vshControl *ctl) virshReportError(vshControl *ctl)
{ {
if (last_error == NULL) if (last_error == NULL) {
return; /* Calling directly into libvirt util functions won't trigger the
* error callback (which sets last_error), so check it ourselves.
*
* If the returned error has CODE_OK, this most likely means that
* no error was ever raised, so just ignore */
last_error = virSaveLastError();
if (!last_error || last_error->code == VIR_ERR_OK)
return NULL;
}
if (last_error->code == VIR_ERR_OK) { if (last_error->code == VIR_ERR_OK) {
vshError(ctl, "%s", _("unknown error")); vshError(ctl, "%s", _("unknown error"));