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: Refactor error clearing on graceful fallback paths

Browse Source 
Virsh uses an error handler to save errors from libvirt. On some code
paths it's needed to clear libvirt errors and continue on fallback code
paths without reporting failure.

This patch adds function vshResetLibvirtError() that clears error
returned by libvirt and updates all places where the old two-line method
was used.
This commit is contained in:
Peter Krempa 2012-07-25 13:41:49 +02:00
parent 768007aedc
commit 3df9626c40
6 changed files with 34 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/virsh-domain-monitor.c
View File

@ -849,8 +849,7 @@ cmdDomblkstat(vshControl *ctl, const vshCmd *cmd)
if (last_error->code != VIR_ERR_NO_SUPPORT) if (last_error->code != VIR_ERR_NO_SUPPORT)
goto cleanup; goto cleanup;
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
if (virDomainBlockStats(dom, device, &stats, if (virDomainBlockStats(dom, device, &stats,
sizeof(stats)) == -1) { sizeof(stats)) == -1) {
@ -1166,8 +1165,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd)
virDomainFree(dom); virDomainFree(dom);
return false; return false;
} else { } else {
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
} }
} else { } else {
/* Only print something if a security model is active */ /* Only print something if a security model is active */
@ -1340,8 +1338,7 @@ vshDomainListCollect(vshControl *ctl, unsigned int flags)
/* check if the command is actually supported */ /* check if the command is actually supported */
if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) { if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) {
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
goto fallback; goto fallback;
} }
@ -1350,8 +1347,7 @@ vshDomainListCollect(vshControl *ctl, unsigned int flags)
unsigned int newflags = flags & (VIR_CONNECT_LIST_DOMAINS_ACTIVE | unsigned int newflags = flags & (VIR_CONNECT_LIST_DOMAINS_ACTIVE |
VIR_CONNECT_LIST_DOMAINS_INACTIVE); VIR_CONNECT_LIST_DOMAINS_INACTIVE);
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
if ((ret = virConnectListAllDomains(ctl->conn, &list->domains, if ((ret = virConnectListAllDomains(ctl->conn, &list->domains,
newflags)) >= 0) { newflags)) >= 0) {
list->ndomains = ret; list->ndomains = ret;

36
tools/virsh-domain.c
View File

@ -2332,8 +2332,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
if (has_managed_save < 0) { if (has_managed_save < 0) {
if (last_error->code != VIR_ERR_NO_SUPPORT) if (last_error->code != VIR_ERR_NO_SUPPORT)
goto error; goto error;
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
has_managed_save = 0; has_managed_save = 0;
} }
@ -2341,8 +2340,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
if (has_snapshots < 0) { if (has_snapshots < 0) {
if (last_error->code != VIR_ERR_NO_SUPPORT) if (last_error->code != VIR_ERR_NO_SUPPORT)
goto error; goto error;
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
has_snapshots = 0; has_snapshots = 0;
} }
if (has_snapshots) { if (has_snapshots) {
@ -2351,8 +2349,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
if (has_snapshots_metadata < 0) { if (has_snapshots_metadata < 0) {
/* The server did not know the new flag, assume that all /* The server did not know the new flag, assume that all
snapshots have metadata. */ snapshots have metadata. */
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
has_snapshots_metadata = has_snapshots; has_snapshots_metadata = has_snapshots;
} else { } else {
/* The server knew the new flag, all aspects of /* The server knew the new flag, all aspects of
@ -2461,8 +2458,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
vshPrint(ctl, vshPrint(ctl,
_("Storage volume '%s'(%s) is not managed by libvirt. " _("Storage volume '%s'(%s) is not managed by libvirt. "
"Remove it manually.\n"), target, source); "Remove it manually.\n"), target, source);
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
continue; continue;
} }
vlist[nvols].source = source; vlist[nvols].source = source;
@ -2497,8 +2493,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
if (rc == 0 || (last_error->code != VIR_ERR_NO_SUPPORT && if (rc == 0 || (last_error->code != VIR_ERR_NO_SUPPORT &&
last_error->code != VIR_ERR_INVALID_ARG)) last_error->code != VIR_ERR_INVALID_ARG))
goto out; goto out;
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
} }
/* The new API is unsupported or unsafe; fall back to doing things /* The new API is unsupported or unsafe; fall back to doing things
@ -2657,13 +2652,11 @@ cmdStart(vshControl *ctl, const vshCmd *cmd)
virshReportError(ctl); virshReportError(ctl);
goto cleanup; goto cleanup;
} }
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
rc = virDomainHasManagedSaveImage(dom, 0); rc = virDomainHasManagedSaveImage(dom, 0);
if (rc < 0) { if (rc < 0) {
/* No managed save image to remove */ /* No managed save image to remove */
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
} else if (rc > 0) { } else if (rc > 0) {
if (virDomainManagedSaveRemove(dom, 0) < 0) { if (virDomainManagedSaveRemove(dom, 0) < 0) {
virshReportError(ctl); virshReportError(ctl);
@ -4173,8 +4166,7 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd)
if (!tmp || virStrToLong_i(tmp + 1, &tmp, 10, &count) < 0) if (!tmp || virStrToLong_i(tmp + 1, &tmp, 10, &count) < 0)
count = -1; count = -1;
} }
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
VIR_FREE(xml); VIR_FREE(xml);
} }
@ -4187,8 +4179,7 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd)
} else { } else {
vshPrint(ctl, "%d\n", count); vshPrint(ctl, "%d\n", count);
} }
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
} }
if (all || (maximum && live)) { if (all || (maximum && live)) {
@ -4208,8 +4199,7 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd)
} else { } else {
vshPrint(ctl, "%d\n", count); vshPrint(ctl, "%d\n", count);
} }
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
} }
if (all || (active && config)) { if (all || (active && config)) {
@ -4245,8 +4235,7 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd)
} else { } else {
vshPrint(ctl, "%d\n", count); vshPrint(ctl, "%d\n", count);
} }
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
} }
if (all || (active && live)) { if (all || (active && live)) {
@ -4267,8 +4256,7 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd)
} else { } else {
vshPrint(ctl, "%d\n", count); vshPrint(ctl, "%d\n", count);
} }
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
} }
virDomainFree(dom); virDomainFree(dom);

3
tools/virsh-network.c
View File

@ -639,8 +639,7 @@ static char *vshNetworkGetXMLDesc(virNetworkPtr network)
/* The server side libvirt doesn't support /* The server side libvirt doesn't support
* VIR_NETWORK_XML_INACTIVE, so retry without it. * VIR_NETWORK_XML_INACTIVE, so retry without it.
*/ */
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
flags &= ~VIR_NETWORK_XML_INACTIVE; flags &= ~VIR_NETWORK_XML_INACTIVE;
doc = virNetworkGetXMLDesc(network, flags); doc = virNetworkGetXMLDesc(network, flags);
} }

3
tools/virsh-pool.c
View File

@ -1379,8 +1379,7 @@ cmdPoolEdit(vshControl *ctl, const vshCmd *cmd)
if (!(tmp_desc = virStoragePoolGetXMLDesc(pool, flags))) { if (!(tmp_desc = virStoragePoolGetXMLDesc(pool, flags))) {
if (last_error->code == VIR_ERR_INVALID_ARG) { if (last_error->code == VIR_ERR_INVALID_ARG) {
flags &= ~VIR_STORAGE_XML_INACTIVE; flags &= ~VIR_STORAGE_XML_INACTIVE;
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
} else { } else {
goto cleanup; goto cleanup;
} }

15
tools/virsh-snapshot.c
View File

@ -43,8 +43,7 @@ vshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer,
(flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) {
int persistent; int persistent;
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
persistent = virDomainIsPersistent(dom); persistent = virDomainIsPersistent(dom);
if (persistent < 0) { if (persistent < 0) {
virshReportError(ctl); virshReportError(ctl);
@ -644,8 +643,7 @@ cleanup:
virshReportError(ctl); virshReportError(ctl);
vshError(ctl, "%s", _("unable to determine if snapshot has parent")); vshError(ctl, "%s", _("unable to determine if snapshot has parent"));
} else { } else {
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
} }
if (parent) if (parent)
virDomainSnapshotFree(parent); virDomainSnapshotFree(parent);
@ -932,8 +930,7 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom,
last_error->code == VIR_ERR_NO_SUPPORT)) { last_error->code == VIR_ERR_NO_SUPPORT)) {
/* We can emulate --from. */ /* We can emulate --from. */
/* XXX can we also emulate --leaves? */ /* XXX can we also emulate --leaves? */
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
ctl->useSnapshotOld = true; ctl->useSnapshotOld = true;
flags &= ~VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS; flags &= ~VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS;
goto global; goto global;
@ -950,8 +947,7 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom,
/* XXX can we also emulate --leaves? */ /* XXX can we also emulate --leaves? */
if (!from && count < 0 && last_error->code == VIR_ERR_INVALID_ARG && if (!from && count < 0 && last_error->code == VIR_ERR_INVALID_ARG &&
(flags & VIR_DOMAIN_SNAPSHOT_LIST_ROOTS)) { (flags & VIR_DOMAIN_SNAPSHOT_LIST_ROOTS)) {
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
roots = true; roots = true;
flags &= ~VIR_DOMAIN_SNAPSHOT_LIST_ROOTS; flags &= ~VIR_DOMAIN_SNAPSHOT_LIST_ROOTS;
count = virDomainSnapshotNum(dom, flags); count = virDomainSnapshotNum(dom, flags);
@ -1514,8 +1510,7 @@ cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd *cmd)
if (result < 0 && force && if (result < 0 && force &&
last_error->code == VIR_ERR_SNAPSHOT_REVERT_RISKY) { last_error->code == VIR_ERR_SNAPSHOT_REVERT_RISKY) {
flags |= VIR_DOMAIN_SNAPSHOT_REVERT_FORCE; flags |= VIR_DOMAIN_SNAPSHOT_REVERT_FORCE;
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
result = virDomainRevertToSnapshot(snapshot, flags); result = virDomainRevertToSnapshot(snapshot, flags);
} }
if (result < 0) if (result < 0)

13
tools/virsh.c
View File

@ -491,6 +491,16 @@ virshErrorHandler(void *unused ATTRIBUTE_UNUSED, virErrorPtr error)
virDefaultErrorFunc(error); virDefaultErrorFunc(error);
} }
/*
* Reset libvirt error on graceful fallback paths
*/
static void
vshResetLibvirtError(void)
{
virFreeError(last_error);
last_error = NULL;
}
/* /*
* Report an error when a command finishes. This is better than before * Report an error when a command finishes. This is better than before
* (when correct operation would report errors), but it has some * (when correct operation would report errors), but it has some
@ -521,8 +531,7 @@ virshReportError(vshControl *ctl)
vshError(ctl, "%s", last_error->message); vshError(ctl, "%s", last_error->message);
out: out:
virFreeError(last_error); vshResetLibvirtError();
last_error = NULL;
} }
static volatile sig_atomic_t intCaught = 0; static volatile sig_atomic_t intCaught = 0;