--- daemon/libvirtd-config.c | 6 +- daemon/libvirtd.c | 14 +-- daemon/remote.c | 222 +++++++++++++++++++++++------------------------ daemon/stream.c | 4 +- 4 files changed, 123 insertions(+), 123 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index a146340..c31ef16 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -215,7 +215,7 @@ daemonConfigFilePath(bool privileged, char **configfile) return 0; -error: + error: return -1; } @@ -301,7 +301,7 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) return data; -error: + error: daemonConfigFree(data); return NULL; } @@ -443,7 +443,7 @@ daemonConfigLoadOptions(struct daemonConfig *data, return 0; -error: + error: return -1; } diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 4179147..e247259 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -242,7 +242,7 @@ static int daemonForkIntoBackground(const char *argv0) } } -error: + error: VIR_FORCE_CLOSE(statuspipe[0]); VIR_FORCE_CLOSE(statuspipe[1]); return -1; @@ -280,7 +280,7 @@ daemonPidFilePath(bool privileged, return 0; -error: + error: return -1; } @@ -325,7 +325,7 @@ daemonUnixSocketPaths(struct daemonConfig *config, } return 0; -error: + error: return -1; } @@ -618,7 +618,7 @@ static int daemonSetupNetworking(virNetServerPtr srv, return 0; -error: + error: #if WITH_GNUTLS virObjectUnref(svcTLS); #endif @@ -735,7 +735,7 @@ daemonSetupLogging(struct daemonConfig *config, return 0; -error: + error: return -1; } @@ -948,7 +948,7 @@ static void daemonRunStateInit(void *opaque) #endif /* Only now accept clients from network */ virNetServerUpdateServices(srv, true); -cleanup: + cleanup: daemonInhibitCallback(false, srv); virObjectUnref(srv); virObjectUnref(sysident); @@ -1539,7 +1539,7 @@ int main(int argc, char **argv) { virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", VIR_HOOK_DAEMON_OP_SHUTDOWN, 0, "shutdown", NULL, NULL); -cleanup: + cleanup: virNetlinkEventServiceStopAll(); virObjectUnref(remoteProgram); virObjectUnref(lxcProgram); diff --git a/daemon/remote.c b/daemon/remote.c index 50e258d..8476961 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -156,7 +156,7 @@ remoteRelayDomainEventCheckACL(virNetServerClientPtr client, goto cleanup; ret = virConnectDomainEventRegisterAnyCheckACL(conn, &def); -cleanup: + cleanup: ignore_value(virIdentitySetCurrent(NULL)); virObjectUnref(identity); return ret; @@ -183,7 +183,7 @@ remoteRelayNetworkEventCheckACL(virNetServerClientPtr client, goto cleanup; ret = virConnectNetworkEventRegisterAnyCheckACL(conn, &def); -cleanup: + cleanup: ignore_value(virIdentitySetCurrent(NULL)); virObjectUnref(identity); return ret; @@ -210,7 +210,7 @@ remoteRelayDomainQemuMonitorEventCheckACL(virNetServerClientPtr client, goto cleanup; ret = virConnectDomainQemuMonitorEventRegisterCheckACL(conn, &def); -cleanup: + cleanup: ignore_value(virIdentitySetCurrent(NULL)); virObjectUnref(identity); return ret; @@ -412,7 +412,7 @@ remoteRelayDomainEventIOError(virConnectPtr conn, } return 0; -error: + error: VIR_FREE(data.srcPath); VIR_FREE(data.devAlias); return -1; @@ -464,7 +464,7 @@ remoteRelayDomainEventIOErrorReason(virConnectPtr conn, return 0; -error: + error: VIR_FREE(data.srcPath); VIR_FREE(data.devAlias); VIR_FREE(data.reason); @@ -539,7 +539,7 @@ remoteRelayDomainEventGraphics(virConnectPtr conn, return 0; -error: + error: VIR_FREE(data.authScheme); VIR_FREE(data.local.node); VIR_FREE(data.local.service); @@ -595,7 +595,7 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn, } return 0; -error: + error: VIR_FREE(data.path); return -1; } @@ -693,7 +693,7 @@ remoteRelayDomainEventDiskChange(virConnectPtr conn, return 0; -error: + error: VIR_FREE(oldSrcPath_p); VIR_FREE(newSrcPath_p); return -1; @@ -1030,7 +1030,7 @@ remoteRelayDomainQemuMonitorEvent(virConnectPtr conn, &data); return; -error: + error: VIR_FREE(data.event); VIR_FREE(details_p); } @@ -1180,7 +1180,7 @@ remoteDispatchConnectOpen(virNetServerPtr server, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); @@ -1229,7 +1229,7 @@ remoteDispatchDomainGetSchedulerType(virNetServerPtr server ATTRIBUTE_UNUSED, ret->nparams = nparams; rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -1304,7 +1304,7 @@ remoteSerializeTypedParameters(virTypedParameterPtr params, val = NULL; rv = 0; -cleanup: + cleanup: if (val) { for (i = 0; i < nparams; i++) { VIR_FREE(val[i].field); @@ -1386,7 +1386,7 @@ remoteDeserializeTypedParameters(remote_typed_param *args_params_val, rv = 0; -cleanup: + cleanup: if (rv < 0) { virTypedParamsFree(params, i); params = NULL; @@ -1436,7 +1436,7 @@ remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUS rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, nparams); @@ -1493,7 +1493,7 @@ remoteDispatchConnectListAllDomains(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (doms) { @@ -1547,7 +1547,7 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, nparams); @@ -1606,7 +1606,7 @@ remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, ret->stats.stats_len = nr_stats; rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -1660,7 +1660,7 @@ remoteDispatchDomainBlockPeek(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) { virNetMessageSaveError(rerr); VIR_FREE(ret->buffer.buffer_val); @@ -1722,10 +1722,10 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED, args->flags) < 0) goto cleanup; -success: + success: rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, nparams); @@ -1777,7 +1777,7 @@ remoteDispatchDomainMemoryPeek(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) { virNetMessageSaveError(rerr); VIR_FREE(ret->buffer.buffer_val); @@ -1823,7 +1823,7 @@ remoteDispatchDomainGetSecurityLabel(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -1880,10 +1880,10 @@ remoteDispatchDomainGetSecurityLabelList(virNetServerPtr server ATTRIBUTE_UNUSED } ret->labels.labels_len = ret->ret = len; -done: + done: rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -1925,7 +1925,7 @@ remoteDispatchNodeGetSecurityModel(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); return rv; @@ -1988,7 +1988,7 @@ remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); VIR_FREE(cpumaps); @@ -2025,7 +2025,7 @@ remoteDispatchDomainPinEmulator(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -2075,7 +2075,7 @@ remoteDispatchDomainGetEmulatorPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); VIR_FREE(cpumaps); @@ -2154,7 +2154,7 @@ remoteDispatchDomainGetVcpus(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) { virNetMessageSaveError(rerr); VIR_FREE(ret->info.info_val); @@ -2214,7 +2214,7 @@ remoteDispatchDomainMigratePrepare(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); VIR_FREE(uri_out); @@ -2265,7 +2265,7 @@ remoteDispatchDomainMigratePrepare2(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); return rv; @@ -2322,10 +2322,10 @@ remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, args->flags) < 0) goto cleanup; -success: + success: rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, nparams); @@ -2385,10 +2385,10 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED, flags) < 0) goto cleanup; -success: + success: rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, nparams); @@ -2448,10 +2448,10 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED, args->flags) < 0) goto cleanup; -success: + success: rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, nparams); @@ -2516,10 +2516,10 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, ret->params.params_val[i].value = params[i].value; } -success: + success: rv = 0; -cleanup: + cleanup: if (rv < 0) { virNetMessageSaveError(rerr); if (ret->params.params_val) { @@ -2588,10 +2588,10 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, ret->params.params_val[i].value = params[i].value; } -success: + success: rv = 0; -cleanup: + cleanup: if (rv < 0) { virNetMessageSaveError(rerr); if (ret->params.params_val) { @@ -2637,7 +2637,7 @@ remoteDispatchDomainGetBlockJobInfo(virNetServerPtr server ATTRIBUTE_UNUSED, ret->found = 1; rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -2696,10 +2696,10 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED, args->flags) < 0) goto cleanup; -success: + success: rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, nparams); @@ -2767,7 +2767,7 @@ remoteDispatchAuthList(virNetServerPtr server, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); return rv; @@ -2840,7 +2840,7 @@ remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED, virMutexUnlock(&priv->lock); return 0; -authfail: + authfail: virResetLastError(); virReportError(VIR_ERR_AUTH_FAILED, "%s", _("authentication failed")); @@ -2897,7 +2897,7 @@ remoteSASLFinish(virNetServerPtr server, return 0; -error: + error: return -1; } @@ -2976,20 +2976,20 @@ remoteDispatchAuthSaslStart(virNetServerPtr server, virMutexUnlock(&priv->lock); return 0; -authfail: + authfail: PROBE(RPC_SERVER_CLIENT_AUTH_FAIL, "client=%p auth=%d", client, REMOTE_AUTH_SASL); goto error; -authdeny: + authdeny: identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(RPC_SERVER_CLIENT_AUTH_DENY, "client=%p auth=%d identity=%s", client, REMOTE_AUTH_SASL, identity); goto error; -error: + error: virObjectUnref(priv->sasl); priv->sasl = NULL; virResetLastError(); @@ -3074,20 +3074,20 @@ remoteDispatchAuthSaslStep(virNetServerPtr server, virMutexUnlock(&priv->lock); return 0; -authfail: + authfail: PROBE(RPC_SERVER_CLIENT_AUTH_FAIL, "client=%p auth=%d", client, REMOTE_AUTH_SASL); goto error; -authdeny: + authdeny: identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(RPC_SERVER_CLIENT_AUTH_DENY, "client=%p auth=%d identity=%s", client, REMOTE_AUTH_SASL, identity); goto error; -error: + error: virObjectUnref(priv->sasl); priv->sasl = NULL; virResetLastError(); @@ -3245,7 +3245,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server, return 0; -error: + error: virCommandFree(cmd); VIR_FREE(ident); virResetLastError(); @@ -3264,13 +3264,13 @@ error: virMutexUnlock(&priv->lock); return -1; -authfail: + authfail: PROBE(RPC_SERVER_CLIENT_AUTH_FAIL, "client=%p auth=%d", client, REMOTE_AUTH_POLKIT); goto error; -authdeny: + authdeny: PROBE(RPC_SERVER_CLIENT_AUTH_DENY, "client=%p auth=%d identity=%s", client, REMOTE_AUTH_POLKIT, ident); @@ -3398,7 +3398,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server, VIR_FREE(ident); return 0; -error: + error: VIR_FREE(ident); virResetLastError(); virReportError(VIR_ERR_AUTH_FAILED, "%s", @@ -3407,13 +3407,13 @@ error: virMutexUnlock(&priv->lock); return -1; -authfail: + authfail: PROBE(RPC_SERVER_CLIENT_AUTH_FAIL, "client=%p auth=%d", client, REMOTE_AUTH_POLKIT); goto error; -authdeny: + authdeny: PROBE(RPC_SERVER_CLIENT_AUTH_DENY, "client=%p auth=%d identity=%s", client, REMOTE_AUTH_POLKIT, ident); @@ -3482,7 +3482,7 @@ remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dev) @@ -3549,7 +3549,7 @@ remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED rv = 0; -cleanup: + cleanup: VIR_FREE(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -3599,7 +3599,7 @@ remoteDispatchConnectDomainEventDeregister(virNetServerPtr server ATTRIBUTE_UNUS rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); @@ -3637,7 +3637,7 @@ remoteDispatchObjectEventSend(virNetServerClientPtr client, xdr_free(proc, data); return; -cleanup: + cleanup: virNetMessageFree(msg); xdr_free(proc, data); } @@ -3673,7 +3673,7 @@ remoteDispatchSecretGetValue(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (secret) @@ -3707,7 +3707,7 @@ remoteDispatchDomainGetState(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -3786,7 +3786,7 @@ remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU rv = 0; -cleanup: + cleanup: VIR_FREE(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -3862,7 +3862,7 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server ATTRI rv = 0; -cleanup: + cleanup: VIR_FREE(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -3923,7 +3923,7 @@ remoteDispatchConnectDomainEventDeregisterAny(virNetServerPtr server ATTRIBUTE_U rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); @@ -3969,7 +3969,7 @@ remoteDispatchConnectDomainEventCallbackDeregisterAny(virNetServerPtr server ATT rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); @@ -4004,7 +4004,7 @@ qemuDispatchDomainMonitorCommand(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -4056,7 +4056,7 @@ remoteDispatchDomainMigrateBegin3(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -4112,7 +4112,7 @@ remoteDispatchDomainMigratePrepare3(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) { virNetMessageSaveError(rerr); VIR_FREE(uri_out); @@ -4168,7 +4168,7 @@ remoteDispatchDomainMigratePerform3(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -4220,7 +4220,7 @@ remoteDispatchDomainMigrateFinish3(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) { virNetMessageSaveError(rerr); VIR_FREE(cookieout); @@ -4259,7 +4259,7 @@ remoteDispatchDomainMigrateConfirm3(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -4307,11 +4307,11 @@ static int remoteDispatchConnectSupportsFeature(virNetServerPtr server ATTRIBUTE break; } -done: + done: ret->supported = supported; rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); return rv; @@ -4350,7 +4350,7 @@ remoteDispatchDomainOpenGraphics(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); if (rv < 0) virNetMessageSaveError(rerr); @@ -4411,10 +4411,10 @@ remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUS flags) < 0) goto cleanup; -success: + success: rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, nparams); @@ -4474,7 +4474,7 @@ remoteDispatchDomainGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, args->flags) < 0) goto cleanup; -success: + success: rv = 0; ret->nparams = percpu_len; if (args->nparams && !(args->flags & VIR_TYPED_PARAM_STRING_OKAY)) { @@ -4486,7 +4486,7 @@ success: } } -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, args->ncpus * args->nparams); @@ -4542,7 +4542,7 @@ remoteDispatchDomainGetDiskErrors(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -4608,7 +4608,7 @@ remoteDispatchDomainListAllSnapshots(virNetServerPtr server ATTRIBUTE_UNUSED, ret->ret = nsnaps; rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -4677,7 +4677,7 @@ remoteDispatchDomainSnapshotListAllChildren(virNetServerPtr server ATTRIBUTE_UNU ret->ret = nsnaps; rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (snapshot) @@ -4740,7 +4740,7 @@ remoteDispatchConnectListAllStoragePools(virNetServerPtr server ATTRIBUTE_UNUSED rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (pools) { @@ -4803,7 +4803,7 @@ remoteDispatchStoragePoolListAllVolumes(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (vols) { @@ -4864,7 +4864,7 @@ remoteDispatchConnectListAllNetworks(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (nets) { @@ -4923,7 +4923,7 @@ remoteDispatchConnectListAllInterfaces(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (ifaces) { @@ -4982,7 +4982,7 @@ remoteDispatchConnectListAllNodeDevices(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (devices) { @@ -5041,7 +5041,7 @@ remoteDispatchConnectListAllNWFilters(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (filters) { @@ -5100,7 +5100,7 @@ remoteDispatchConnectListAllSecrets(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (secrets) { @@ -5158,10 +5158,10 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, args->flags) < 0) goto cleanup; -success: + success: rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, nparams); @@ -5208,7 +5208,7 @@ remoteDispatchNodeGetCPUMap(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); VIR_FREE(cpumap); @@ -5258,7 +5258,7 @@ lxcDispatchDomainOpenNamespace(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 1; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); if (dom) @@ -5308,7 +5308,7 @@ remoteDispatchDomainGetJobStats(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virTypedParamsFree(params, nparams); @@ -5366,7 +5366,7 @@ remoteDispatchDomainMigrateBegin3Params(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: virTypedParamsFree(params, nparams); if (rv < 0) virNetMessageSaveError(rerr); @@ -5426,7 +5426,7 @@ remoteDispatchDomainMigratePrepare3Params(virNetServerPtr server ATTRIBUTE_UNUSE rv = 0; -cleanup: + cleanup: virTypedParamsFree(params, nparams); if (rv < 0) { virNetMessageSaveError(rerr); @@ -5489,7 +5489,7 @@ remoteDispatchDomainMigratePrepareTunnel3Params(virNetServerPtr server ATTRIBUTE ret->cookie_out.cookie_out_len = cookieoutlen; rv = 0; -cleanup: + cleanup: virTypedParamsFree(params, nparams); if (rv < 0) { virNetMessageSaveError(rerr); @@ -5557,7 +5557,7 @@ remoteDispatchDomainMigratePerform3Params(virNetServerPtr server ATTRIBUTE_UNUSE rv = 0; -cleanup: + cleanup: virTypedParamsFree(params, nparams); if (rv < 0) virNetMessageSaveError(rerr); @@ -5616,7 +5616,7 @@ remoteDispatchDomainMigrateFinish3Params(virNetServerPtr server ATTRIBUTE_UNUSED rv = 0; -cleanup: + cleanup: virTypedParamsFree(params, nparams); if (rv < 0) { virNetMessageSaveError(rerr); @@ -5670,7 +5670,7 @@ remoteDispatchDomainMigrateConfirm3Params(virNetServerPtr server ATTRIBUTE_UNUSE rv = 0; -cleanup: + cleanup: virTypedParamsFree(params, nparams); if (rv < 0) virNetMessageSaveError(rerr); @@ -5724,7 +5724,7 @@ remoteDispatchConnectGetCPUModelNames(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virStringFreeList(models); @@ -5769,7 +5769,7 @@ remoteDispatchDomainCreateXMLWithFiles(virNetServerPtr server ATTRIBUTE_UNUSED, make_nonnull_domain(&ret->dom, dom); rv = 0; -cleanup: + cleanup: for (i = 0; i < nfiles; i++) { VIR_FORCE_CLOSE(files[i]); } @@ -5821,7 +5821,7 @@ static int remoteDispatchDomainCreateWithFiles(virNetServerPtr server ATTRIBUTE_ make_nonnull_domain(&ret->dom, dom); rv = 0; -cleanup: + cleanup: for (i = 0; i < nfiles; i++) { VIR_FORCE_CLOSE(files[i]); } @@ -5901,7 +5901,7 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server ATTRIBUTE_UN rv = 0; -cleanup: + cleanup: VIR_FREE(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -5950,7 +5950,7 @@ remoteDispatchConnectNetworkEventDeregisterAny(virNetServerPtr server ATTRIBUTE_ rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); @@ -6020,7 +6020,7 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server ATTRIBUTE_U rv = 0; -cleanup: + cleanup: VIR_FREE(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6070,7 +6070,7 @@ qemuDispatchConnectDomainMonitorEventDeregister(virNetServerPtr server ATTRIBUTE rv = 0; -cleanup: + cleanup: if (rv < 0) virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); @@ -6234,7 +6234,7 @@ remoteSerializeDomainDiskErrors(virDomainDiskErrorPtr errors, return 0; -error: + error: if (val) { size_t j; for (j = 0; j < i; j++) diff --git a/daemon/stream.c b/daemon/stream.c index 16cdf03..bac39c5 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -260,7 +260,7 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque) daemonStreamUpdateEvents(stream); } -cleanup: + cleanup: virMutexUnlock(&priv->lock); } @@ -301,7 +301,7 @@ daemonStreamFilter(virNetServerClientPtr client ATTRIBUTE_UNUSED, daemonStreamUpdateEvents(stream); ret = 1; -cleanup: + cleanup: virMutexUnlock(&stream->priv->lock); return ret; } -- 1.8.3.2

--- src/conf/capabilities.c | 6 +- src/conf/cpu_conf.c | 12 +- src/conf/device_conf.c | 2 +- src/conf/domain_audit.c | 18 +-- src/conf/domain_conf.c | 222 +++++++++++++++++------------------ src/conf/domain_event.c | 10 +- src/conf/interface_conf.c | 20 ++-- src/conf/netdev_bandwidth_conf.c | 6 +- src/conf/netdev_vlan_conf.c | 2 +- src/conf/netdev_vport_profile_conf.c | 4 +- src/conf/network_conf.c | 84 ++++++------- src/conf/network_event.c | 2 +- src/conf/node_device_conf.c | 30 ++--- src/conf/nwfilter_conf.c | 22 ++-- src/conf/nwfilter_ipaddrmap.c | 4 +- src/conf/nwfilter_params.c | 14 +-- src/conf/object_event.c | 6 +- src/conf/snapshot_conf.c | 12 +- src/conf/storage_conf.c | 38 +++--- src/conf/storage_encryption_conf.c | 6 +- src/conf/virchrdev.c | 8 +- 21 files changed, 264 insertions(+), 264 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 3022b45..cf474d7 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -428,7 +428,7 @@ virCapabilitiesAddGuest(virCapsPtr caps, return guest; -error: + error: virCapabilitiesFreeGuest(guest); return NULL; } @@ -477,7 +477,7 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest, return dom; -error: + error: virCapabilitiesFreeGuestDomain(dom); return NULL; } @@ -552,7 +552,7 @@ virCapabilitiesHostSecModelAddBaseLabel(virCapsHostSecModelPtr secmodel, return 0; -no_memory: + no_memory: VIR_FREE(l); VIR_FREE(t); return -1; diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 4b982c9..a8b1b03 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -168,7 +168,7 @@ virCPUDefCopy(const virCPUDef *cpu) return copy; -error: + error: virCPUDefFree(copy); return NULL; } @@ -472,13 +472,13 @@ virCPUDefParseXML(xmlNodePtr node, } } -cleanup: + cleanup: VIR_FREE(fallback); VIR_FREE(vendor_id); VIR_FREE(nodes); return def; -error: + error: virCPUDefFree(def); def = NULL; goto cleanup; @@ -499,9 +499,9 @@ virCPUDefFormat(virCPUDefPtr def, return virBufferContentAndReset(&buf); -no_memory: + no_memory: virReportOOMError(); -cleanup: + cleanup: virBufferFreeAndReset(&buf); return NULL; } @@ -820,6 +820,6 @@ virCPUDefIsEqual(virCPUDefPtr src, identical = true; -cleanup: + cleanup: return identical; } diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index f49dc21..de7aa55 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -106,7 +106,7 @@ virDevicePCIAddressParseXML(xmlNodePtr node, ret = 0; -cleanup: + cleanup: VIR_FREE(domain); VIR_FREE(bus); VIR_FREE(slot); diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index e8bd460..5b97b82 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -128,7 +128,7 @@ virDomainAuditDisk(virDomainObjPtr vm, virt, reason, vmname, uuidstr, oldsrc, newsrc); -cleanup: + cleanup: VIR_FREE(vmname); VIR_FREE(oldsrc); VIR_FREE(newsrc); @@ -209,13 +209,13 @@ virDomainAuditRNG(virDomainObjPtr vm, virt, reason, vmname, uuidstr, oldsrc, newsrc); -cleanup: + cleanup: VIR_FREE(vmname); VIR_FREE(oldsrc); VIR_FREE(newsrc); return; -no_memory: + no_memory: VIR_WARN("OOM while encoding audit message"); goto cleanup; } @@ -261,7 +261,7 @@ virDomainAuditFS(virDomainObjPtr vm, virt, reason, vmname, uuidstr, oldsrc, newsrc); -cleanup: + cleanup: VIR_FREE(vmname); VIR_FREE(oldsrc); VIR_FREE(newsrc); @@ -345,7 +345,7 @@ virDomainAuditNetDevice(virDomainDefPtr vmDef, virDomainNetDefPtr netDef, "virt=%s resrc=net reason=open %s uuid=%s net=%s %s rdev=%s", virt, vmname, uuidstr, macstr, dev_name, VIR_AUDIT_STR(rdev)); -cleanup: + cleanup: VIR_FREE(vmname); VIR_FREE(dev_name); VIR_FREE(rdev); @@ -469,7 +469,7 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, goto cleanup; } -cleanup: + cleanup: VIR_FREE(vmname); VIR_FREE(device); VIR_FREE(address); @@ -530,7 +530,7 @@ virDomainAuditRedirdev(virDomainObjPtr vm, virDomainRedirdevDefPtr redirdev, virDomainRedirdevBusTypeToString(redirdev->bus), device); -cleanup: + cleanup: VIR_FREE(vmname); VIR_FREE(device); VIR_FREE(address); @@ -583,7 +583,7 @@ virDomainAuditTPM(virDomainObjPtr vm, virDomainTPMDefPtr tpm, break; } -cleanup: + cleanup: VIR_FREE(vmname); VIR_FREE(device); } @@ -704,7 +704,7 @@ virDomainAuditCgroupPath(virDomainObjPtr vm, virCgroupPtr cgroup, virDomainAuditCgroup(vm, cgroup, reason, extra, rc == 0); -cleanup: + cleanup: VIR_FREE(extra); VIR_FREE(detail); VIR_FREE(rdev); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f96110b..b2bb61a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -991,7 +991,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, return 0; -error: + error: VIR_FREE(c); VIR_FREE(dev->path); return -1; @@ -1360,7 +1360,7 @@ virDomainDiskHostDefCopy(size_t nhosts, return ret; -error: + error: virDomainDiskHostDefFree(nhosts, ret); return NULL; } @@ -2049,7 +2049,7 @@ virDomainVcpuPinDefCopy(virDomainVcpuPinDefPtr *src, int nvcpupin) return ret; -error: + error: if (ret) { for (i = 0; i < nvcpupin; i++) { if (ret[i]) { @@ -2298,7 +2298,7 @@ virDomainObjNew(virDomainXMLOptionPtr xmlopt) VIR_DEBUG("obj=%p", domain); return domain; -error: + error: virObjectUnref(domain); return NULL; } @@ -2439,10 +2439,10 @@ virDomainObjListAddLocked(virDomainObjListPtr doms, return NULL; } } -cleanup: + cleanup: return vm; -error: + error: virObjectUnlock(vm); vm = NULL; goto cleanup; @@ -2496,7 +2496,7 @@ virDomainObjSetDefTransient(virCapsPtr caps, goto out; ret = 0; -out: + out: return ret; } @@ -2571,7 +2571,7 @@ virDomainLiveConfigHelperMethod(virCapsPtr caps, ret = 0; -cleanup: + cleanup: return ret; } @@ -2988,7 +2988,7 @@ virDomainDefRejectDuplicateControllers(virDomainDefPtr def) } ret = 0; -cleanup: + cleanup: for (i = 0; i < nbitmaps; i++) virBitmapFree(bitmaps[i]); return ret; @@ -3451,7 +3451,7 @@ virDomainDeviceDriveAddressParseXML(xmlNodePtr node, ret = 0; -cleanup: + cleanup: VIR_FREE(controller); VIR_FREE(bus); VIR_FREE(target); @@ -3498,7 +3498,7 @@ virDomainDeviceVirtioSerialAddressParseXML( ret = 0; -cleanup: + cleanup: VIR_FREE(controller); VIR_FREE(bus); VIR_FREE(port); @@ -3556,7 +3556,7 @@ virDomainDeviceCCWAddressParseXML(xmlNodePtr node, ret = 0; -cleanup: + cleanup: VIR_FREE(cssid); VIR_FREE(ssid); VIR_FREE(devno); @@ -3591,7 +3591,7 @@ virDomainDeviceCcidAddressParseXML(xmlNodePtr node, ret = 0; -cleanup: + cleanup: VIR_FREE(controller); VIR_FREE(slot); return ret; @@ -3632,7 +3632,7 @@ virDomainDeviceUSBAddressParseXML(xmlNodePtr node, ret = 0; -cleanup: + cleanup: VIR_FREE(bus); VIR_FREE(port); return ret; @@ -3660,7 +3660,7 @@ virDomainDeviceSpaprVioAddressParseXML(xmlNodePtr node, } ret = 0; -cleanup: + cleanup: VIR_FREE(reg); return ret; } @@ -3685,7 +3685,7 @@ virDomainDeviceUSBMasterParseXML(xmlNodePtr node, ret = 0; -cleanup: + cleanup: VIR_FREE(startport); return ret; } @@ -3727,7 +3727,7 @@ virDomainDeviceBootParseXML(xmlNodePtr node, *bootIndex = boot; ret = 0; -cleanup: + cleanup: VIR_FREE(order); return ret; } @@ -3760,7 +3760,7 @@ virDomainDeviceISAAddressParseXML(xmlNodePtr node, } ret = 0; -cleanup: + cleanup: VIR_FREE(iobase); VIR_FREE(irq); return ret; @@ -3911,7 +3911,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, ret = 0; -cleanup: + cleanup: if (ret == -1) VIR_FREE(info->alias); VIR_FREE(type); @@ -4074,7 +4074,7 @@ virDomainHostdevSubsysUsbDefParseXML(xmlNodePtr node, } ret = 0; -out: + out: return ret; } @@ -4161,7 +4161,7 @@ virDomainHostdevSubsysPciDefParseXML(xmlNodePtr node, } ret = 0; -out: + out: return ret; } @@ -4246,7 +4246,7 @@ virDomainHostdevSubsysScsiDefParseXML(xmlNodePtr node, } ret = 0; -cleanup: + cleanup: VIR_FREE(bus); VIR_FREE(target); VIR_FREE(unit); @@ -4502,7 +4502,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, } ret = 0; -error: + error: VIR_FREE(managed); VIR_FREE(sgio); VIR_FREE(backendStr); @@ -4578,7 +4578,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, goto error; } ret = 0; -error: + error: return ret; } @@ -4803,7 +4803,7 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, return def; -error: + error: virSecurityLabelDefFree(def); return NULL; } @@ -4884,7 +4884,7 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def, return 0; -error: + error: ctxt->node = saved_node; for (; i > 0; i--) { virSecurityLabelDefFree(def->seclabels[i - 1]); @@ -4991,7 +4991,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr **seclabels_rtn, return 0; -error: + error: for (i = 0; i < nseclabels; i++) { virSecurityDeviceLabelDefFree(seclabels[i]); } @@ -5056,7 +5056,7 @@ virDomainLeaseDefParseXML(xmlNodePtr node) def->path = path; path = key = lockspace = NULL; -cleanup: + cleanup: VIR_FREE(lockspace); VIR_FREE(key); VIR_FREE(path); @@ -5112,7 +5112,7 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node, source = NULL; ret = 0; -cleanup: + cleanup: virDomainDiskSourcePoolDefFree(source); VIR_FREE(mode); return ret; @@ -5239,7 +5239,7 @@ virDomainDiskSourceDefParse(xmlNodePtr node, ret = 0; -cleanup: + cleanup: virDomainDiskHostDefClear(&host); VIR_FREE(protocol); VIR_FREE(transport); @@ -6011,7 +6011,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, && virDomainDiskDefAssignAddress(xmlopt, def) < 0) goto error; -cleanup: + cleanup: VIR_FREE(bus); VIR_FREE(type); VIR_FREE(snapshot); @@ -6052,7 +6052,7 @@ cleanup: ctxt->node = save_ctxt; return def; -error: + error: virDomainDiskDefFree(def); def = NULL; goto cleanup; @@ -6105,7 +6105,7 @@ virDomainParseScaledValue(const char *xpath, *val = bytes; ret = 1; -cleanup: + cleanup: VIR_FREE(xpath_full); VIR_FREE(unit); return ret; @@ -6294,7 +6294,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, goto error; } -cleanup: + cleanup: ctxt->node = saved; VIR_FREE(type); VIR_FREE(idx); @@ -6475,7 +6475,7 @@ virDomainFSDefParseXML(xmlNodePtr node, if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; -cleanup: + cleanup: ctxt->node = save_node; VIR_FREE(type); VIR_FREE(fsdriver); @@ -6620,7 +6620,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, *def = actual; actual = NULL; ret = 0; -error: + error: VIR_FREE(type); VIR_FREE(mode); VIR_FREE(addrtype); @@ -7109,7 +7109,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } -cleanup: + cleanup: ctxt->node = oldnode; VIR_FREE(macaddr); VIR_FREE(network); @@ -7138,7 +7138,7 @@ cleanup: return def; -error: + error: virDomainNetDefFree(def); def = NULL; goto cleanup; @@ -7293,7 +7293,7 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def, ret = 0; -error: + error: VIR_FREE(targetType); VIR_FREE(addrStr); VIR_FREE(portStr); @@ -7530,7 +7530,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, break; } -cleanup: + cleanup: VIR_FREE(mode); VIR_FREE(protocol); VIR_FREE(bindHost); @@ -7542,7 +7542,7 @@ cleanup: return remaining; -error: + error: virDomainChrSourceDefClear(def); remaining = -1; goto cleanup; @@ -7678,12 +7678,12 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, goto error; } -cleanup: + cleanup: VIR_FREE(type); return def; -error: + error: virDomainChrDefFree(def); def = NULL; goto cleanup; @@ -7804,13 +7804,13 @@ virDomainSmartcardDefParseXML(xmlNodePtr node, goto error; } -cleanup: + cleanup: VIR_FREE(mode); VIR_FREE(type); return def; -error: + error: virDomainSmartcardDefFree(def); def = NULL; goto cleanup; @@ -7900,7 +7900,7 @@ virDomainTPMDefParseXML(xmlNodePtr node, if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; -cleanup: + cleanup: VIR_FREE(type); VIR_FREE(path); VIR_FREE(model); @@ -7909,7 +7909,7 @@ cleanup: ctxt->node = save; return def; -error: + error: virDomainTPMDefFree(def); def = NULL; goto cleanup; @@ -8004,13 +8004,13 @@ virDomainInputDefParseXML(const virDomainDef *dom, goto error; } -cleanup: + cleanup: VIR_FREE(type); VIR_FREE(bus); return def; -error: + error: virDomainInputDefFree(def); def = NULL; goto cleanup; @@ -8044,12 +8044,12 @@ virDomainHubDefParseXML(xmlNodePtr node, unsigned int flags) if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; -cleanup: + cleanup: VIR_FREE(type); return def; -error: + error: virDomainHubDefFree(def); def = NULL; goto cleanup; @@ -8172,7 +8172,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, } } -cleanup: + cleanup: VIR_FREE(name); VIR_FREE(present); VIR_FREE(tickpolicy); @@ -8182,7 +8182,7 @@ cleanup: return def; -error: + error: VIR_FREE(def); goto cleanup; } @@ -8319,7 +8319,7 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, } ret = 0; -error: + error: if (ret < 0) virDomainGraphicsListenDefClear(def); VIR_FREE(type); @@ -8862,7 +8862,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, } } -cleanup: + cleanup: VIR_FREE(type); VIR_FREE(listenNodes); VIR_FREE(listenAddr); @@ -8870,7 +8870,7 @@ cleanup: ctxt->node = save; return def; -error: + error: virDomainGraphicsDefFree(def); def = NULL; goto cleanup; @@ -8893,12 +8893,12 @@ virDomainSoundCodecDefParseXML(xmlNodePtr node) goto error; } -cleanup: + cleanup: VIR_FREE(type); return def; -error: + error: virDomainSoundCodecDefFree(def); def = NULL; goto cleanup; @@ -8961,13 +8961,13 @@ virDomainSoundDefParseXML(xmlNodePtr node, if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; -cleanup: + cleanup: VIR_FREE(model); ctxt->node = save; return def; -error: + error: virDomainSoundDefFree(def); def = NULL; goto cleanup; @@ -9014,13 +9014,13 @@ virDomainWatchdogDefParseXML(xmlNodePtr node, if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; -cleanup: + cleanup: VIR_FREE(action); VIR_FREE(model); return def; -error: + error: virDomainWatchdogDefFree(def); def = NULL; goto cleanup; @@ -9133,7 +9133,7 @@ virDomainRNGDefParseXML(xmlNodePtr node, if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; -cleanup: + cleanup: VIR_FREE(model); VIR_FREE(backend); VIR_FREE(type); @@ -9141,7 +9141,7 @@ cleanup: ctxt->node = save; return def; -error: + error: virDomainRNGDefFree(def); def = NULL; goto cleanup; @@ -9183,13 +9183,13 @@ virDomainMemballoonDefParseXML(xmlNodePtr node, if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; -cleanup: + cleanup: VIR_FREE(model); ctxt->node = save; return def; -error: + error: virDomainMemballoonDefFree(def); def = NULL; goto cleanup; @@ -9209,7 +9209,7 @@ virDomainNVRAMDefParseXML(xmlNodePtr node, return def; -error: + error: virDomainNVRAMDefFree(def); return NULL; } @@ -9320,12 +9320,12 @@ virSysinfoParseXML(xmlNodePtr node, def->system_family = virXPathString("string(system/entry[@name='family'])", ctxt); -cleanup: + cleanup: VIR_FREE(type); VIR_FREE(tmpUUID); return def; -error: + error: virSysinfoDefFree(def); def = NULL; goto cleanup; @@ -9533,7 +9533,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, return def; -error: + error: virDomainVideoDefFree(def); VIR_FREE(type); VIR_FREE(ram); @@ -9621,13 +9621,13 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt, } } -cleanup: + cleanup: VIR_FREE(type); VIR_FREE(mode); ctxt->node = save; return def; -error: + error: virDomainHostdevDefFree(def); def = NULL; goto cleanup; @@ -9697,12 +9697,12 @@ virDomainRedirdevDefParseXML(xmlNodePtr node, } -cleanup: + cleanup: VIR_FREE(bus); VIR_FREE(type); return def; -error: + error: virDomainRedirdevDefFree(def); def = NULL; goto cleanup; @@ -9766,7 +9766,7 @@ virDomainRedirFilterUsbVersionHelper(const char *version, def->version = hex; ret = 0; -cleanup: + cleanup: VIR_FREE(version_copy); return ret; } @@ -9848,7 +9848,7 @@ virDomainRedirFilterUsbDevDefParseXML(xmlNodePtr node) goto error; } -cleanup: + cleanup: VIR_FREE(class); VIR_FREE(vendor); VIR_FREE(product); @@ -9856,7 +9856,7 @@ cleanup: VIR_FREE(allow); return def; -error: + error: VIR_FREE(def); def = NULL; goto cleanup; @@ -9896,7 +9896,7 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node, ctxt->node = save; return def; -error: + error: VIR_FREE(nodes); virDomainRedirFilterDefFree(def); return NULL; @@ -10079,12 +10079,12 @@ virDomainDeviceDefParse(const char *xmlStr, if (virDomainDeviceDefPostParse(dev, def, caps, xmlopt) < 0) goto error; -cleanup: + cleanup: xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); return dev; -error: + error: VIR_FREE(dev); goto cleanup; } @@ -10924,7 +10924,7 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, ret = 0; -cleanup: + cleanup: VIR_FREE(tmp); VIR_FREE(nodes); return ret; @@ -10984,7 +10984,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, goto cleanup; } -cleanup: + cleanup: ctxt->node = save_ctxt; return idmap; } @@ -11001,7 +11001,7 @@ virDomainPanicDefParseXML(xmlNodePtr node) goto error; return panic; -error: + error: virDomainPanicDefFree(panic); return NULL; } @@ -11075,11 +11075,11 @@ virDomainVcpuPinDefParseXML(xmlNodePtr node, goto error; } -cleanup: + cleanup: ctxt->node = oldnode; return def; -error: + error: VIR_FREE(def); goto cleanup; } @@ -11195,7 +11195,7 @@ virDomainParseMemory(const char *xpath, xmlXPathContextPtr ctxt, /* Yes, we really do use kibibytes for our internal sizing. */ *mem = VIR_DIV_UP(bytes, 1024); ret = 0; -cleanup: + cleanup: return ret; } @@ -11222,7 +11222,7 @@ virDomainResourceDefParse(xmlNodePtr node, ctxt->node = tmp; return def; -error: + error: ctxt->node = tmp; virDomainResourceDefFree(def); return NULL; @@ -12989,7 +12989,7 @@ virDomainDefParseXML(xmlDocPtr xml, return def; -error: + error: VIR_FREE(tmp); VIR_FREE(nodes); virHashFree(bootHash); @@ -13091,7 +13091,7 @@ virDomainObjParseXML(xmlDocPtr xml, return obj; -error: + error: virObjectUnref(obj); VIR_FREE(nodes); return NULL; @@ -13172,7 +13172,7 @@ virDomainDefParseNode(xmlDocPtr xml, def = virDomainDefParseXML(xml, root, ctxt, caps, xmlopt, expectedVirtTypes, flags); -cleanup: + cleanup: xmlXPathFreeContext(ctxt); return def; } @@ -13205,7 +13205,7 @@ virDomainObjParseNode(xmlDocPtr xml, ctxt->node = root; obj = virDomainObjParseXML(xml, ctxt, caps, xmlopt, expectedVirtTypes, flags); -cleanup: + cleanup: xmlXPathFreeContext(ctxt); return obj; } @@ -14346,7 +14346,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src, return true; -error: + error: err = virSaveLastError(); strSrc = virDomainDefFormat(src, 0); @@ -14591,7 +14591,7 @@ virDomainVcpuPinAdd(virDomainVcpuPinDefPtr **vcpupin_list, return 0; -error: + error: virDomainVcpuPinDefFree(vcpupin); return -1; } @@ -17915,9 +17915,9 @@ virDomainObjFormat(virDomainXMLOptionPtr xmlopt, return virBufferContentAndReset(&buf); -no_memory: + no_memory: virReportOOMError(); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -18052,7 +18052,7 @@ virDomainSaveConfig(const char *configDir, goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(xml); return ret; } @@ -18078,7 +18078,7 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(xml); return ret; } @@ -18127,7 +18127,7 @@ virDomainObjListLoadConfig(virDomainObjListPtr doms, VIR_FREE(autostartLink); return dom; -error: + error: VIR_FREE(configFile); VIR_FREE(autostartLink); virDomainDefFree(def); @@ -18176,7 +18176,7 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms, VIR_FREE(statusFile); return obj; -error: + error: virObjectUnref(obj); VIR_FREE(statusFile); return NULL; @@ -18279,7 +18279,7 @@ virDomainDeleteConfig(const char *configDir, ret = 0; -cleanup: + cleanup: VIR_FREE(configFile); VIR_FREE(autostartLink); return ret; @@ -18392,7 +18392,7 @@ virDomainObjListCount(void *payload, if (!data->active) data->count++; } -cleanup: + cleanup: virObjectUnlock(obj); } @@ -18430,7 +18430,7 @@ virDomainObjListCopyActiveIDs(void *payload, goto cleanup; if (virDomainObjIsActive(obj) && data->numids < data->maxids) data->ids[data->numids++] = obj->def->id; -cleanup: + cleanup: virObjectUnlock(obj); } @@ -18479,7 +18479,7 @@ virDomainObjListCopyInactiveNames(void *payload, else data->numnames++; } -cleanup: + cleanup: virObjectUnlock(obj); } @@ -18587,7 +18587,7 @@ virDomainChrDefForeach(virDomainDefPtr def, goto done; } -done: + done: return rc; } @@ -18611,7 +18611,7 @@ virDomainSmartcardDefForeach(virDomainDefPtr def, goto done; } -done: + done: return rc; } @@ -18657,7 +18657,7 @@ virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, ret = 0; -cleanup: + cleanup: return ret; } @@ -19214,7 +19214,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, xmlStr = virBufferContentAndReset(&buf); ret = virDomainDeviceDefParse(xmlStr, def, caps, xmlopt, flags); -cleanup: + cleanup: VIR_FREE(xmlStr); return ret; } @@ -19318,7 +19318,7 @@ virDomainListPopulate(void *payload, data->domains[data->ndomains++] = dom; -cleanup: + cleanup: virObjectUnlock(vm); return; } @@ -19359,7 +19359,7 @@ virDomainObjListExport(virDomainObjListPtr doms, ret = data.ndomains; -cleanup: + cleanup: if (data.domains) { int count = virHashSize(doms->objs); for (i = 0; i < count; i++) @@ -19586,7 +19586,7 @@ virDomainObjGetMetadata(virDomainObjPtr vm, virReportError(VIR_ERR_NO_DOMAIN_METADATA, "%s", _("Requested metadata element is not present")); -cleanup: + cleanup: return ret; } @@ -19666,7 +19666,7 @@ virDomainDefSetMetadata(virDomainDefPtr def, ret = 0; -cleanup: + cleanup: xmlFreeDoc(doc); return ret; } diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index a9b2533..b565732 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -886,7 +886,7 @@ virDomainEventDiskChangeNew(int id, return (virObjectEventPtr)ev; -error: + error: virObjectUnref(ev); return NULL; } @@ -939,7 +939,7 @@ virDomainEventTrayChangeNew(int id, return (virObjectEventPtr)ev; -error: + error: virObjectUnref(ev); return NULL; } @@ -1129,7 +1129,7 @@ virDomainEventDeviceRemovedNew(int id, return (virObjectEventPtr)ev; -error: + error: virObjectUnref(ev); return NULL; } @@ -1346,7 +1346,7 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, VIR_WARN("Unexpected event ID %d", event->eventID); -cleanup: + cleanup: virDomainFree(dom); } @@ -1380,7 +1380,7 @@ virDomainQemuMonitorEventNew(int id, return (virObjectEventPtr)ev; -error: + error: virObjectUnref(ev); return NULL; } diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 83cc0a9..b1b56c8 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -350,7 +350,7 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def, ret = 0; -error: + error: VIR_FREE(ipNodes); return ret; } @@ -405,7 +405,7 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def, ret = 0; -error: + error: VIR_FREE(ipNodes); return ret; } @@ -473,7 +473,7 @@ virInterfaceDefParseIfAdressing(virInterfaceDefPtr def, ret = 0; -error: + error: VIR_FREE(protoNodes); ctxt->node = save; return ret; @@ -516,7 +516,7 @@ virInterfaceDefParseBridge(virInterfaceDefPtr def, } } -error: + error: VIR_FREE(interfaces); ctxt->node = bridge; return ret; @@ -563,7 +563,7 @@ virInterfaceDefParseBondItfs(virInterfaceDefPtr def, def->data.bond.itf[i] = itf; } -error: + error: VIR_FREE(interfaces); ctxt->node = bond; return ret; @@ -814,7 +814,7 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType) ctxt->node = cur; return def; -error: + error: ctxt->node = cur; virInterfaceDefFree(def); return NULL; @@ -843,7 +843,7 @@ virInterfaceDefPtr virInterfaceDefParseNode(xmlDocPtr xml, ctxt->node = root; def = virInterfaceDefParseXML(ctxt, VIR_INTERFACE_TYPE_LAST); -cleanup: + cleanup: xmlXPathFreeContext(ctxt); return def; } @@ -1123,9 +1123,9 @@ virInterfaceDefDevFormat(virBufferPtr buf, const virInterfaceDef *def) if (virBufferError(buf)) goto no_memory; return 0; -no_memory: + no_memory: virReportOOMError(); -cleanup: + cleanup: return -1; } @@ -1248,7 +1248,7 @@ int virInterfaceObjListClone(virInterfaceObjListPtr src, } ret = cnt; -cleanup: + cleanup: if ((ret < 0) && dest) virInterfaceObjListFree(dest); return ret; diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index ed02704..2e5b564 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -92,7 +92,7 @@ virNetDevBandwidthParseRate(xmlNodePtr node, virNetDevBandwidthRatePtr rate) ret = 0; -cleanup: + cleanup: VIR_FREE(average); VIR_FREE(peak); VIR_FREE(burst); @@ -198,7 +198,7 @@ virNetDevBandwidthParse(xmlNodePtr node, return def; -error: + error: virNetDevBandwidthFree(def); return NULL; } @@ -266,6 +266,6 @@ virNetDevBandwidthFormat(virNetDevBandwidthPtr def, virBufferPtr buf) ret = 0; -cleanup: + cleanup: return ret; } diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index e5196d5..dff49c6 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -129,7 +129,7 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de } ret = 0; -cleanup: + cleanup: ctxt->node = save; VIR_FREE(tagNodes); VIR_FREE(trunk); diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index c7d2ab1..8da0838 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -183,7 +183,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) if (virNetDevVPortProfileCheckNoExtras(virtPort) < 0) goto error; -cleanup: + cleanup: VIR_FREE(virtPortManagerID); VIR_FREE(virtPortTypeID); VIR_FREE(virtPortTypeIDVersion); @@ -194,7 +194,7 @@ cleanup: return virtPort; -error: + error: VIR_FREE(virtPort); goto cleanup; } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 9be06d3..5f08193 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -394,7 +394,7 @@ virNetworkAssignDef(virNetworkObjListPtr nets, network->def = def; return network; -error: + error: virNetworkObjUnlock(network); virNetworkObjFree(network); return NULL; @@ -510,7 +510,7 @@ virNetworkDefCopy(virNetworkDefPtr def, unsigned int flags) if (!(xml = virNetworkDefFormat(def, flags))) goto cleanup; newDef = virNetworkDefParseString(xml); -cleanup: + cleanup: VIR_FREE(xml); return newDef; } @@ -555,7 +555,7 @@ virNetworkConfigChangeSetup(virNetworkObjPtr network, unsigned int flags) } ret = 0; -cleanup: + cleanup: return ret; } @@ -668,7 +668,7 @@ virSocketAddrRangeParseXML(const char *networkName, ret = 0; -cleanup: + cleanup: VIR_FREE(start); VIR_FREE(end); return ret; @@ -784,7 +784,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, host->ip = inaddr; ret = 0; -cleanup: + cleanup: VIR_FREE(mac); VIR_FREE(id); VIR_FREE(name); @@ -919,7 +919,7 @@ virNetworkDNSHostDefParseXML(const char *networkName, return 0; -error: + error: virNetworkDNSHostDefClear(def); return -1; } @@ -1003,7 +1003,7 @@ virNetworkDNSSrvDefParseXML(const char *networkName, } return 0; -error: + error: virNetworkDNSSrvDefClear(def); return -1; } @@ -1041,7 +1041,7 @@ virNetworkDNSTxtDefParseXML(const char *networkName, } return 0; -error: + error: virNetworkDNSTxtDefClear(def); return -1; } @@ -1162,7 +1162,7 @@ virNetworkDNSDefParseXML(const char *networkName, } ret = 0; -cleanup: + cleanup: VIR_FREE(forwardPlainNames); VIR_FREE(fwdNodes); VIR_FREE(hostNodes); @@ -1312,7 +1312,7 @@ virNetworkIPDefParseXML(const char *networkName, result = 0; -cleanup: + cleanup: if (result < 0) { virNetworkIpDefClear(def); } @@ -1538,7 +1538,7 @@ virNetworkRouteDefParseXML(const char *networkName, result = 0; -cleanup: + cleanup: if (result < 0) { virNetworkRouteDefClear(def); } @@ -1599,7 +1599,7 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def, goto cleanup; result = 0; -cleanup: + cleanup: if (result < 0) { virPortGroupDefClear(def); } @@ -1707,7 +1707,7 @@ virNetworkForwardNatDefParseXML(const char *networkName, } ret = 0; -cleanup: + cleanup: VIR_FREE(addrStart); VIR_FREE(addrEnd); VIR_FREE(natAddrNodes); @@ -1936,7 +1936,7 @@ virNetworkForwardDefParseXML(const char *networkName, } ret = 0; -cleanup: + cleanup: VIR_FREE(type); VIR_FREE(forwardDev); VIR_FREE(forwardManaged); @@ -2238,7 +2238,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) ctxt->node = save; return def; -error: + error: VIR_FREE(routeNodes); VIR_FREE(stp); virNetworkDefFree(def); @@ -2298,7 +2298,7 @@ virNetworkDefPtr virNetworkDefParseNode(xmlDocPtr xml, ctxt->node = root; def = virNetworkDefParseXML(ctxt); -cleanup: + cleanup: xmlXPathFreeContext(ctxt); return def; } @@ -2479,7 +2479,7 @@ virNetworkIpDefFormat(virBufferPtr buf, virBufferAddLit(buf, "</ip>\n"); result = 0; -error: + error: return result; } @@ -2526,7 +2526,7 @@ virNetworkRouteDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); result = 0; -error: + error: return result; } @@ -2594,7 +2594,7 @@ virNetworkForwardNatDefFormat(virBufferPtr buf, virBufferAddLit(buf, "</nat>\n"); ret = 0; -cleanup: + cleanup: VIR_FREE(addrStart); VIR_FREE(addrEnd); return ret; @@ -2760,7 +2760,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, return 0; -error: + error: return -1; } @@ -2778,9 +2778,9 @@ virNetworkDefFormat(const virNetworkDef *def, return virBufferContentAndReset(&buf); -no_memory: + no_memory: virReportOOMError(); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -2819,9 +2819,9 @@ virNetworkObjFormat(virNetworkObjPtr net, return virBufferContentAndReset(&buf); -no_memory: + no_memory: virReportOOMError(); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -2883,7 +2883,7 @@ int virNetworkSaveConfig(const char *configDir, goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(xml); return ret; } @@ -2903,7 +2903,7 @@ int virNetworkSaveStatus(const char *statusDir, goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(xml); return ret; } @@ -3018,13 +3018,13 @@ virNetworkLoadState(virNetworkObjListPtr nets, net->taint = taint; -cleanup: + cleanup: VIR_FREE(configFile); xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); return net; -error: + error: VIR_FREE(nodes); virBitmapFree(class_id_map); virNetworkDefFree(def); @@ -3082,7 +3082,7 @@ virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, return net; -error: + error: VIR_FREE(configFile); VIR_FREE(autostartLink); virNetworkDefFree(def); @@ -3188,7 +3188,7 @@ int virNetworkDeleteConfig(const char *configDir, ret = 0; -error: + error: VIR_FREE(configFile); VIR_FREE(autostartLink); return ret; @@ -3273,7 +3273,7 @@ int virNetworkSetBridgeName(virNetworkObjListPtr nets, } ret = 0; -error: + error: return ret; } @@ -3513,7 +3513,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, } ret = 0; -cleanup: + cleanup: virNetworkDHCPHostDefClear(&host); return ret; } @@ -3602,7 +3602,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, } ret = 0; -cleanup: + cleanup: return ret; } @@ -3707,7 +3707,7 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, } ret = 0; -cleanup: + cleanup: virNetworkForwardIfDefClear(&iface); return ret; } @@ -3813,7 +3813,7 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, } ret = 0; -cleanup: + cleanup: virPortGroupDefClear(&portgroup); return ret; } @@ -3907,7 +3907,7 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def, } ret = 0; -cleanup: + cleanup: virNetworkDNSHostDefClear(&host); return ret; } @@ -3993,7 +3993,7 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, } ret = 0; -cleanup: + cleanup: virNetworkDNSSrvDefClear(&srv); return ret; } @@ -4066,7 +4066,7 @@ virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, } ret = 0; -cleanup: + cleanup: virNetworkDNSTxtDefClear(&txt); return ret; } @@ -4137,7 +4137,7 @@ virNetworkDefUpdateSection(virNetworkDefPtr def, break; } -cleanup: + cleanup: xmlFreeDoc(doc); xmlXPathFreeContext(ctxt); return ret; @@ -4223,7 +4223,7 @@ virNetworkObjUpdate(virNetworkObjPtr network, } ret = 0; -cleanup: + cleanup: virNetworkDefFree(livedef); virNetworkDefFree(configdef); return ret; @@ -4285,7 +4285,7 @@ virNetworkObjIsDuplicate(virNetworkObjListPtr doms, ret = 0; } -cleanup: + cleanup: if (vm) virNetworkObjUnlock(vm); return ret; @@ -4379,7 +4379,7 @@ virNetworkObjListExport(virConnectPtr conn, ret = nnets; -cleanup: + cleanup: if (tmp_nets) { for (i = 0; i < nnets; i++) { if (tmp_nets[i]) diff --git a/src/conf/network_event.c b/src/conf/network_event.c index 298cfcb..991591a 100644 --- a/src/conf/network_event.c +++ b/src/conf/network_event.c @@ -118,7 +118,7 @@ virNetworkEventDispatchDefaultFunc(virConnectPtr conn, } VIR_WARN("Unexpected event ID %d", event->eventID); -cleanup: + cleanup: virNetworkFree(net); } diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index d88f89b..bcf57d9 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -655,7 +655,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, } ret = 0; -out: + out: VIR_FREE(nodes); ctxt->node = orignode; return ret; @@ -700,7 +700,7 @@ virNodeDevCapScsiParseXML(xmlXPathContextPtr ctxt, data->scsi.type = virXPathString("string(./type[1])", ctxt); ret = 0; -out: + out: ctxt->node = orignode; return ret; } @@ -728,7 +728,7 @@ virNodeDevCapScsiTargetParseXML(xmlXPathContextPtr ctxt, ret = 0; -out: + out: ctxt->node = orignode; return ret; } @@ -823,7 +823,7 @@ virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt, ret = 0; -out: + out: VIR_FREE(type); ctxt->node = orignode; VIR_FREE(nodes); @@ -870,7 +870,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, } ret = 0; -out: + out: ctxt->node = orignode; return ret; } @@ -914,7 +914,7 @@ virNodeDevCapUsbInterfaceParseXML(xmlXPathContextPtr ctxt, data->usb_if.description = virXPathString("string(./description[1])", ctxt); ret = 0; -out: + out: ctxt->node = orignode; return ret; } @@ -982,7 +982,7 @@ virNodeDevCapUsbDevParseXML(xmlXPathContextPtr ctxt, data->usb_dev.product_name = virXPathString("string(./product[1])", ctxt); ret = 0; -out: + out: ctxt->node = orignode; return ret; } @@ -1035,7 +1035,7 @@ virNodeDevCapPciDevIommuGroupParseXML(xmlXPathContextPtr ctxt, } ret = 0; -cleanup: + cleanup: ctxt->node = origNode; VIR_FREE(numberStr); VIR_FREE(addrNodes); @@ -1102,7 +1102,7 @@ virNodeDevCapPciDevParseXML(xmlXPathContextPtr ctxt, } } ret = 0; -out: + out: ctxt->node = orignode; return ret; } @@ -1146,7 +1146,7 @@ virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, data->system.firmware.release_date = virXPathString("string(./firmware/release_date[1])", ctxt); ret = 0; -out: + out: ctxt->node = orignode; return ret; } @@ -1224,7 +1224,7 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, goto error; return caps; -error: + error: virNodeDevCapsDefFree(caps); return NULL; } @@ -1320,7 +1320,7 @@ virNodeDeviceDefParseNode(xmlDocPtr xml, ctxt->node = root; def = virNodeDeviceDefParseXML(ctxt, create, virt_type); -cleanup: + cleanup: xmlXPathFreeContext(ctxt); return def; } @@ -1393,7 +1393,7 @@ virNodeDeviceGetWWNs(virNodeDeviceDefPtr def, } ret = 0; -cleanup: + cleanup: return ret; } @@ -1441,7 +1441,7 @@ virNodeDeviceGetParentHost(virNodeDeviceObjListPtr devs, virNodeDeviceObjUnlock(parent); -out: + out: return ret; } @@ -1636,7 +1636,7 @@ virNodeDeviceObjListExport(virConnectPtr conn, ret = ndevices; -cleanup: + cleanup: if (tmp_devices) { for (i = 0; i < ndevices; i++) { if (tmp_devices[i]) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index fc800e3..f5a75e4 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -1006,7 +1006,7 @@ ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val, return true; -arg_err_exit: + arg_err_exit: virReportError(VIR_ERR_INVALID_ARG, "%s", errmsg); return false; @@ -1052,7 +1052,7 @@ ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val return true; -arg_err_exit: + arg_err_exit: virReportError(VIR_ERR_INVALID_ARG, "%s", errmsg); return false; @@ -2070,10 +2070,10 @@ virNWFilterIncludeParse(xmlNodePtr cur) if (!ret->params) goto err_exit; -cleanup: + cleanup: return ret; -err_exit: + err_exit: virNWFilterIncludeDefFree(ret); ret = NULL; goto cleanup; @@ -2405,7 +2405,7 @@ virNWFilterRuleParse(xmlNodePtr node) virNWFilterRuleDefFixup(ret); -cleanup: + cleanup: VIR_FREE(prio); VIR_FREE(action); VIR_FREE(direction); @@ -2413,7 +2413,7 @@ cleanup: return ret; -err_exit: + err_exit: virNWFilterRuleDefFree(ret); ret = NULL; goto cleanup; @@ -2495,7 +2495,7 @@ virNWFilterIsAllowedChain(const char *chainname) virReportError(VIR_ERR_INVALID_ARG, "%s", msg); VIR_FREE(msg); -err_exit: + err_exit: return NULL; } @@ -2651,7 +2651,7 @@ virNWFilterDefParseNode(xmlDocPtr xml, ctxt->node = root; def = virNWFilterDefParseXML(ctxt); -cleanup: + cleanup: xmlXPathFreeContext(ctxt); return def; } @@ -2762,7 +2762,7 @@ int virNWFilterSaveConfig(const char *configDir, goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(xml); return ret; } @@ -2971,7 +2971,7 @@ virNWFilterDefEqual(const virNWFilterDef *def1, virNWFilterDefPtr def2, ret = STREQ(xml1, xml2); -cleanup: + cleanup: if (!cmpUUIDs) memcpy(def2->uuid, rem_uuid, sizeof(rem_uuid)); @@ -3339,7 +3339,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf, virBufferAsprintf(buf, "<%s/>\n", type); -err_exit: + err_exit: return; } diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c index b592a90..9cbad49c 100644 --- a/src/conf/nwfilter_ipaddrmap.c +++ b/src/conf/nwfilter_ipaddrmap.c @@ -69,7 +69,7 @@ virNWFilterIPAddrMapAddIPAddr(const char *ifname, char *addr) ret = 0; -cleanup: + cleanup: virMutexUnlock(&ipAddressMapLock); return ret; @@ -108,7 +108,7 @@ virNWFilterIPAddrMapDelIPAddr(const char *ifname, const char *ipaddr) ret = virNWFilterVarValueGetCardinality(val); } } else { -remove_entry: + remove_entry: /* remove whole entry */ val = virNWFilterHashTableRemoveEntry(ipAddressMap, ifname); virNWFilterVarValueFree(val); diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 97fc0a6..40eccc4 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -97,7 +97,7 @@ virNWFilterVarValueCopy(const virNWFilterVarValue *val) return res; -err_exit: + err_exit: virNWFilterVarValueFree(res); return NULL; } @@ -505,7 +505,7 @@ virNWFilterVarCombIterCreate(virNWFilterHashTablePtr hash, return res; -err_exit: + err_exit: virNWFilterVarCombIterFree(res); return NULL; } @@ -516,7 +516,7 @@ virNWFilterVarCombIterNext(virNWFilterVarCombIterPtr ci) size_t i; for (i = 0; i < ci->nIter; i++) { -next: + next: ci->iter[i].curValue++; if (ci->iter[i].curValue <= ci->iter[i].maxValue) { if (!virNWFilterVarCombIterEntryAreUniqueEntries( @@ -766,7 +766,7 @@ virNWFilterHashTablePutAll(virNWFilterHashTablePtr src, return 0; -err_exit: + err_exit: return -1; } @@ -851,7 +851,7 @@ virNWFilterParseParamAttributes(xmlNodePtr cur) } value = NULL; } -skip_entry: + skip_entry: virNWFilterVarValueFree(value); VIR_FREE(nam); VIR_FREE(val); @@ -861,7 +861,7 @@ skip_entry: } return table; -err_exit: + err_exit: VIR_FREE(nam); VIR_FREE(val); virNWFilterVarValueFree(value); @@ -1049,7 +1049,7 @@ virNWFilterVarAccessParse(const char *varAccess) _("Malformatted variable")); } -err_exit: + err_exit: virNWFilterVarAccessFree(dest); return NULL; diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 4b6c7af..beef3e1 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -439,7 +439,7 @@ virObjectEventCallbackListAddID(virConnectPtr conn, ret++; } -cleanup: + cleanup: if (event) virObjectUnref(event->conn); VIR_FREE(event); @@ -593,7 +593,7 @@ virObjectEventStateNew(void) return state; -error: + error: virObjectEventStateFree(state); return NULL; } @@ -902,7 +902,7 @@ virObjectEventStateRegisterID(virConnectPtr conn, state->timer = -1; } -cleanup: + cleanup: virObjectEventStateUnlock(state); return ret; } diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 0509743..ccce46c 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -183,7 +183,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, def->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; ret = 0; -cleanup: + cleanup: VIR_FREE(snapshot); VIR_FREE(type); if (ret < 0) @@ -357,7 +357,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, ret = def; -cleanup: + cleanup: VIR_FREE(creation); VIR_FREE(state); VIR_FREE(nodes); @@ -394,7 +394,7 @@ virDomainSnapshotDefParseNode(xmlDocPtr xml, ctxt->node = root; def = virDomainSnapshotDefParse(ctxt, caps, xmlopt, expectedVirtTypes, flags); -cleanup: + cleanup: xmlXPathFreeContext(ctxt); return def; } @@ -606,7 +606,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def, ret = 0; -cleanup: + cleanup: virBitmapFree(map); return ret; } @@ -1120,7 +1120,7 @@ virDomainListSnapshots(virDomainSnapshotObjListPtr snapshots, ret = count; *snaps = list; -cleanup: + cleanup: for (i = 0; i < count; i++) VIR_FREE(names[i]); VIR_FREE(names); @@ -1301,7 +1301,7 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain, } ret = 0; -cleanup: + cleanup: return ret; } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 03938f1..a300476 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -501,7 +501,7 @@ virStoragePoolDefParseAuthSecret(xmlXPathContextPtr ctxt, } ret = 0; -cleanup: + cleanup: VIR_FREE(uuid); return ret; } @@ -553,7 +553,7 @@ virStoragePoolDefParseAuth(xmlXPathContextPtr ctxt, ret = 0; -cleanup: + cleanup: VIR_FREE(authType); VIR_FREE(username); return ret; @@ -720,7 +720,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, source->product = virXPathString("string(./product/@name)", ctxt); ret = 0; -cleanup: + cleanup: ctxt->node = relnode; VIR_FREE(port); @@ -758,7 +758,7 @@ virStoragePoolDefParseSourceString(const char *srcSpec, ret = def; def = NULL; -cleanup: + cleanup: virStoragePoolSourceFree(def); xmlFreeDoc(doc); xmlXPathFreeContext(xpath_ctxt); @@ -838,7 +838,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, perms->label = virXPathString("string(./label)", ctxt); ret = 0; -error: + error: ctxt->node = relnode; return ret; } @@ -992,13 +992,13 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) goto error; } -cleanup: + cleanup: VIR_FREE(uuid); VIR_FREE(type); VIR_FREE(target_path); return ret; -error: + error: virStoragePoolDefFree(ret); ret = NULL; goto cleanup; @@ -1027,7 +1027,7 @@ virStoragePoolDefParseNode(xmlDocPtr xml, ctxt->node = root; def = virStoragePoolDefParseXML(ctxt); -cleanup: + cleanup: xmlXPathFreeContext(ctxt); return def; } @@ -1250,9 +1250,9 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) return virBufferContentAndReset(&buf); -no_memory: + no_memory: virReportOOMError(); -cleanup: + cleanup: virBufferFreeAndReset(&buf); return NULL; } @@ -1429,7 +1429,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, DEFAULT_VOL_PERM_MODE) < 0) goto error; -cleanup: + cleanup: VIR_FREE(nodes); VIR_FREE(allocation); VIR_FREE(capacity); @@ -1437,7 +1437,7 @@ cleanup: VIR_FREE(type); return ret; -error: + error: virStorageVolDefFree(ret); ret = NULL; goto cleanup; @@ -1467,7 +1467,7 @@ virStorageVolDefParseNode(virStoragePoolDefPtr pool, ctxt->node = root; def = virStorageVolDefParseXML(pool, ctxt); -cleanup: + cleanup: xmlXPathFreeContext(ctxt); return def; } @@ -1669,9 +1669,9 @@ virStorageVolDefFormat(virStoragePoolDefPtr pool, return virBufferContentAndReset(&buf); -no_memory: + no_memory: virReportOOMError(); -cleanup: + cleanup: virBufferFreeAndReset(&buf); return NULL; } @@ -2018,9 +2018,9 @@ virStoragePoolSourceListFormat(virStoragePoolSourceListPtr def) return virBufferContentAndReset(&buf); -no_memory: + no_memory: virReportOOMError(); -cleanup: + cleanup: virBufferFreeAndReset(&buf); return NULL; } @@ -2082,7 +2082,7 @@ virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, ret = 0; } -cleanup: + cleanup: if (pool) virStoragePoolObjUnlock(pool); return ret; @@ -2291,7 +2291,7 @@ virStoragePoolObjListExport(virConnectPtr conn, ret = npools; -cleanup: + cleanup: if (tmp_pools) { for (i = 0; i < npools; i++) { if (tmp_pools[i]) diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index 798541c..bba067b 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -117,7 +117,7 @@ virStorageEncryptionSecretParse(xmlXPathContextPtr ctxt, ctxt->node = old_node; return ret; - cleanup: + cleanup: virStorageEncryptionSecretFree(ret); VIR_FREE(uuidstr); ctxt->node = old_node; @@ -169,7 +169,7 @@ virStorageEncryptionParseXML(xmlXPathContextPtr ctxt) return ret; - cleanup: + cleanup: VIR_FREE(nodes); virStorageEncryptionFree(ret); return NULL; @@ -197,7 +197,7 @@ virStorageEncryptionParseNode(xmlDocPtr xml, xmlNodePtr root) ctxt->node = root; enc = virStorageEncryptionParseXML(ctxt); - cleanup: + cleanup: xmlXPathFreeContext(ctxt); return enc; } diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 4a88684..022fe71 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -96,7 +96,7 @@ static char *virChrdevLockFilePath(const char *dev) sanitizedPath = virFileSanitizePath(path); -cleanup: + cleanup: VIR_FREE(path); VIR_FREE(devCopy); @@ -175,7 +175,7 @@ static int virChrdevLockFileCreate(const char *dev) /* we hold the lock */ ret = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(lockfd); VIR_FREE(path); VIR_FREE(pidStr); @@ -284,7 +284,7 @@ virChrdevsPtr virChrdevAlloc(void) goto error; return devs; -error: + error: virChrdevFree(devs); return NULL; } @@ -433,7 +433,7 @@ int virChrdevOpen(virChrdevsPtr devs, virMutexUnlock(&devs->lock); return 0; -error: + error: savedError = virSaveLastError(); if (added) -- 1.8.3.2

--- src/esx/esx_driver.c | 110 ++++++++++++++++++------------------ src/esx/esx_interface_driver.c | 4 +- src/esx/esx_network_driver.c | 12 ++-- src/esx/esx_storage_backend_iscsi.c | 22 ++++---- src/esx/esx_storage_backend_vmfs.c | 36 ++++++------ src/esx/esx_storage_driver.c | 2 +- src/esx/esx_util.c | 6 +- src/esx/esx_vi.c | 86 ++++++++++++++-------------- src/esx/esx_vi_methods.c | 2 +- src/esx/esx_vi_types.c | 18 +++--- 10 files changed, 149 insertions(+), 149 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index a08a69d..ff44881 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -255,7 +255,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) } } - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastoreList); esxVI_DatastoreHostMount_Free(&hostMount); @@ -361,7 +361,7 @@ esxFormatVMXFileName(const char *fileName, void *opaque) success = true; - cleanup: + cleanup: if (! success) { virBufferFreeAndReset(&buffer); VIR_FREE(result); @@ -433,7 +433,7 @@ esxAutodetectSCSIControllerModel(virDomainDiskDefPtr def, int *model, result = 0; - cleanup: + cleanup: esxVI_FileInfo_Free(&fileInfo); return result; @@ -508,7 +508,7 @@ esxSupportsLongMode(esxPrivate *priv) } } - cleanup: + cleanup: /* * If we goto cleanup in case of an error then priv->supportsLongMode * is still esxVI_Boolean_Undefined, therefore we don't need to set it. @@ -557,7 +557,7 @@ esxLookupHostSystemBiosUuid(esxPrivate *priv, unsigned char *uuid) result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); @@ -624,7 +624,7 @@ esxCapsInit(esxPrivate *priv) return caps; - failure: + failure: virObjectUnref(caps); return NULL; @@ -742,7 +742,7 @@ esxConnectToHost(esxPrivate *priv, result = 0; - cleanup: + cleanup: VIR_FREE(username); VIR_FREE(unescapedPassword); VIR_FREE(password); @@ -843,7 +843,7 @@ esxConnectToVCenter(esxPrivate *priv, result = 0; - cleanup: + cleanup: VIR_FREE(username); VIR_FREE(unescapedPassword); VIR_FREE(password); @@ -1070,7 +1070,7 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, priv = NULL; result = VIR_DRV_OPEN_SUCCESS; - cleanup: + cleanup: esxFreePrivate(&priv); VIR_FREE(potentialVCenterIpAddress); @@ -1132,7 +1132,7 @@ esxSupportsVMotion(esxPrivate *priv) goto cleanup; } - cleanup: + cleanup: /* * If we goto cleanup in case of an error then priv->supportsVMotion is * still esxVI_Boolean_Undefined, therefore we don't need to set it. @@ -1258,7 +1258,7 @@ esxConnectGetHostname(virConnectPtr conn) goto cleanup; } - cleanup: + cleanup: /* * If we goto cleanup in case of an error then complete is still NULL, * either VIR_STRDUP returned -1 or virAsprintf failed. When virAsprintf @@ -1407,7 +1407,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); @@ -1487,7 +1487,7 @@ esxConnectListDomains(virConnectPtr conn, int *ids, int maxids) success = true; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachineList); @@ -1577,7 +1577,7 @@ esxDomainLookupByID(virConnectPtr conn, int id) virReportError(VIR_ERR_NO_DOMAIN, _("No domain with ID %d"), id); } - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachineList); VIR_FREE(name_candidate); @@ -1626,7 +1626,7 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) domain->id = -1; } - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine); VIR_FREE(name); @@ -1684,7 +1684,7 @@ esxDomainLookupByName(virConnectPtr conn, const char *name) domain->id = -1; } - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine); @@ -1740,7 +1740,7 @@ esxDomainSuspend(virDomainPtr domain) result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_String_Free(&propertyNameList); esxVI_ManagedObjectReference_Free(&task); @@ -1798,7 +1798,7 @@ esxDomainResume(virDomainPtr domain) result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_String_Free(&propertyNameList); esxVI_ManagedObjectReference_Free(&task); @@ -1845,7 +1845,7 @@ esxDomainShutdownFlags(virDomainPtr domain, unsigned int flags) result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_String_Free(&propertyNameList); @@ -1896,7 +1896,7 @@ esxDomainReboot(virDomainPtr domain, unsigned int flags) result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_String_Free(&propertyNameList); @@ -1963,7 +1963,7 @@ esxDomainDestroyFlags(virDomainPtr domain, domain->id = -1; result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_String_Free(&propertyNameList); esxVI_ManagedObjectReference_Free(&task); @@ -2034,7 +2034,7 @@ esxDomainGetMaxMemory(virDomainPtr domain) } } - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine); @@ -2102,7 +2102,7 @@ esxDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine); esxVI_VirtualMachineConfigSpec_Free(&spec); @@ -2159,7 +2159,7 @@ esxDomainSetMemory(virDomainPtr domain, unsigned long memory) result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_VirtualMachineConfigSpec_Free(&spec); esxVI_ManagedObjectReference_Free(&task); @@ -2427,7 +2427,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) result = 0; - cleanup: + cleanup: #if ESX_QUERY_FOR_USED_CPU_TIME /* * Remove values owned by data structures to prevent them from being freed @@ -2492,7 +2492,7 @@ esxDomainGetState(virDomainPtr domain, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine); @@ -2571,7 +2571,7 @@ esxDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_VirtualMachineConfigSpec_Free(&spec); esxVI_ManagedObjectReference_Free(&task); @@ -2635,7 +2635,7 @@ esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) } } - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); @@ -2745,7 +2745,7 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) xml = virDomainDefFormat(def, flags); } - cleanup: + cleanup: if (!url) { virBufferFreeAndReset(&buffer); } @@ -2916,7 +2916,7 @@ esxConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxname success = true; - cleanup: + cleanup: if (! success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); @@ -3001,7 +3001,7 @@ esxDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) domain->id = id; result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_String_Free(&propertyNameList); esxVI_ManagedObjectReference_Free(&task); @@ -3229,7 +3229,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) /* FIXME: Add proper rollback in case of an error */ - cleanup: + cleanup: if (!url) { virBufferFreeAndReset(&buffer); } @@ -3301,7 +3301,7 @@ esxDomainUndefineFlags(virDomainPtr domain, result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_String_Free(&propertyNameList); @@ -3373,7 +3373,7 @@ esxDomainGetAutostart(virDomainPtr domain, int *autostart) result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_AutoStartDefaults_Free(&defaults); esxVI_AutoStartPowerInfo_Free(&powerInfoList); @@ -3480,7 +3480,7 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart) result = 0; - cleanup: + cleanup: if (newPowerInfo) { newPowerInfo->key = NULL; newPowerInfo->startAction = NULL; @@ -3655,7 +3655,7 @@ esxDomainGetSchedulerParametersFlags(virDomainPtr domain, *nparams = i; result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine); @@ -3796,7 +3796,7 @@ esxDomainSetSchedulerParametersFlags(virDomainPtr domain, result = 0; - cleanup: + cleanup: esxVI_SharesInfo_Free(&sharesInfo); esxVI_ObjectContent_Free(&virtualMachine); esxVI_VirtualMachineConfigSpec_Free(&spec); @@ -3979,7 +3979,7 @@ esxDomainMigratePerform(virDomainPtr domain, result = 0; - cleanup: + cleanup: virURIFree(parsedUri); esxVI_ObjectContent_Free(&virtualMachine); esxVI_Event_Free(&eventList); @@ -4052,7 +4052,7 @@ esxNodeGetFreeMemory(virConnectPtr conn) result = resourcePoolResourceUsage->unreservedForVm->value; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&resourcePool); esxVI_ResourcePoolResourceUsage_Free(&resourcePoolResourceUsage); @@ -4135,7 +4135,7 @@ esxDomainIsActive(virDomainPtr domain) result = 0; } - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_String_Free(&propertyNameList); @@ -4163,7 +4163,7 @@ esxDomainIsPersistent(virDomainPtr domain) result = 1; -cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); return result; @@ -4190,7 +4190,7 @@ esxDomainIsUpdated(virDomainPtr domain ATTRIBUTE_UNUSED) result = 0; -cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); return result; @@ -4274,7 +4274,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, snapshot = virGetDomainSnapshot(domain, def->name); - cleanup: + cleanup: virDomainSnapshotDefFree(def); esxVI_ObjectContent_Free(&virtualMachine); esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotList); @@ -4330,7 +4330,7 @@ esxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, xml = virDomainSnapshotDefFormat(uuid_string, &def, flags, 0); - cleanup: + cleanup: esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotList); return xml; @@ -4460,7 +4460,7 @@ esxDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, unsigned int flags) count = esxVI_GetNumberOfSnapshotTrees(snapshotTree->childSnapshotList, recurse, leaves); -cleanup: + cleanup: esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotTreeList); return count; @@ -4517,7 +4517,7 @@ esxDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, result = esxVI_GetSnapshotTreeNames(snapshotTree->childSnapshotList, names, nameslen, recurse, leaves); -cleanup: + cleanup: esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotTreeList); return result; @@ -4550,7 +4550,7 @@ esxDomainSnapshotLookupByName(virDomainPtr domain, const char *name, snapshot = virGetDomainSnapshot(domain, name); - cleanup: + cleanup: esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotTreeList); return snapshot; @@ -4618,7 +4618,7 @@ esxDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, unsigned int flags) parent = virGetDomainSnapshot(snapshot->domain, snapshotTreeParent->name); -cleanup: + cleanup: esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotList); return parent; @@ -4685,7 +4685,7 @@ esxDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, unsigned int flags) ret = STREQ(snapshot->name, currentSnapshotTree->name); -cleanup: + cleanup: esxVI_VirtualMachineSnapshotTree_Free(&currentSnapshotTree); esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotList); return ret; @@ -4717,7 +4717,7 @@ esxDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, unsigned int flags) ret = 0; -cleanup: + cleanup: esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotList); return ret; } @@ -4766,7 +4766,7 @@ esxDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, unsigned int flags) result = 0; - cleanup: + cleanup: esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotList); esxVI_ManagedObjectReference_Free(&task); VIR_FREE(taskInfoErrorMessage); @@ -4832,7 +4832,7 @@ esxDomainSnapshotDelete(virDomainSnapshotPtr snapshot, unsigned int flags) result = 0; - cleanup: + cleanup: esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotList); esxVI_ManagedObjectReference_Free(&task); VIR_FREE(taskInfoErrorMessage); @@ -4903,7 +4903,7 @@ esxDomainSetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params, result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_VirtualMachineConfigSpec_Free(&spec); esxVI_ManagedObjectReference_Free(&task); @@ -4954,7 +4954,7 @@ esxDomainGetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params, *nparams = 1; result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine); esxVI_Long_Free(&reservation); @@ -5168,7 +5168,7 @@ esxConnectListAllDomains(virConnectPtr conn, doms = NULL; ret = count; -cleanup: + cleanup: if (doms) { for (id = 0; id < count; id++) { virDomainFree(doms[id]); diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 656ac8b..ecc5313 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -121,7 +121,7 @@ esxConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) success = true; - cleanup: + cleanup: if (! success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); @@ -273,7 +273,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) xml = virInterfaceDefFormat(&def); - cleanup: + cleanup: esxVI_PhysicalNic_Free(&physicalNic); return xml; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 877a3c1..c6f325c 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -129,7 +129,7 @@ esxConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) success = true; - cleanup: + cleanup: if (! success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); @@ -202,7 +202,7 @@ esxNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) network = virGetNetwork(conn, hostVirtualSwitch->name, uuid); - cleanup: + cleanup: esxVI_HostVirtualSwitch_Free(&hostVirtualSwitchList); return network; @@ -304,7 +304,7 @@ esxBandwidthToShapingPolicy(virNetDevBandwidthPtr bandwidth, result = 0; - cleanup: + cleanup: if (result < 0) { esxVI_HostNetworkTrafficShapingPolicy_Free(shapingPolicy); } @@ -510,7 +510,7 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) network = virGetNetwork(conn, hostVirtualSwitch->name, md5); - cleanup: + cleanup: virNetworkDefFree(def); esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); esxVI_HostPortGroup_Free(&hostPortGroupList); @@ -616,7 +616,7 @@ esxNetworkUndefine(virNetworkPtr network) result = 0; - cleanup: + cleanup: esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); esxVI_HostPortGroup_Free(&hostPortGroupList); @@ -842,7 +842,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) xml = virNetworkDefFormat(def, flags); - cleanup: + cleanup: esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); esxVI_PhysicalNic_Free(&physicalNicList); esxVI_HostPortGroup_Free(&hostPortGroupList); diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index e8f88ba..bd9f3b4 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -84,7 +84,7 @@ esxConnectNumOfStoragePools(virConnectPtr conn) success = true; - cleanup: + cleanup: esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); return success ? count : -1; @@ -137,7 +137,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, success = true; - cleanup: + cleanup: if (! success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); @@ -185,7 +185,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, pool = virGetStoragePool(conn, name, md5, &esxStorageBackendISCSI, NULL); - cleanup: + cleanup: esxVI_HostInternetScsiHbaStaticTarget_Free(&target); return pool; @@ -234,7 +234,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, pool = virGetStoragePool(conn, target->iScsiName, md5, &esxStorageBackendISCSI, NULL); - cleanup: + cleanup: esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); return pool; @@ -269,7 +269,7 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, result = 0; - cleanup: + cleanup: esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); return result; @@ -344,7 +344,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) /* TODO: add CHAP authentication params */ xml = virStoragePoolDefFormat(&def); - cleanup: + cleanup: VIR_FREE(def.source.hosts); esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); @@ -422,7 +422,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, success = true; - cleanup: + cleanup: if (! success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); @@ -478,7 +478,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool, } } - cleanup: + cleanup: esxVI_ScsiLun_Free(&scsiLunList); return volume; @@ -525,7 +525,7 @@ esxStorageVolLookupByPath(virConnectPtr conn, const char *path) } } - cleanup: + cleanup: esxVI_ScsiLun_Free(&scsiLunList); VIR_FREE(poolName); @@ -580,7 +580,7 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key) } } - cleanup: + cleanup: esxVI_ScsiLun_Free(&scsiLunList); VIR_FREE(poolName); @@ -687,7 +687,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, xml = virStorageVolDefFormat(&pool, &def); - cleanup: + cleanup: esxVI_ScsiLun_Free(&scsiLunList); VIR_FREE(def.key); diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index 2fa2a00..db4d480 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -102,7 +102,7 @@ esxLookupVMFSStoragePoolType(esxVI_Context *ctx, const char *poolName, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); esxVI_DatastoreInfo_Free(&datastoreInfo); @@ -183,7 +183,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, success = true; - cleanup: + cleanup: if (! success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); @@ -244,7 +244,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, pool = virGetStoragePool(conn, name, md5, &esxStorageBackendVMFS, NULL); - cleanup: + cleanup: esxVI_ObjectContent_Free(&datastore); esxVI_DatastoreHostMount_Free(&hostMount); @@ -312,7 +312,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, pool = virGetStoragePool(conn, name, uuid, &esxStorageBackendVMFS, NULL); - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastoreList); esxVI_DatastoreHostMount_Free(&hostMount); @@ -339,7 +339,7 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&datastore); return result; @@ -399,7 +399,7 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); @@ -515,7 +515,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) xml = virStoragePoolDefFormat(&def); - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); esxVI_DatastoreHostMount_Free(&hostMount); @@ -552,7 +552,7 @@ esxStoragePoolNumOfVolumes(virStoragePoolPtr pool) success = true; - cleanup: + cleanup: esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); return success ? count : -1; @@ -623,7 +623,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, success = true; - cleanup: + cleanup: if (! success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); @@ -660,7 +660,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool, volume = virGetStorageVol(pool->conn, pool->name, name, key, &esxStorageBackendVMFS, NULL); - cleanup: + cleanup: VIR_FREE(datastorePath); VIR_FREE(key); @@ -691,7 +691,7 @@ esxStorageVolLookupByPath(virConnectPtr conn, const char *path) volume = virGetStorageVol(conn, datastoreName, directoryAndFileName, key, &esxStorageBackendVMFS, NULL); - cleanup: + cleanup: VIR_FREE(datastoreName); VIR_FREE(directoryAndFileName); VIR_FREE(key); @@ -821,7 +821,7 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key) } } - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastoreList); esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); @@ -1030,7 +1030,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, volume = virGetStorageVol(pool->conn, pool->name, def->name, key, &esxStorageBackendVMFS, NULL); - cleanup: + cleanup: if (virtualDiskSpec) { virtualDiskSpec->diskType = NULL; virtualDiskSpec->adapterType = NULL; @@ -1222,7 +1222,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, volume = virGetStorageVol(pool->conn, pool->name, def->name, key, &esxStorageBackendVMFS, NULL); - cleanup: + cleanup: VIR_FREE(sourceDatastorePath); virStorageVolDefFree(def); VIR_FREE(unescapedDatastorePath); @@ -1276,7 +1276,7 @@ esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags) result = 0; - cleanup: + cleanup: VIR_FREE(datastorePath); esxVI_ManagedObjectReference_Free(&task); VIR_FREE(taskInfoErrorMessage); @@ -1319,7 +1319,7 @@ esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags) result = 0; - cleanup: + cleanup: VIR_FREE(datastorePath); esxVI_ManagedObjectReference_Free(&task); VIR_FREE(taskInfoErrorMessage); @@ -1365,7 +1365,7 @@ esxStorageVolGetInfo(virStorageVolPtr volume, result = 0; - cleanup: + cleanup: VIR_FREE(datastorePath); esxVI_FileInfo_Free(&fileInfo); @@ -1446,7 +1446,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, xml = virStorageVolDefFormat(&pool, &def); - cleanup: + cleanup: VIR_FREE(datastorePath); esxVI_FileInfo_Free(&fileInfo); VIR_FREE(def.key); diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 6353dfc..2cfe939 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -137,7 +137,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames) success = true; - cleanup: + cleanup: if (! success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 47d30aa..f84ecd5 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -165,7 +165,7 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) result = 0; - cleanup: + cleanup: if (result < 0) { esxUtil_FreeParsedUri(parsedUri); } @@ -281,7 +281,7 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, result = 0; - cleanup: + cleanup: if (result < 0) { if (datastoreName) { VIR_FREE(*datastoreName); @@ -482,7 +482,7 @@ esxUtil_EscapeDatastoreItem(const char *string) escaped2 = esxUtil_EscapeBase64(escaped1); - cleanup: + cleanup: VIR_FREE(replaced); VIR_FREE(escaped1); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index afbfdb9..6188139 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -437,7 +437,7 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content, *content = virBufferContentAndReset(&buffer); - cleanup: + cleanup: VIR_FREE(range); if (!(*content)) { @@ -1161,7 +1161,7 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) result = 0; - cleanup: + cleanup: if (result < 0) { virBufferFreeAndReset(&buffer); } @@ -1215,7 +1215,7 @@ esxVI_Context_LookupManagedObjectsByHostSystemIp(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_ManagedObjectReference_Free(&managedObjectReference); return result; @@ -1395,7 +1395,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, result = 0; - cleanup: + cleanup: if (result < 0) { virBufferFreeAndReset(&buffer); esxVI_Response_Free(response); @@ -1597,7 +1597,7 @@ esxVI_List_DeepCopy(esxVI_List **destList, esxVI_List *srcList, return 0; - failure: + failure: freeFunc(&dest); freeFunc(destList); @@ -1651,7 +1651,7 @@ esxVI_List_CastFromAnyType(esxVI_AnyType *anyType, esxVI_List **list, result = 0; - cleanup: + cleanup: if (result < 0) { freeFunc(&item); freeFunc(list); @@ -1720,7 +1720,7 @@ esxVI_List_Deserialize(xmlNodePtr node, esxVI_List **list, return 0; - failure: + failure: freeFunc(&item); freeFunc(list); @@ -1788,7 +1788,7 @@ esxVI_BuildSelectSet(esxVI_SelectionSpec **selectSet, return 0; - failure: + failure: esxVI_TraversalSpec_Free(&traversalSpec); esxVI_SelectionSpec_Free(&selectionSpec); @@ -1970,7 +1970,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) result = 0; - cleanup: + cleanup: virMutexUnlock(ctx->sessionLock); esxVI_String_Free(&propertyNameList); @@ -2120,7 +2120,7 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: /* * Remove values given by the caller from the data structures to prevent * them from being freed by the call to esxVI_PropertyFilterSpec_Free(). @@ -2406,7 +2406,7 @@ esxVI_LookupNumberOfDomainsByPowerState(esxVI_Context *ctx, success = true; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachineList); @@ -2517,7 +2517,7 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine, return 0; - failure: + failure: if (name) { VIR_FREE(*name); } @@ -2589,7 +2589,7 @@ esxVI_GetSnapshotTreeNames(esxVI_VirtualMachineSnapshotTree *snapshotTreeList, return count; - failure: + failure: for (i = 0; i < count; ++i) { VIR_FREE(names[i]); } @@ -2754,7 +2754,7 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid, result = 0; - cleanup: + cleanup: esxVI_ManagedObjectReference_Free(&managedObjectReference); return result; @@ -2821,7 +2821,7 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name, result = 0; - cleanup: + cleanup: esxVI_String_Free(&completePropertyNameList); esxVI_ObjectContent_Free(&virtualMachineList); VIR_FREE(name_candidate); @@ -2873,7 +2873,7 @@ esxVI_LookupVirtualMachineByUuidAndPrepareForTask result = 0; - cleanup: + cleanup: esxVI_String_Free(&completePropertyNameList); esxVI_VirtualMachineQuestionInfo_Free(&questionInfo); esxVI_TaskInfo_Free(&pendingTaskInfoList); @@ -2954,7 +2954,7 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, result = 0; - cleanup: + cleanup: esxVI_String_Free(&completePropertyNameList); esxVI_ObjectContent_Free(&datastoreList); @@ -3042,7 +3042,7 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_String_Free(&completePropertyNameList); esxVI_ObjectContent_Free(&datastoreList); esxVI_DatastoreHostMount_Free(&datastoreHostMountList); @@ -3112,7 +3112,7 @@ esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&objectContent); esxVI_DatastoreHostMount_Free(&hostMountList); @@ -3159,7 +3159,7 @@ esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&objectContent); @@ -3220,7 +3220,7 @@ esxVI_LookupPendingTaskInfoListByVirtualMachine result = 0; - cleanup: + cleanup: if (result < 0) { esxVI_TaskInfo_Free(pendingTaskInfoList); } @@ -3268,7 +3268,7 @@ esxVI_LookupAndHandleVirtualMachineQuestion(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&virtualMachine); esxVI_String_Free(&propertyNameList); esxVI_VirtualMachineQuestionInfo_Free(&questionInfo); @@ -3317,7 +3317,7 @@ esxVI_LookupRootSnapshotTreeList result = 0; - cleanup: + cleanup: if (result < 0) { esxVI_VirtualMachineSnapshotTree_Free(rootSnapshotTreeList); } @@ -3402,7 +3402,7 @@ esxVI_LookupCurrentSnapshotTree result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine); esxVI_ManagedObjectReference_Free(&currentSnapshot); @@ -3593,7 +3593,7 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: /* Don't double free fileName */ if (searchSpec && searchSpec->matchPattern) { searchSpec->matchPattern->value = NULL; @@ -3726,7 +3726,7 @@ esxVI_LookupDatastoreContentByDatastoreName result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); esxVI_ManagedObjectReference_Free(&hostDatastoreBrowser); @@ -3791,7 +3791,7 @@ esxVI_LookupStorageVolumeKeyByDatastorePath(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_FileInfo_Free(&fileInfo); VIR_FREE(uuid_string); @@ -3848,7 +3848,7 @@ esxVI_LookupAutoStartDefaults(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostAutoStartManager); @@ -3899,7 +3899,7 @@ esxVI_LookupAutoStartPowerInfoList(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostAutoStartManager); @@ -3943,7 +3943,7 @@ esxVI_LookupPhysicalNicList(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); @@ -3993,7 +3993,7 @@ esxVI_LookupPhysicalNicByName(esxVI_Context *ctx, const char *name, result = 0; - cleanup: + cleanup: esxVI_PhysicalNic_Free(&physicalNicList); return result; @@ -4042,7 +4042,7 @@ esxVI_LookupPhysicalNicByMACAddress(esxVI_Context *ctx, const char *mac, result = 0; - cleanup: + cleanup: esxVI_PhysicalNic_Free(&physicalNicList); return result; @@ -4085,7 +4085,7 @@ esxVI_LookupHostVirtualSwitchList(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); @@ -4138,7 +4138,7 @@ esxVI_LookupHostVirtualSwitchByName(esxVI_Context *ctx, const char *name, result = 0; - cleanup: + cleanup: esxVI_HostVirtualSwitch_Free(&hostVirtualSwitchList); return result; @@ -4183,7 +4183,7 @@ esxVI_LookupHostPortGroupList(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); @@ -4299,7 +4299,7 @@ esxVI_HandleVirtualMachineQuestion result = 0; - cleanup: + cleanup: if (result < 0) { virBufferFreeAndReset(&buffer); } @@ -4483,7 +4483,7 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: /* * Remove values given by the caller from the data structures to prevent * them from being freed by the call to esxVI_PropertyFilterSpec_Free(). @@ -4650,7 +4650,7 @@ esxVI_LookupHostInternetScsiHbaStaticTargetByName result = 0; - cleanup: + cleanup: esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); return result; @@ -4708,7 +4708,7 @@ esxVI_LookupHostInternetScsiHba(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); esxVI_HostHostBusAdapter_Free(&hostHostBusAdapterList); @@ -4749,7 +4749,7 @@ esxVI_LookupScsiLunList(esxVI_Context *ctx, esxVI_ScsiLun **scsiLunList) result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); @@ -4842,7 +4842,7 @@ esxVI_LookupHostScsiTopologyLunListByTargetName result = 0; - cleanup: + cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); esxVI_HostScsiTopologyInterface_Free(&hostScsiInterfaceList); @@ -4931,7 +4931,7 @@ esxVI_LookupStoragePoolNameByScsiLunKey(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_ObjectContent_Free(&hostSystem); esxVI_String_Free(&propertyNameList); esxVI_HostScsiTopologyInterface_Free(&hostScsiInterfaceList); @@ -5137,7 +5137,7 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: if (result < 0) { esxVI_ObjectContent_Free(objectContentList); } else { diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index 9b9701d..0fdd0cd 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -247,7 +247,7 @@ esxVI_RetrieveServiceContent(esxVI_Context *ctx, result = 0; - cleanup: + cleanup: esxVI_Response_Free(&response); return result; diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 4289608..f147e74 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -739,7 +739,7 @@ esxVI_GetActualObjectType(xmlNodePtr node, esxVI_Type baseType, result = 0; - cleanup: + cleanup: VIR_FREE(type); return result; @@ -1001,7 +1001,7 @@ esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src) return 0; - failure: + failure: esxVI_AnyType_Free(dest); return -1; @@ -1118,7 +1118,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) return 0; - failure: + failure: esxVI_AnyType_Free(anyType); return -1; @@ -1182,7 +1182,7 @@ esxVI_String_AppendValueToList(esxVI_String **stringList, const char *value) return 0; - failure: + failure: esxVI_String_Free(&string); return -1; @@ -1209,7 +1209,7 @@ esxVI_String_AppendValueListToList(esxVI_String **stringList, return 0; - failure: + failure: esxVI_String_Free(&stringListToAppend); return -1; @@ -1293,7 +1293,7 @@ esxVI_String_Deserialize(xmlNodePtr node, esxVI_String **string) return 0; - failure: + failure: esxVI_String_Free(string); return -1; @@ -1501,7 +1501,7 @@ esxVI_DateTime_Deserialize(xmlNodePtr node, esxVI_DateTime **dateTime) return 0; - failure: + failure: esxVI_DateTime_Free(dateTime); return -1; @@ -1675,7 +1675,7 @@ esxVI_MethodFault_Deserialize(xmlNodePtr node, esxVI_MethodFault **methodFault) return 0; - failure: + failure: esxVI_MethodFault_Free(methodFault); return -1; @@ -1775,7 +1775,7 @@ esxVI_ManagedObjectReference_Deserialize return 0; - failure: + failure: esxVI_ManagedObjectReference_Free(managedObjectReference); return -1; -- 1.8.3.2

--- src/libvirt.c | 680 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 340 insertions(+), 340 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index d42da38..4454829 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -157,7 +157,7 @@ virConnectAuthGainPolkit(const char *privilege) goto cleanup; ret = 0; -cleanup: + cleanup: virCommandFree(cmd); return ret; } @@ -463,7 +463,7 @@ virGlobalInit(void) return; -error: + error: virGlobalError = true; } @@ -870,7 +870,7 @@ virGetVersion(unsigned long *libVer, const char *type ATTRIBUTE_UNUSED, return 0; -error: + error: virDispatchError(NULL); return -1; } @@ -923,7 +923,7 @@ virConnectGetConfigFile(virConfPtr *conf) ret = 0; -cleanup: + cleanup: VIR_FREE(filename); return ret; } @@ -1026,7 +1026,7 @@ virConnectGetDefaultURI(virConfPtr conf, } ret = 0; -cleanup: + cleanup: return ret; } @@ -1271,7 +1271,7 @@ do_open(const char *name, return ret; -failed: + failed: virConfFree(conf); virObjectUnref(ret); @@ -1316,7 +1316,7 @@ virConnectOpen(const char *name) goto error; return ret; -error: + error: virDispatchError(NULL); return NULL; } @@ -1352,7 +1352,7 @@ virConnectOpenReadOnly(const char *name) goto error; return ret; -error: + error: virDispatchError(NULL); return NULL; } @@ -1392,7 +1392,7 @@ virConnectOpenAuth(const char *name, goto error; return ret; -error: + error: virDispatchError(NULL); return NULL; } @@ -1562,7 +1562,7 @@ virConnectGetVersion(virConnectPtr conn, unsigned long *hvVer) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -1600,7 +1600,7 @@ virConnectGetLibVersion(virConnectPtr conn, unsigned long *libVer) *libVer = LIBVIR_VERSION_NUMBER; return 0; -error: + error: virDispatchError(conn); return ret; } @@ -1637,7 +1637,7 @@ virConnectGetHostname(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -1673,7 +1673,7 @@ virConnectGetURI(virConnectPtr conn) return name; -error: + error: virDispatchError(conn); return NULL; } @@ -1710,7 +1710,7 @@ virConnectGetSysinfo(virConnectPtr conn, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -1745,7 +1745,7 @@ virConnectGetMaxVcpus(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -1787,7 +1787,7 @@ virConnectListDomains(virConnectPtr conn, int *ids, int maxids) } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -1818,7 +1818,7 @@ virConnectNumOfDomains(virConnectPtr conn) } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -1898,7 +1898,7 @@ virDomainCreateXML(virConnectPtr conn, const char *xmlDesc, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -1965,7 +1965,7 @@ virDomainCreateXMLWithFiles(virConnectPtr conn, const char *xmlDesc, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -2023,7 +2023,7 @@ virDomainLookupByID(virConnectPtr conn, int id) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -2059,7 +2059,7 @@ virDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -2095,7 +2095,7 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) return virDomainLookupByUUID(conn, &uuid[0]); -error: + error: virDispatchError(conn); return NULL; } @@ -2131,7 +2131,7 @@ virDomainLookupByName(virConnectPtr conn, const char *name) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -2185,7 +2185,7 @@ virDomainDestroy(virDomainPtr domain) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -2245,7 +2245,7 @@ virDomainDestroyFlags(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -2343,7 +2343,7 @@ virDomainSuspend(virDomainPtr domain) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -2385,7 +2385,7 @@ virDomainResume(virDomainPtr domain) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -2446,7 +2446,7 @@ virDomainPMSuspendForDuration(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -2489,7 +2489,7 @@ virDomainPMWakeup(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -2548,7 +2548,7 @@ virDomainSave(virDomainPtr domain, const char *to) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -2639,7 +2639,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -2689,7 +2689,7 @@ virDomainRestore(virConnectPtr conn, const char *from) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -2767,7 +2767,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -2832,7 +2832,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -2908,7 +2908,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -2996,7 +2996,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3095,7 +3095,7 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3157,7 +3157,7 @@ virDomainScreenshot(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return NULL; } @@ -3207,7 +3207,7 @@ virDomainShutdown(virDomainPtr domain) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3267,7 +3267,7 @@ virDomainShutdownFlags(virDomainPtr domain, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3325,7 +3325,7 @@ virDomainReboot(virDomainPtr domain, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3369,7 +3369,7 @@ virDomainReset(virDomainPtr domain, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3420,7 +3420,7 @@ virDomainGetUUID(virDomainPtr domain, unsigned char *uuid) return 0; -error: + error: virDispatchError(domain->conn); return -1; } @@ -3449,7 +3449,7 @@ virDomainGetUUIDString(virDomainPtr domain, char *buf) virUUIDFormat(domain->uuid, buf); return 0; -error: + error: virDispatchError(domain->conn); return -1; } @@ -3507,7 +3507,7 @@ virDomainGetOSType(virDomainPtr domain) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return NULL; } @@ -3551,7 +3551,7 @@ virDomainGetMaxMemory(virDomainPtr domain) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return 0; } @@ -3598,7 +3598,7 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3644,7 +3644,7 @@ virDomainSetMemory(virDomainPtr domain, unsigned long memory) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3701,7 +3701,7 @@ virDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3757,7 +3757,7 @@ virDomainSetMemoryStatsPeriod(virDomainPtr domain, int period, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3851,7 +3851,7 @@ virDomainSetMemoryParameters(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3934,7 +3934,7 @@ virDomainGetMemoryParameters(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -3986,7 +3986,7 @@ virDomainSetNumaParameters(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -4052,7 +4052,7 @@ virDomainGetNumaParameters(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -4104,7 +4104,7 @@ virDomainSetBlkioParameters(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -4178,7 +4178,7 @@ virDomainGetBlkioParameters(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -4222,7 +4222,7 @@ virDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -4268,7 +4268,7 @@ virDomainGetState(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -4309,7 +4309,7 @@ virDomainGetControlInfo(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -4364,7 +4364,7 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return NULL; } @@ -4414,7 +4414,7 @@ virConnectDomainXMLFromNative(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -4464,7 +4464,7 @@ virConnectDomainXMLToNative(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -4555,7 +4555,7 @@ virDomainMigrateVersion1(virDomainPtr domain, else ddomain = virDomainLookupByName(dconn, dname); -done: + done: VIR_FREE(uri_out); VIR_FREE(cookie); return ddomain; @@ -4678,7 +4678,7 @@ virDomainMigrateVersion2(virDomainPtr domain, */ cancelled = ret < 0 ? 1 : 0; -finish: + finish: /* In version 2 of the migration protocol, we pass the * status code from the sender to the destination host, * so it can do any cleanup if the migration failed. @@ -4690,7 +4690,7 @@ finish: if (cancelled && ddomain) VIR_ERROR(_("finish step ignored that migration was cancelled")); -done: + done: if (orig_err) { virSetError(orig_err); virFreeError(orig_err); @@ -4912,7 +4912,7 @@ virDomainMigrateVersion3Full(virDomainPtr domain, */ cancelled = ret < 0 ? 1 : 0; -finish: + finish: /* * The status code from the source is passed to the destination. * The dest can cleanup if the source indicated it failed to @@ -4962,7 +4962,7 @@ finish: if (!orig_err) orig_err = virSaveLastError(); -confirm: + confirm: /* * If cancelled, then src VM will be restarted, else it will be killed. * Don't do this if migration failed on source and thus it was already @@ -4994,7 +4994,7 @@ confirm: } } -done: + done: if (orig_err) { virSetError(orig_err); virFreeError(orig_err); @@ -5416,7 +5416,7 @@ virDomainMigrate(virDomainPtr domain, return ddomain; -error: + error: virDispatchError(domain->conn); return NULL; } @@ -5649,7 +5649,7 @@ virDomainMigrate2(virDomainPtr domain, return ddomain; -error: + error: virDispatchError(domain->conn); return NULL; } @@ -5831,13 +5831,13 @@ virDomainMigrate3(virDomainPtr domain, goto error; } -done: + done: if (ddomain == NULL) goto error; return ddomain; -error: + error: virDispatchError(domain->conn); return NULL; } @@ -5980,7 +5980,7 @@ virDomainMigrateToURI(virDomainPtr domain, return 0; -error: + error: virDispatchError(domain->conn); return -1; } @@ -6128,7 +6128,7 @@ virDomainMigrateToURI2(virDomainPtr domain, return 0; -error: + error: virDispatchError(domain->conn); return -1; } @@ -6273,7 +6273,7 @@ virDomainMigrateToURI3(virDomainPtr domain, return 0; -error: + error: virDispatchError(domain->conn); return -1; } @@ -6314,7 +6314,7 @@ virDomainMigratePrepare(virConnectPtr dconn, virReportUnsupportedError(); -error: + error: virDispatchError(dconn); return -1; } @@ -6358,7 +6358,7 @@ virDomainMigratePerform(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -6397,7 +6397,7 @@ virDomainMigrateFinish(virConnectPtr dconn, virReportUnsupportedError(); -error: + error: virDispatchError(dconn); return NULL; } @@ -6441,7 +6441,7 @@ virDomainMigratePrepare2(virConnectPtr dconn, virReportUnsupportedError(); -error: + error: virDispatchError(dconn); return -1; } @@ -6482,7 +6482,7 @@ virDomainMigrateFinish2(virConnectPtr dconn, virReportUnsupportedError(); -error: + error: virDispatchError(dconn); return NULL; } @@ -6527,7 +6527,7 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -6573,7 +6573,7 @@ virDomainMigrateBegin3(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return NULL; } @@ -6622,7 +6622,7 @@ virDomainMigratePrepare3(virConnectPtr dconn, virReportUnsupportedError(); -error: + error: virDispatchError(dconn); return -1; } @@ -6675,7 +6675,7 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -6728,7 +6728,7 @@ virDomainMigratePerform3(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -6774,7 +6774,7 @@ virDomainMigrateFinish3(virConnectPtr dconn, virReportUnsupportedError(); -error: + error: virDispatchError(dconn); return NULL; } @@ -6816,7 +6816,7 @@ virDomainMigrateConfirm3(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -6861,7 +6861,7 @@ virDomainMigrateBegin3Params(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return NULL; } @@ -6906,7 +6906,7 @@ virDomainMigratePrepare3Params(virConnectPtr dconn, virReportUnsupportedError(); -error: + error: virDispatchError(dconn); return -1; } @@ -6957,7 +6957,7 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -7005,7 +7005,7 @@ virDomainMigratePerform3Params(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -7049,7 +7049,7 @@ virDomainMigrateFinish3Params(virConnectPtr dconn, virReportUnsupportedError(); -error: + error: virDispatchError(dconn); return NULL; } @@ -7094,7 +7094,7 @@ virDomainMigrateConfirm3Params(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -7129,7 +7129,7 @@ virNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -7165,7 +7165,7 @@ virConnectGetCapabilities(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -7256,7 +7256,7 @@ virNodeGetCPUStats(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -7343,7 +7343,7 @@ virNodeGetMemoryStats(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -7378,7 +7378,7 @@ virNodeGetFreeMemory(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return 0; } @@ -7430,7 +7430,7 @@ virNodeSuspendForDuration(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -7490,7 +7490,7 @@ virNodeGetMemoryParameters(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -7548,7 +7548,7 @@ virNodeSetMemoryParameters(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -7586,7 +7586,7 @@ virDomainGetSchedulerType(virDomainPtr domain, int *nparams) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return NULL; } @@ -7640,7 +7640,7 @@ virDomainGetSchedulerParameters(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -7721,7 +7721,7 @@ virDomainGetSchedulerParametersFlags(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -7773,7 +7773,7 @@ virDomainSetSchedulerParameters(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -7833,7 +7833,7 @@ virDomainSetSchedulerParametersFlags(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -7899,7 +7899,7 @@ virDomainBlockStats(virDomainPtr dom, const char *disk, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -7979,7 +7979,7 @@ virDomainBlockStatsFlags(virDomainPtr dom, } virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -8041,7 +8041,7 @@ virDomainInterfaceStats(virDomainPtr dom, const char *path, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -8102,7 +8102,7 @@ virDomainSetInterfaceParameters(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -8170,7 +8170,7 @@ virDomainGetInterfaceParameters(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -8239,7 +8239,7 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -8325,7 +8325,7 @@ virDomainBlockPeek(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -8386,7 +8386,7 @@ virDomainBlockResize(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -8492,7 +8492,7 @@ virDomainMemoryPeek(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -8598,7 +8598,7 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *disk, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -8648,7 +8648,7 @@ virDomainDefineXML(virConnectPtr conn, const char *xml) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -8693,7 +8693,7 @@ virDomainUndefine(virDomainPtr domain) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -8748,7 +8748,7 @@ virDomainUndefineFlags(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -8781,7 +8781,7 @@ virConnectNumOfDefinedDomains(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -8827,7 +8827,7 @@ virConnectListDefinedDomains(virConnectPtr conn, char **const names, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -8926,7 +8926,7 @@ virConnectListAllDomains(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -8967,7 +8967,7 @@ virDomainCreate(virDomainPtr domain) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9030,7 +9030,7 @@ virDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9106,7 +9106,7 @@ virDomainCreateWithFiles(virDomainPtr domain, unsigned int nfiles, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9148,7 +9148,7 @@ virDomainGetAutostart(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9189,7 +9189,7 @@ virDomainSetAutostart(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9227,7 +9227,7 @@ virDomainInjectNMI(virDomainPtr domain, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9285,7 +9285,7 @@ virDomainSendKey(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9355,7 +9355,7 @@ virDomainSendProcessSignal(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9403,7 +9403,7 @@ virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9485,7 +9485,7 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9554,7 +9554,7 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9614,7 +9614,7 @@ virDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9686,7 +9686,7 @@ virDomainPinVcpuFlags(virDomainPtr domain, unsigned int vcpu, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9761,7 +9761,7 @@ virDomainGetVcpuPinInfo(virDomainPtr domain, int ncpumaps, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9828,7 +9828,7 @@ virDomainPinEmulator(virDomainPtr domain, unsigned char *cpumap, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9892,7 +9892,7 @@ virDomainGetEmulatorPinInfo(virDomainPtr domain, unsigned char *cpumap, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -9965,7 +9965,7 @@ virDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -10005,7 +10005,7 @@ virDomainGetMaxVcpus(virDomainPtr domain) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -10046,7 +10046,7 @@ virDomainGetSecurityLabel(virDomainPtr domain, virSecurityLabelPtr seclabel) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -10090,7 +10090,7 @@ virDomainGetSecurityLabelList(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -10181,7 +10181,7 @@ virDomainSetMetadata(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -10258,7 +10258,7 @@ virDomainGetMetadata(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return NULL; } @@ -10295,7 +10295,7 @@ virNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -10340,7 +10340,7 @@ virDomainAttachDevice(virDomainPtr domain, const char *xml) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -10396,7 +10396,7 @@ virDomainAttachDeviceFlags(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -10437,7 +10437,7 @@ virDomainDetachDevice(virDomainPtr domain, const char *xml) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -10509,7 +10509,7 @@ virDomainDetachDeviceFlags(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -10565,7 +10565,7 @@ virDomainUpdateDeviceFlags(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -10612,7 +10612,7 @@ virNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -10705,7 +10705,7 @@ virConnectListAllNetworks(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -10738,7 +10738,7 @@ virConnectNumOfNetworks(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -10781,7 +10781,7 @@ virConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -10814,7 +10814,7 @@ virConnectNumOfDefinedNetworks(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -10858,7 +10858,7 @@ virConnectListDefinedNetworks(virConnectPtr conn, char **const names, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -10894,7 +10894,7 @@ virNetworkLookupByName(virConnectPtr conn, const char *name) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -10930,7 +10930,7 @@ virNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -10966,7 +10966,7 @@ virNetworkLookupByUUIDString(virConnectPtr conn, const char *uuidstr) return virNetworkLookupByUUID(conn, &uuid[0]); -error: + error: virDispatchError(conn); return NULL; } @@ -11003,7 +11003,7 @@ virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -11039,7 +11039,7 @@ virNetworkDefineXML(virConnectPtr conn, const char *xml) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -11076,7 +11076,7 @@ virNetworkUndefine(virNetworkPtr network) virReportUnsupportedError(); -error: + error: virDispatchError(network->conn); return -1; } @@ -11132,7 +11132,7 @@ virNetworkUpdate(virNetworkPtr network, virReportUnsupportedError(); -error: + error: virDispatchError(network->conn); return -1; } @@ -11170,7 +11170,7 @@ virNetworkCreate(virNetworkPtr network) virReportUnsupportedError(); -error: + error: virDispatchError(network->conn); return -1; } @@ -11210,7 +11210,7 @@ virNetworkDestroy(virNetworkPtr network) virReportUnsupportedError(); -error: + error: virDispatchError(network->conn); return -1; } @@ -11316,7 +11316,7 @@ virNetworkGetUUID(virNetworkPtr network, unsigned char *uuid) return 0; -error: + error: virDispatchError(network->conn); return -1; } @@ -11345,7 +11345,7 @@ virNetworkGetUUIDString(virNetworkPtr network, char *buf) virUUIDFormat(network->uuid, buf); return 0; -error: + error: virDispatchError(network->conn); return -1; } @@ -11388,7 +11388,7 @@ virNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(network->conn); return NULL; } @@ -11425,7 +11425,7 @@ virNetworkGetBridgeName(virNetworkPtr network) virReportUnsupportedError(); -error: + error: virDispatchError(network->conn); return NULL; } @@ -11466,7 +11466,7 @@ virNetworkGetAutostart(virNetworkPtr network, virReportUnsupportedError(); -error: + error: virDispatchError(network->conn); return -1; } @@ -11506,7 +11506,7 @@ virNetworkSetAutostart(virNetworkPtr network, virReportUnsupportedError(); -error: + error: virDispatchError(network->conn); return -1; } @@ -11591,7 +11591,7 @@ virConnectListAllInterfaces(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -11624,7 +11624,7 @@ virConnectNumOfInterfaces(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -11668,7 +11668,7 @@ virConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -11701,7 +11701,7 @@ virConnectNumOfDefinedInterfaces(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -11747,7 +11747,7 @@ virConnectListDefinedInterfaces(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -11783,7 +11783,7 @@ virInterfaceLookupByName(virConnectPtr conn, const char *name) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -11819,7 +11819,7 @@ virInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -11910,7 +11910,7 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(iface->conn); return NULL; } @@ -11957,7 +11957,7 @@ virInterfaceDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -12005,7 +12005,7 @@ virInterfaceUndefine(virInterfacePtr iface) virReportUnsupportedError(); -error: + error: virDispatchError(iface->conn); return -1; } @@ -12048,7 +12048,7 @@ virInterfaceCreate(virInterfacePtr iface, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(iface->conn); return -1; } @@ -12095,7 +12095,7 @@ virInterfaceDestroy(virInterfacePtr iface, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(iface->conn); return -1; } @@ -12192,7 +12192,7 @@ virInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -12232,7 +12232,7 @@ virInterfaceChangeCommit(virConnectPtr conn, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -12273,7 +12273,7 @@ virInterfaceChangeRollback(virConnectPtr conn, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -12381,7 +12381,7 @@ virConnectListAllStoragePools(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -12414,7 +12414,7 @@ virConnectNumOfStoragePools(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -12461,7 +12461,7 @@ virConnectListStoragePools(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -12494,7 +12494,7 @@ virConnectNumOfDefinedStoragePools(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -12541,7 +12541,7 @@ virConnectListDefinedStoragePools(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -12593,7 +12593,7 @@ virConnectFindStoragePoolSources(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -12629,7 +12629,7 @@ virStoragePoolLookupByName(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -12665,7 +12665,7 @@ virStoragePoolLookupByUUID(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -12701,7 +12701,7 @@ virStoragePoolLookupByUUIDString(virConnectPtr conn, return virStoragePoolLookupByUUID(conn, uuid); -error: + error: virDispatchError(conn); return NULL; } @@ -12734,7 +12734,7 @@ virStoragePoolLookupByVolume(virStorageVolPtr vol) virReportUnsupportedError(); -error: + error: virDispatchError(vol->conn); return NULL; } @@ -12775,7 +12775,7 @@ virStoragePoolCreateXML(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -12815,7 +12815,7 @@ virStoragePoolDefineXML(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -12857,7 +12857,7 @@ virStoragePoolBuild(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -12894,7 +12894,7 @@ virStoragePoolUndefine(virStoragePoolPtr pool) virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -12933,7 +12933,7 @@ virStoragePoolCreate(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -12974,7 +12974,7 @@ virStoragePoolDestroy(virStoragePoolPtr pool) virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -13015,7 +13015,7 @@ virStoragePoolDelete(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -13111,7 +13111,7 @@ virStoragePoolRefresh(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -13162,7 +13162,7 @@ virStoragePoolGetUUID(virStoragePoolPtr pool, return 0; -error: + error: virDispatchError(pool->conn); return -1; } @@ -13191,7 +13191,7 @@ virStoragePoolGetUUIDString(virStoragePoolPtr pool, virUUIDFormat(pool->uuid, buf); return 0; -error: + error: virDispatchError(pool->conn); return -1; } @@ -13234,7 +13234,7 @@ virStoragePoolGetInfo(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -13273,7 +13273,7 @@ virStoragePoolGetXMLDesc(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return NULL; } @@ -13313,7 +13313,7 @@ virStoragePoolGetAutostart(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -13352,7 +13352,7 @@ virStoragePoolSetAutostart(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -13398,7 +13398,7 @@ virStoragePoolListAllVolumes(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -13431,7 +13431,7 @@ virStoragePoolNumOfVolumes(virStoragePoolPtr pool) virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -13473,7 +13473,7 @@ virStoragePoolListVolumes(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -13537,7 +13537,7 @@ virStorageVolLookupByName(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return NULL; } @@ -13574,7 +13574,7 @@ virStorageVolLookupByKey(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -13611,7 +13611,7 @@ virStorageVolLookupByPath(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -13702,7 +13702,7 @@ virStorageVolCreateXML(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return NULL; } @@ -13755,7 +13755,7 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return NULL; } @@ -13819,7 +13819,7 @@ virStorageVolDownload(virStorageVolPtr vol, virReportUnsupportedError(); -error: + error: virDispatchError(vol->conn); return -1; } @@ -13885,7 +13885,7 @@ virStorageVolUpload(virStorageVolPtr vol, virReportUnsupportedError(); -error: + error: virDispatchError(vol->conn); return -1; } @@ -13924,7 +13924,7 @@ virStorageVolDelete(virStorageVolPtr vol, virReportUnsupportedError(); -error: + error: virDispatchError(vol->conn); return -1; } @@ -13964,7 +13964,7 @@ virStorageVolWipe(virStorageVolPtr vol, virReportUnsupportedError(); -error: + error: virDispatchError(vol->conn); return -1; } @@ -14007,7 +14007,7 @@ virStorageVolWipePattern(virStorageVolPtr vol, virReportUnsupportedError(); -error: + error: virDispatchError(vol->conn); return -1; } @@ -14104,7 +14104,7 @@ virStorageVolGetInfo(virStorageVolPtr vol, virReportUnsupportedError(); -error: + error: virDispatchError(vol->conn); return -1; } @@ -14142,7 +14142,7 @@ virStorageVolGetXMLDesc(virStorageVolPtr vol, virReportUnsupportedError(); -error: + error: virDispatchError(vol->conn); return NULL; } @@ -14182,7 +14182,7 @@ virStorageVolGetPath(virStorageVolPtr vol) virReportUnsupportedError(); -error: + error: virDispatchError(vol->conn); return NULL; } @@ -14257,7 +14257,7 @@ virStorageVolResize(virStorageVolPtr vol, virReportUnsupportedError(); -error: + error: virDispatchError(vol->conn); return -1; } @@ -14295,7 +14295,7 @@ virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -14365,7 +14365,7 @@ virConnectListAllNodeDevices(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -14413,7 +14413,7 @@ virNodeListDevices(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -14448,7 +14448,7 @@ virNodeDeviceLookupByName(virConnectPtr conn, const char *name) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -14491,7 +14491,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -14526,7 +14526,7 @@ virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(dev->conn); return NULL; } @@ -14612,7 +14612,7 @@ virNodeDeviceNumOfCaps(virNodeDevicePtr dev) virReportUnsupportedError(); -error: + error: virDispatchError(dev->conn); return -1; } @@ -14653,7 +14653,7 @@ virNodeDeviceListCaps(virNodeDevicePtr dev, virReportUnsupportedError(); -error: + error: virDispatchError(dev->conn); return -1; } @@ -14757,7 +14757,7 @@ virNodeDeviceDettach(virNodeDevicePtr dev) virReportUnsupportedError(); -error: + error: virDispatchError(dev->conn); return -1; } @@ -14814,7 +14814,7 @@ virNodeDeviceDetachFlags(virNodeDevicePtr dev, virReportUnsupportedError(); -error: + error: virDispatchError(dev->conn); return -1; } @@ -14855,7 +14855,7 @@ virNodeDeviceReAttach(virNodeDevicePtr dev) virReportUnsupportedError(); -error: + error: virDispatchError(dev->conn); return -1; } @@ -14898,7 +14898,7 @@ virNodeDeviceReset(virNodeDevicePtr dev) virReportUnsupportedError(); -error: + error: virDispatchError(dev->conn); return -1; } @@ -14938,7 +14938,7 @@ virNodeDeviceCreateXML(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -14976,7 +14976,7 @@ virNodeDeviceDestroy(virNodeDevicePtr dev) virReportUnsupportedError(); -error: + error: virDispatchError(dev->conn); return -1; } @@ -15034,7 +15034,7 @@ virConnectDomainEventRegister(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -15076,7 +15076,7 @@ virConnectDomainEventDeregister(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -15136,7 +15136,7 @@ virConnectNumOfSecrets(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -15200,7 +15200,7 @@ virConnectListAllSecrets(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -15238,7 +15238,7 @@ virConnectListSecrets(virConnectPtr conn, char **uuids, int maxuuids) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -15276,7 +15276,7 @@ virSecretLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -15313,7 +15313,7 @@ virSecretLookupByUUIDString(virConnectPtr conn, const char *uuidstr) return virSecretLookupByUUID(conn, &uuid[0]); -error: + error: virDispatchError(conn); return NULL; } @@ -15355,7 +15355,7 @@ virSecretLookupByUsage(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -15398,7 +15398,7 @@ virSecretDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -15428,7 +15428,7 @@ virSecretGetUUID(virSecretPtr secret, unsigned char *uuid) return 0; -error: + error: virDispatchError(secret->conn); return -1; } @@ -15457,7 +15457,7 @@ virSecretGetUUIDString(virSecretPtr secret, char *buf) virUUIDFormat(secret->uuid, buf); return 0; -error: + error: virDispatchError(secret->conn); return -1; } @@ -15551,7 +15551,7 @@ virSecretGetXMLDesc(virSecretPtr secret, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -15596,7 +15596,7 @@ virSecretSetValue(virSecretPtr secret, const unsigned char *value, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -15639,7 +15639,7 @@ virSecretGetValue(virSecretPtr secret, size_t *value_size, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -15679,7 +15679,7 @@ virSecretUndefine(virSecretPtr secret) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -15894,7 +15894,7 @@ virStreamSend(virStreamPtr stream, virReportUnsupportedError(); -error: + error: virDispatchError(stream->conn); return -1; } @@ -15987,7 +15987,7 @@ virStreamRecv(virStreamPtr stream, virReportUnsupportedError(); -error: + error: virDispatchError(stream->conn); return -1; } @@ -16076,7 +16076,7 @@ virStreamSendAll(virStreamPtr stream, } ret = 0; -cleanup: + cleanup: VIR_FREE(bytes); if (ret != 0) @@ -16170,7 +16170,7 @@ virStreamRecvAll(virStreamPtr stream, } ret = 0; -cleanup: + cleanup: VIR_FREE(bytes); if (ret != 0) @@ -16220,7 +16220,7 @@ virStreamEventAddCallback(virStreamPtr stream, virReportUnsupportedError(); -error: + error: virDispatchError(stream->conn); return -1; } @@ -16259,7 +16259,7 @@ virStreamEventUpdateCallback(virStreamPtr stream, virReportUnsupportedError(); -error: + error: virDispatchError(stream->conn); return -1; } @@ -16293,7 +16293,7 @@ virStreamEventRemoveCallback(virStreamPtr stream) virReportUnsupportedError(); -error: + error: virDispatchError(stream->conn); return -1; } @@ -16334,7 +16334,7 @@ virStreamFinish(virStreamPtr stream) virReportUnsupportedError(); -error: + error: virDispatchError(stream->conn); return -1; } @@ -16377,7 +16377,7 @@ virStreamAbort(virStreamPtr stream) virReportUnsupportedError(); -error: + error: virDispatchError(stream->conn); return -1; } @@ -16439,7 +16439,7 @@ virDomainIsActive(virDomainPtr dom) } virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -16472,7 +16472,7 @@ virDomainIsPersistent(virDomainPtr dom) } virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -16504,7 +16504,7 @@ virDomainIsUpdated(virDomainPtr dom) } virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -16536,7 +16536,7 @@ virNetworkIsActive(virNetworkPtr net) } virReportUnsupportedError(); -error: + error: virDispatchError(net->conn); return -1; } @@ -16569,7 +16569,7 @@ virNetworkIsPersistent(virNetworkPtr net) } virReportUnsupportedError(); -error: + error: virDispatchError(net->conn); return -1; } @@ -16601,7 +16601,7 @@ virStoragePoolIsActive(virStoragePoolPtr pool) } virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -16634,7 +16634,7 @@ virStoragePoolIsPersistent(virStoragePoolPtr pool) } virReportUnsupportedError(); -error: + error: virDispatchError(pool->conn); return -1; } @@ -16667,7 +16667,7 @@ virConnectNumOfNWFilters(virConnectPtr conn) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -16715,7 +16715,7 @@ virConnectListAllNWFilters(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -16752,7 +16752,7 @@ virConnectListNWFilters(virConnectPtr conn, char **const names, int maxnames) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -16788,7 +16788,7 @@ virNWFilterLookupByName(virConnectPtr conn, const char *name) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -16824,7 +16824,7 @@ virNWFilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -16860,7 +16860,7 @@ virNWFilterLookupByUUIDString(virConnectPtr conn, const char *uuidstr) return virNWFilterLookupByUUID(conn, &uuid[0]); -error: + error: virDispatchError(conn); return NULL; } @@ -16934,7 +16934,7 @@ virNWFilterGetUUID(virNWFilterPtr nwfilter, unsigned char *uuid) return 0; -error: + error: virDispatchError(nwfilter->conn); return -1; } @@ -16963,7 +16963,7 @@ virNWFilterGetUUIDString(virNWFilterPtr nwfilter, char *buf) virUUIDFormat(nwfilter->uuid, buf); return 0; -error: + error: virDispatchError(nwfilter->conn); return -1; } @@ -17000,7 +17000,7 @@ virNWFilterDefineXML(virConnectPtr conn, const char *xmlDesc) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -17039,7 +17039,7 @@ virNWFilterUndefine(virNWFilterPtr nwfilter) virReportUnsupportedError(); -error: + error: virDispatchError(nwfilter->conn); return -1; } @@ -17077,7 +17077,7 @@ virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(nwfilter->conn); return NULL; } @@ -17141,7 +17141,7 @@ virInterfaceIsActive(virInterfacePtr iface) } virReportUnsupportedError(); -error: + error: virDispatchError(iface->conn); return -1; } @@ -17172,7 +17172,7 @@ virConnectIsEncrypted(virConnectPtr conn) } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17207,7 +17207,7 @@ virConnectIsSecure(virConnectPtr conn) } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17246,7 +17246,7 @@ virConnectCompareCPU(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return VIR_CPU_COMPARE_ERROR; } @@ -17293,7 +17293,7 @@ virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***models, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17348,7 +17348,7 @@ virConnectBaselineCPU(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -17394,7 +17394,7 @@ virDomainGetJobInfo(virDomainPtr domain, virDomainJobInfoPtr info) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -17450,7 +17450,7 @@ virDomainGetJobStats(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -17489,7 +17489,7 @@ virDomainAbortJob(virDomainPtr domain) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17530,7 +17530,7 @@ virDomainMigrateSetMaxDowntime(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17571,7 +17571,7 @@ virDomainMigrateGetCompressionCache(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17615,7 +17615,7 @@ virDomainMigrateSetCompressionCache(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17656,7 +17656,7 @@ virDomainMigrateSetMaxSpeed(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17697,7 +17697,7 @@ virDomainMigrateGetMaxSpeed(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17779,7 +17779,7 @@ virConnectDomainEventRegisterAny(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17816,7 +17816,7 @@ virConnectDomainEventDeregisterAny(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17902,7 +17902,7 @@ virConnectNetworkEventRegisterAny(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -17940,7 +17940,7 @@ virConnectNetworkEventDeregisterAny(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18008,7 +18008,7 @@ virDomainManagedSave(virDomainPtr dom, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18049,7 +18049,7 @@ virDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18089,7 +18089,7 @@ virDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18317,7 +18317,7 @@ virDomainSnapshotCreateXML(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -18365,7 +18365,7 @@ virDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -18432,7 +18432,7 @@ virDomainSnapshotNum(virDomainPtr domain, unsigned int flags) } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18519,7 +18519,7 @@ virDomainSnapshotListNames(virDomainPtr domain, char **names, int nameslen, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18600,7 +18600,7 @@ virDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18667,7 +18667,7 @@ virDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, unsigned int flags) } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18759,7 +18759,7 @@ virDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18842,7 +18842,7 @@ virDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18885,7 +18885,7 @@ virDomainSnapshotLookupByName(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -18920,7 +18920,7 @@ virDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -18959,7 +18959,7 @@ virDomainSnapshotCurrent(virDomainPtr domain, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -18998,7 +18998,7 @@ virDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -19036,7 +19036,7 @@ virDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -19075,7 +19075,7 @@ virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -19156,7 +19156,7 @@ virDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -19218,7 +19218,7 @@ virDomainSnapshotDelete(virDomainSnapshotPtr snapshot, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -19345,7 +19345,7 @@ virDomainOpenConsole(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -19409,7 +19409,7 @@ virDomainOpenChannel(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -19481,7 +19481,7 @@ virDomainBlockJobAbort(virDomainPtr dom, const char *disk, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -19535,7 +19535,7 @@ virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -19587,7 +19587,7 @@ virDomainBlockJobSetSpeed(virDomainPtr dom, const char *disk, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -19653,7 +19653,7 @@ virDomainBlockPull(virDomainPtr dom, const char *disk, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -19777,7 +19777,7 @@ virDomainBlockRebase(virDomainPtr dom, const char *disk, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -19877,7 +19877,7 @@ virDomainBlockCommit(virDomainPtr dom, const char *disk, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -19954,7 +19954,7 @@ virDomainOpenGraphics(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -20008,7 +20008,7 @@ virConnectSetKeepAlive(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -20042,7 +20042,7 @@ virConnectIsAlive(virConnectPtr conn) } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -20106,7 +20106,7 @@ virConnectRegisterCloseCallback(virConnectPtr conn, return 0; -error: + error: virObjectUnlock(conn->closeCallback); virMutexUnlock(&conn->lock); virDispatchError(conn); @@ -20160,7 +20160,7 @@ virConnectUnregisterCloseCallback(virConnectPtr conn, return 0; -error: + error: virObjectUnlock(conn->closeCallback); virMutexUnlock(&conn->lock); virDispatchError(conn); @@ -20224,7 +20224,7 @@ virDomainSetBlockIoTune(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -20311,7 +20311,7 @@ virDomainGetBlockIoTune(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -20454,7 +20454,7 @@ virDomainGetCPUStats(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return -1; } @@ -20516,7 +20516,7 @@ virDomainGetDiskErrors(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } @@ -20557,7 +20557,7 @@ virDomainGetHostname(virDomainPtr domain, unsigned int flags) virReportUnsupportedError(); -error: + error: virDispatchError(domain->conn); return NULL; } @@ -20605,7 +20605,7 @@ virNodeGetCPUMap(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -20654,7 +20654,7 @@ virDomainFSTrim(virDomainPtr dom, virReportUnsupportedError(); -error: + error: virDispatchError(dom->conn); return -1; } -- 1.8.3.2

--- src/lxc/lxc_cgroup.c | 16 +++--- src/lxc/lxc_conf.c | 6 +-- src/lxc/lxc_container.c | 42 +++++++-------- src/lxc/lxc_controller.c | 54 +++++++++---------- src/lxc/lxc_driver.c | 136 +++++++++++++++++++++++------------------------ src/lxc/lxc_fuse.c | 10 ++-- src/lxc/lxc_monitor.c | 4 +- src/lxc/lxc_native.c | 20 +++---- src/lxc/lxc_process.c | 28 +++++----- 9 files changed, 158 insertions(+), 158 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index da5ccf5..bab3052 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -51,7 +51,7 @@ static int virLXCCgroupSetupCpuTune(virDomainDefPtr def, goto cleanup; ret = 0; -cleanup: + cleanup: return ret; } @@ -97,7 +97,7 @@ static int virLXCCgroupSetupCpusetTune(virDomainDefPtr def, } ret = 0; -cleanup: + cleanup: VIR_FREE(mask); return ret; } @@ -168,7 +168,7 @@ static int virLXCCgroupSetupMemTune(virDomainDefPtr def, goto cleanup; ret = 0; -cleanup: + cleanup: return ret; } @@ -263,7 +263,7 @@ static int virLXCCgroupGetMemStat(virCgroupPtr cgroup, } ret = 0; -cleanup: + cleanup: VIR_FREE(line); VIR_FREE(statFile); VIR_FORCE_FCLOSE(statfd); @@ -292,7 +292,7 @@ int virLXCCgroupGetMeminfo(virLXCMeminfoPtr meminfo) virLXCCgroupGetMemSwapUsage(cgroup, meminfo); ret = 0; -cleanup: + cleanup: virCgroupFree(&cgroup); return ret; } @@ -452,7 +452,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def, VIR_DEBUG("Device whitelist complete"); ret = 0; -cleanup: + cleanup: return ret; } @@ -498,7 +498,7 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def) } } -cleanup: + cleanup: return cgroup; } @@ -526,6 +526,6 @@ int virLXCCgroupSetup(virDomainDefPtr def, ret = 0; -cleanup: + cleanup: return ret; } diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index d4432cf..fd0b6ef 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -157,7 +157,7 @@ virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver) return caps; -error: + error: virObjectUnref(caps); return NULL; } @@ -230,7 +230,7 @@ virLXCDriverConfigNew(void) goto error; return cfg; -error: + error: virObjectUnref(cfg); return NULL; } @@ -283,7 +283,7 @@ virLXCLoadDriverConfig(virLXCDriverConfigPtr cfg, virConfFree(conf); -done: + done: return 0; } diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b6c788a..fd8ab16 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -373,7 +373,7 @@ static int lxcContainerSetupFDs(int *ttyfd, rc = 0; -cleanup: + cleanup: VIR_DEBUG("rc=%d", rc); return rc; } @@ -400,7 +400,7 @@ int lxcContainerSendContinue(int control) } rc = 0; -error_out: + error_out: return rc; } @@ -506,7 +506,7 @@ static int lxcContainerRenameAndEnableInterfaces(bool privNet, if (veths || privNet) rc = virNetDevSetOnline("lo", true); -error_out: + error_out: VIR_FREE(newname); return rc; } @@ -580,7 +580,7 @@ static int lxcContainerUnmountSubtree(const char *prefix, ret = 0; -cleanup: + cleanup: virStringFreeList(mounts); return ret; @@ -718,7 +718,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) ret = 0; -err: + err: VIR_FREE(oldroot); VIR_FREE(newroot); @@ -805,7 +805,7 @@ static int lxcContainerSetReadOnly(void) } ret = 0; -cleanup: + cleanup: for (i = 0; i < nmounts; i++) VIR_FREE(mounts[i]); VIR_FREE(mounts); @@ -892,7 +892,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled) rc = 0; -cleanup: + cleanup: VIR_DEBUG("rc=%d", rc); return rc; } @@ -961,7 +961,7 @@ static int lxcContainerMountFSDev(virDomainDefPtr def, ret = 0; -cleanup: + cleanup: VIR_FREE(path); return ret; } @@ -996,7 +996,7 @@ static int lxcContainerMountFSDevPTS(virDomainDefPtr def, } ret = 0; -cleanup: + cleanup: VIR_FREE(path); return ret; } @@ -1126,7 +1126,7 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, ret = 0; -cleanup: + cleanup: VIR_FREE(src); return ret; } @@ -1193,9 +1193,9 @@ lxcContainerMountDetectFilesystem(const char *src, char **type) if (VIR_STRDUP(*type, data) < 0) goto cleanup; -done: + done: ret = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); if (blkid) blkid_free_probe(blkid); @@ -1237,7 +1237,7 @@ static int lxcContainerMountFSBlockAuto(virDomainFSDefPtr fs, VIR_DEBUG("src=%s dst=%s srcprefix=%s", src, fs->dst, srcprefix); /* First time around we use /etc/filesystems */ -retry: + retry: if (virAsprintf(&fslist, "%s%s", srcprefix, tryProc ? "/proc/filesystems" : "/etc/filesystems") < 0) goto cleanup; @@ -1338,7 +1338,7 @@ retry: VIR_DEBUG("Done mounting filesystem ret=%d tryProc=%d", ret, tryProc); -cleanup: + cleanup: VIR_FREE(line); VIR_FREE(fslist); VIR_FORCE_FCLOSE(fp); @@ -1386,7 +1386,7 @@ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, ret = lxcContainerMountFSBlockAuto(fs, fsflags, src, srcprefix, sec_mount_options); } -cleanup: + cleanup: VIR_FREE(format); return ret; } @@ -1408,7 +1408,7 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, VIR_DEBUG("Done mounting filesystem ret=%d", ret); -cleanup: + cleanup: VIR_FREE(src); return ret; } @@ -1452,7 +1452,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, ret = 0; -cleanup: + cleanup: VIR_FREE(data); return ret; } @@ -1540,7 +1540,7 @@ int lxcContainerSetupHostdevCapsMakePath(const char *dev) ret = 0; -cleanup: + cleanup: VIR_FREE(dir); return ret; } @@ -1594,7 +1594,7 @@ static int lxcContainerUnmountForSharedRoot(const char *stateDir, ret = 0; -cleanup: + cleanup: VIR_FREE(tmp); return ret; } @@ -1682,7 +1682,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, ret = 0; -cleanup: + cleanup: VIR_FREE(stateDir); virCgroupFree(&cgroup); VIR_FREE(sec_mount_options); @@ -1894,7 +1894,7 @@ static int lxcContainerChild(void *data) goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(ttyPath); VIR_FORCE_CLOSE(ttyfd); VIR_FORCE_CLOSE(argv->monitor); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 3425110..800a306 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -186,13 +186,13 @@ static virLXCControllerPtr virLXCControllerNew(const char *name) NULL)) < 0) goto error; -cleanup: + cleanup: VIR_FREE(configFile); virObjectUnref(caps); virObjectUnref(xmlopt); return ctrl; -error: + error: virLXCControllerFree(ctrl); ctrl = NULL; goto cleanup; @@ -584,7 +584,7 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) VIR_DEBUG("Setup all loop devices"); ret = 0; -cleanup: + cleanup: return ret; } @@ -665,7 +665,7 @@ static int virLXCControllerGetNumadAdvice(virLXCControllerPtr ctrl, ret = 0; *mask = nodemask; -cleanup: + cleanup: VIR_FREE(nodeset); return ret; } @@ -696,7 +696,7 @@ static int virLXCControllerSetupResourceLimits(virLXCControllerPtr ctrl) goto cleanup; ret = 0; -cleanup: + cleanup: virBitmapFree(nodemask); return ret; } @@ -789,7 +789,7 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) VIR_FREE(sockpath); return 0; -error: + error: VIR_FREE(sockpath); virObjectUnref(ctrl->server); ctrl->server = NULL; @@ -945,7 +945,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol } console->contEpoll = 0; } -cleanup: + cleanup: return; } @@ -993,7 +993,7 @@ static void virLXCControllerConsoleEPoll(int watch, int fd, int events, void *op } } -cleanup: + cleanup: virMutexUnlock(&lock); } @@ -1078,7 +1078,7 @@ static void virLXCControllerConsoleIO(int watch, int fd, int events, void *opaqu virMutexUnlock(&lock); return; -error: + error: virEventRemoveHandle(console->contWatch); virEventRemoveHandle(console->hostWatch); console->contWatch = console->hostWatch = -1; @@ -1157,9 +1157,9 @@ static int virLXCControllerMain(virLXCControllerPtr ctrl) if (!err || err->code == VIR_ERR_OK) rc = wantReboot ? 1 : 0; -cleanup: + cleanup: virMutexDestroy(&lock); -cleanup2: + cleanup2: for (i = 0; i < ctrl->nconsoles; i++) virLXCControllerConsoleClose(&(ctrl->consoles[i])); @@ -1192,11 +1192,11 @@ virLXCControllerSetupUsernsMap(virDomainIdMapEntryPtr map, } ret = 0; -cleanup: + cleanup: virBufferFreeAndReset(&map_value); return ret; -no_memory: + no_memory: virReportOOMError(); goto cleanup; } @@ -1235,7 +1235,7 @@ static int virLXCControllerSetupUserns(virLXCControllerPtr ctrl) goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(uid_map); VIR_FREE(gid_map); return ret; @@ -1285,7 +1285,7 @@ static int virLXCControllerSetupDev(virLXCControllerPtr ctrl) goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(opts); VIR_FREE(mount_options); VIR_FREE(dev); @@ -1336,7 +1336,7 @@ static int virLXCControllerPopulateDevices(virLXCControllerPtr ctrl) } ret = 0; -cleanup: + cleanup: VIR_FREE(path); return ret; } @@ -1411,7 +1411,7 @@ virLXCControllerSetupHostdevSubsysUSB(virDomainDefPtr vmDef, ret = 0; -cleanup: + cleanup: VIR_FREE(src); VIR_FREE(dstfile); VIR_FREE(dstdir); @@ -1491,7 +1491,7 @@ virLXCControllerSetupHostdevCapsStorage(virDomainDefPtr vmDef, ret = 0; -cleanup: + cleanup: def->source.caps.u.storage.block = dev; VIR_FREE(dst); VIR_FREE(path); @@ -1570,7 +1570,7 @@ virLXCControllerSetupHostdevCapsMisc(virDomainDefPtr vmDef, ret = 0; -cleanup: + cleanup: def->source.caps.u.misc.chardev = dev; VIR_FREE(dst); VIR_FREE(path); @@ -1732,7 +1732,7 @@ static int virLXCControllerSetupDisk(virLXCControllerPtr ctrl, ret = 0; -cleanup: + cleanup: def->src.path = tmpsrc; VIR_FREE(dst); return ret; @@ -1878,7 +1878,7 @@ lxcCreateTty(virLXCControllerPtr ctrl, int *ttymaster, ret = 0; -cleanup: + cleanup: if (ret != 0) { VIR_FORCE_CLOSE(*ttymaster); VIR_FREE(*ttyName); @@ -1927,7 +1927,7 @@ virLXCControllerSetupPrivateNS(void) } ret = 0; -cleanup: + cleanup: return ret; } @@ -1985,7 +1985,7 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) ret = 0; -cleanup: + cleanup: VIR_FREE(opts); VIR_FREE(devpts); VIR_FREE(mount_options); @@ -2031,7 +2031,7 @@ virLXCControllerSetupConsoles(virLXCControllerPtr ctrl, } ret = 0; -cleanup: + cleanup: VIR_FREE(ttyHostPath); return ret; } @@ -2073,7 +2073,7 @@ virLXCControllerEventSend(virLXCControllerPtr ctrl, xdr_free(proc, data); return; -error: + error: virNetMessageFree(msg); xdr_free(proc, data); } @@ -2246,7 +2246,7 @@ virLXCControllerRun(virLXCControllerPtr ctrl) virLXCControllerEventSendExit(ctrl, rc); -cleanup: + cleanup: VIR_FORCE_CLOSE(control[0]); VIR_FORCE_CLOSE(control[1]); VIR_FORCE_CLOSE(containerhandshake[0]); @@ -2474,7 +2474,7 @@ int main(int argc, char *argv[]) rc = virLXCControllerRun(ctrl); -cleanup: + cleanup: if (rc < 0) { virErrorPtr err = virGetLastError(); if (err && err->message) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 53591c2..e1afb5c 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -262,7 +262,7 @@ static virDomainPtr lxcDomainLookupByID(virConnectPtr conn, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -292,7 +292,7 @@ static virDomainPtr lxcDomainLookupByUUID(virConnectPtr conn, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -319,7 +319,7 @@ static virDomainPtr lxcDomainLookupByName(virConnectPtr conn, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -339,7 +339,7 @@ static int lxcDomainIsActive(virDomainPtr dom) ret = virDomainObjIsActive(obj); -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -359,7 +359,7 @@ static int lxcDomainIsPersistent(virDomainPtr dom) ret = obj->persistent; -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -378,7 +378,7 @@ static int lxcDomainIsUpdated(virDomainPtr dom) ret = obj->updated; -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -499,7 +499,7 @@ static virDomainPtr lxcDomainDefineXML(virConnectPtr conn, const char *xml) if (dom) dom->id = vm->def->id; -cleanup: + cleanup: virDomainDefFree(def); virDomainDefFree(oldDef); if (vm) @@ -552,7 +552,7 @@ static int lxcDomainUndefineFlags(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) @@ -608,7 +608,7 @@ static int lxcDomainGetInfo(virDomainPtr dom, info->nrVirtCpu = vm->def->vcpus; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -634,7 +634,7 @@ lxcDomainGetState(virDomainPtr dom, *state = virDomainObjGetState(vm, reason); ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -654,7 +654,7 @@ static char *lxcDomainGetOSType(virDomainPtr dom) if (VIR_STRDUP(ret, vm->def->os.type) < 0) goto cleanup; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -675,7 +675,7 @@ lxcDomainGetMaxMemory(virDomainPtr dom) ret = vm->def->mem.max_balloon; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -701,7 +701,7 @@ static int lxcDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) vm->def->mem.max_balloon = newmax; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -741,7 +741,7 @@ static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -871,7 +871,7 @@ lxcDomainSetMemoryParameters(virDomainPtr dom, goto cleanup; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -968,7 +968,7 @@ lxcDomainGetMemoryParameters(virDomainPtr dom, *nparams = LXC_NB_MEM_PARAM; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -993,7 +993,7 @@ static char *lxcDomainGetXMLDesc(virDomainPtr dom, vm->newDef ? vm->newDef : vm->def, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1023,7 +1023,7 @@ static char *lxcConnectDomainXMLFromNative(virConnectPtr conn, xml = virDomainDefFormat(def, 0); -cleanup: + cleanup: virDomainDefFree(def); return xml; } @@ -1084,7 +1084,7 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, virDomainAuditStart(vm, "booted", false); } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) @@ -1197,7 +1197,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: virDomainDefFree(def); if (vm) virObjectUnlock(vm); @@ -1273,7 +1273,7 @@ static int lxcDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr secla ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1317,7 +1317,7 @@ static int lxcNodeGetSecurityModel(virConnectPtr conn, goto cleanup; } -cleanup: + cleanup: virObjectUnref(caps); return ret; } @@ -1448,7 +1448,7 @@ lxcDomainDestroyFlags(virDomainPtr dom, vm = NULL; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) @@ -1500,7 +1500,7 @@ lxcSecurityInit(virLXCDriverConfigPtr cfg) return mgr; -error: + error: VIR_ERROR(_("Failed to initialize security drivers")); virObjectUnref(mgr); return NULL; @@ -1607,7 +1607,7 @@ static int lxcStateInitialize(bool privileged, virNWFilterRegisterCallbackDriver(&lxcCallbackDriver); return 0; -cleanup: + cleanup: virObjectUnref(caps); lxcStateCleanup(); return -1; @@ -1776,7 +1776,7 @@ static char *lxcDomainGetSchedulerType(virDomainPtr dom, ignore_value(VIR_STRDUP(ret, "posix")); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1821,7 +1821,7 @@ static int lxcSetVcpuBWLive(virCgroupPtr cgroup, unsigned long long period, return 0; -error: + error: if (period) { virErrorPtr saved = virSaveLastError(); virCgroupSetCpuCfsPeriod(cgroup, old_period); @@ -1951,7 +1951,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, ret = 0; -cleanup: + cleanup: virDomainDefFree(vmdef); if (vm) virObjectUnlock(vm); @@ -2032,7 +2032,7 @@ lxcDomainGetSchedulerParametersFlags(virDomainPtr dom, if (rc != 0) goto cleanup; } -out: + out: if (virTypedParameterAssign(&params[0], VIR_DOMAIN_SCHEDULER_CPU_SHARES, VIR_TYPED_PARAM_ULLONG, shares) < 0) goto cleanup; @@ -2060,7 +2060,7 @@ out: ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -2162,11 +2162,11 @@ lxcDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type, return 0; -error: + error: virReportError(VIR_ERR_INVALID_ARG, _("unable to parse blkio device '%s' '%s'"), type, blkioDeviceStr); -cleanup: + cleanup: virBlkioDeviceArrayClear(result, ndevices); VIR_FREE(result); return -1; @@ -2300,7 +2300,7 @@ lxcDomainBlockStats(virDomainPtr dom, &stats->wr_bytes, &stats->rd_req, &stats->wr_req); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2426,7 +2426,7 @@ lxcDomainBlockStatsFlags(virDomainPtr dom, ret = 0; *nparams = tmp; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2633,7 +2633,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, ret = -1; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -3049,7 +3049,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom, *nparams = LXC_NB_BLKIO_PARAM; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -3094,7 +3094,7 @@ lxcDomainInterfaceStats(virDomainPtr dom, virReportError(VIR_ERR_INVALID_ARG, _("Invalid path, '%s' is not a known interface"), path); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -3125,7 +3125,7 @@ static int lxcDomainGetAutostart(virDomainPtr dom, *autostart = vm->autostart; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -3194,7 +3194,7 @@ static int lxcDomainSetAutostart(virDomainPtr dom, vm->autostart = autostart; ret = 0; -cleanup: + cleanup: VIR_FREE(configFile); VIR_FREE(autostartLink); if (vm) @@ -3275,7 +3275,7 @@ static int lxcFreezeContainer(virDomainObjPtr vm) VIR_FREE(state); } VIR_DEBUG("lxcFreezeContainer timeout"); -error: + error: /* * If timeout or an error on reading the state occurs, * activate the group again and return an error. @@ -3284,7 +3284,7 @@ error: virCgroupSetFreezerState(priv->cgroup, "THAWED"); ret = -1; -cleanup: + cleanup: VIR_FREE(state); return ret; } @@ -3326,7 +3326,7 @@ static int lxcDomainSuspend(virDomainPtr dom) goto cleanup; ret = 0; -cleanup: + cleanup: if (event) virObjectEventStateQueue(driver->domainEventState, event); if (vm) @@ -3376,7 +3376,7 @@ static int lxcDomainResume(virDomainPtr dom) goto cleanup; ret = 0; -cleanup: + cleanup: if (event) virObjectEventStateQueue(driver->domainEventState, event); if (vm) @@ -3443,7 +3443,7 @@ lxcDomainOpenConsole(virDomainPtr dom, goto cleanup; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -3516,7 +3516,7 @@ lxcDomainSendProcessSignal(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -3615,7 +3615,7 @@ lxcDomainShutdownFlags(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -3692,7 +3692,7 @@ lxcDomainReboot(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -3750,7 +3750,7 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef, break; } -cleanup: + cleanup: return ret; } @@ -3793,7 +3793,7 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef, break; } -cleanup: + cleanup: return ret; } @@ -3858,7 +3858,7 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, break; } -cleanup: + cleanup: return ret; } @@ -4113,7 +4113,7 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, ret = 0; -cleanup: + cleanup: if (src) virDomainAuditDisk(vm, NULL, src, "attach", ret == 0); VIR_FREE(file); @@ -4230,7 +4230,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, ret = 0; -cleanup: + cleanup: if (!ret) { vm->def->nets[vm->def->nnets++] = net; } else if (veth) { @@ -4316,7 +4316,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver, ret = 0; -cleanup: + cleanup: virDomainAuditHostdev(vm, def, "attach", ret == 0); virUSBDeviceFree(usb); VIR_FREE(src); @@ -4390,7 +4390,7 @@ lxcDomainAttachDeviceHostdevStorageLive(virLXCDriverPtr driver, ret = 0; -cleanup: + cleanup: virDomainAuditHostdev(vm, def, "attach", ret == 0); return ret; } @@ -4462,7 +4462,7 @@ lxcDomainAttachDeviceHostdevMiscLive(virLXCDriverPtr driver, ret = 0; -cleanup: + cleanup: virDomainAuditHostdev(vm, def, "attach", ret == 0); return ret; } @@ -4632,7 +4632,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm, ret = 0; -cleanup: + cleanup: VIR_FREE(dst); return ret; } @@ -4694,7 +4694,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, virDomainNetGetActualBridgeName(detach), detach->ifname)); ret = 0; -cleanup: + cleanup: if (!ret) { networkReleaseActualDevice(vm->def, detach); virDomainNetRemove(vm->def, detachidx); @@ -4760,7 +4760,7 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr driver, ret = 0; -cleanup: + cleanup: virUSBDeviceFree(usb); VIR_FREE(dst); return ret; @@ -4811,7 +4811,7 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm, ret = 0; -cleanup: + cleanup: return ret; } @@ -4860,7 +4860,7 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm, ret = 0; -cleanup: + cleanup: return ret; } @@ -5070,7 +5070,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom, } } -cleanup: + cleanup: virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); @@ -5192,7 +5192,7 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom, } } -cleanup: + cleanup: virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); @@ -5312,7 +5312,7 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom, } } -cleanup: + cleanup: virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); @@ -5369,7 +5369,7 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom, goto cleanup; ret = nfds; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -5465,7 +5465,7 @@ lxcDomainMemoryStats(virDomainPtr dom, ret++; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -5606,7 +5606,7 @@ lxcDomainSetMetadata(virDomainPtr dom, ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps, driver->xmlopt, cfg->configDir, flags); -cleanup: + cleanup: virObjectUnlock(vm); virObjectUnref(caps); virObjectUnref(cfg); @@ -5636,7 +5636,7 @@ lxcDomainGetMetadata(virDomainPtr dom, ret = virDomainObjGetMetadata(vm, type, uri, caps, driver->xmlopt, flags); -cleanup: + cleanup: virObjectUnlock(vm); virObjectUnref(caps); return ret; @@ -5683,7 +5683,7 @@ lxcDomainGetCPUStats(virDomainPtr dom, else ret = virCgroupGetPercpuStats(priv->cgroup, params, nparams, start_cpu, ncpus); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 81706c8..ee1561c 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -78,7 +78,7 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) } else res = -ENOENT; -cleanup: + cleanup: VIR_FREE(mempath); return res; } @@ -219,7 +219,7 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, res = copied; memcpy(buf, virBufferCurrentContent(new_meminfo), copied); -cleanup: + cleanup: VIR_FREE(line); virBufferFreeAndReset(new_meminfo); VIR_FORCE_FCLOSE(fd); @@ -322,14 +322,14 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) } ret = 0; -cleanup: + cleanup: fuse_opt_free_args(&args); *f = fuse; return ret; -cleanup1: + cleanup1: VIR_FREE(fuse->mountpoint); virMutexDestroy(&fuse->lock); -cleanup2: + cleanup2: VIR_FREE(fuse); goto cleanup; } diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index e9447ce..57f4098 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -183,11 +183,11 @@ virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, virNetClientSetCloseCallback(mon->client, virLXCMonitorEOFNotify, mon, virLXCMonitorCloseFreeCallback); -cleanup: + cleanup: VIR_FREE(sockpath); return mon; -error: + error: virObjectUnref(mon); mon = NULL; goto cleanup; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index fa0e62e..fad51db 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -130,7 +130,7 @@ static char ** lxcStringSplit(const char *string) virStringFreeList(parts); return result; -error: + error: VIR_FREE(tmp); virStringFreeList(parts); virStringFreeList(result); @@ -162,7 +162,7 @@ lxcParseFstabLine(char *fstabLine) return fstab; -error: + error: lxcFstabFree(fstab); virStringFreeList(parts); return NULL; @@ -187,7 +187,7 @@ lxcAddFSDef(virDomainDefPtr def, return 0; -error: + error: virDomainFSDefFree(fsDef); return -1; } @@ -236,7 +236,7 @@ lxcConvertSize(const char *size, unsigned long long *value) return 0; -error: + error: virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to convert size: '%s'"), size); @@ -384,7 +384,7 @@ lxcCreateNetDef(const char *type, return net; -error: + error: virDomainNetDefFree(net); return NULL; } @@ -462,7 +462,7 @@ lxcAddNetworkDefinition(virDomainDefPtr def, return 1; -error: + error: virDomainNetDefFree(net); virDomainHostdevDefFree(hostdev); return -1; @@ -594,7 +594,7 @@ lxcCreateConsoles(virDomainDefPtr def, virConfPtr properties) return 0; -error: + error: virDomainChrDefFree(console); return -1; } @@ -696,7 +696,7 @@ lxcSetCpuTune(virDomainDefPtr def, virConfPtr properties) return 0; -error: + error: virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse integer: '%s'"), value->str); return -1; @@ -934,11 +934,11 @@ lxcParseConfigString(const char *config) goto cleanup; -error: + error: virDomainDefFree(vmdef); vmdef = NULL; -cleanup: + cleanup: virConfFree(properties); return vmdef; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 2f4121c..75158e6 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -129,7 +129,7 @@ virLXCProcessReboot(virLXCDriverPtr driver, ret = 0; -cleanup: + cleanup: virObjectUnref(conn); return ret; } @@ -287,7 +287,7 @@ char *virLXCProcessSetupInterfaceBridged(virConnectPtr conn, ret = containerVeth; -cleanup: + cleanup: return ret; } @@ -343,7 +343,7 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, ret = res_ifname; -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -469,7 +469,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, ret = 0; -cleanup: + cleanup: if (ret < 0) { for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr iface = def->nets[i]; @@ -588,7 +588,7 @@ virLXCProcessGetNsInode(pid_t pid, *inode = sb.st_ino; ret = 0; -cleanup: + cleanup: VIR_FREE(path); return ret; } @@ -660,7 +660,7 @@ static virLXCMonitorPtr virLXCProcessConnectMonitor(virLXCDriverPtr driver, goto cleanup; } -cleanup: + cleanup: virObjectUnref(cfg); return monitor; } @@ -742,7 +742,7 @@ int virLXCProcessStop(virLXCDriverPtr driver, } } -cleanup: + cleanup: virLXCProcessCleanup(driver, vm, reason); return 0; @@ -829,7 +829,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, virCommandPassFD(cmd, handshakefd, 0); return cmd; -cleanup: + cleanup: virCommandFree(cmd); virObjectUnref(cfg); return NULL; @@ -916,7 +916,7 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm, _("Timed out while reading log output: %s"), buf); -cleanup: + cleanup: return ret; } @@ -981,7 +981,7 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm) return 0; -error: + error: virDomainFSDefFree(root); return -1; } @@ -1348,7 +1348,7 @@ int virLXCProcessStart(virConnectPtr conn, rc = 0; -cleanup: + cleanup: if (rc != 0 && !err) err = virSaveLastError(); virCommandFree(cmd); @@ -1399,7 +1399,7 @@ cleanup: return rc; -error: + error: err = virSaveLastError(); virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); goto cleanup; @@ -1527,11 +1527,11 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm, } ret = 0; -cleanup: + cleanup: virObjectUnlock(vm); return ret; -error: + error: virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); virDomainAuditStop(vm, "failed"); goto cleanup; -- 1.8.3.2

--- src/nwfilter/nwfilter_dhcpsnoop.c | 42 +++++++++++++++---------------- src/nwfilter/nwfilter_driver.c | 22 ++++++++-------- src/nwfilter/nwfilter_ebiptables_driver.c | 36 +++++++++++++------------- src/nwfilter/nwfilter_gentech_driver.c | 12 ++++----- src/nwfilter/nwfilter_learnipaddr.c | 8 +++--- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 3407604..df46a72 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -498,7 +498,7 @@ virNWFilterSnoopIPLeaseInstallRule(virNWFilterSnoopIPLeasePtr ipl, req->filtername, req->vars); -exit_snooprequnlock: + exit_snooprequnlock: virNWFilterSnoopReqUnlock(req); VIR_FREE(ipaddr); @@ -605,10 +605,10 @@ virNWFilterSnoopReqNew(const char *ifkey) return req; -err_destroy_mutex: + err_destroy_mutex: virMutexDestroy(&req->lock); -err_free_req: + err_free_req: VIR_FREE(req); return NULL; @@ -786,7 +786,7 @@ virNWFilterSnoopReqLeaseAdd(virNWFilterSnoopReqPtr req, virAtomicIntInc(&virNWFilterSnoopState.nLeases); -exit: + exit: if (update_leasefile) virNWFilterSnoopLeaseFileSave(pl); @@ -897,12 +897,12 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req, } -skip_instantiate: + skip_instantiate: VIR_FREE(ipl); virAtomicIntDecAndTest(&virNWFilterSnoopState.nLeases); -lease_not_found: + lease_not_found: VIR_FREE(ipstr); virNWFilterSnoopReqUnlock(req); @@ -960,7 +960,7 @@ virNWFilterSnoopDHCPGetOpt(virNWFilterSnoopDHCPHdrPtr pd, int len, oind += pd->d_opts[oind + 1] + 2; } return 0; -malformed: + malformed: VIR_WARN("got lost in the options!"); return -1; } @@ -1149,11 +1149,11 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAddr *mac, return handle; -cleanup_freecode: + cleanup_freecode: pcap_freecode(&fp); -cleanup: + cleanup: pcap_close(handle); -cleanup_nohandle: + cleanup_nohandle: VIR_FREE(ext_filter); return NULL; @@ -1562,7 +1562,7 @@ virNWFilterDHCPSnoopThread(void *req0) virNWFilterSnoopReqUnlock(req); virNWFilterSnoopUnlock(); -exit: + exit: virThreadPoolFree(worker); virNWFilterSnoopReqPut(req); @@ -1731,15 +1731,15 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver, return 0; -exit_snoop_cancel: + exit_snoop_cancel: virNWFilterSnoopCancel(&req->threadkey); -exit_snoopreq_unlock: + exit_snoopreq_unlock: virNWFilterSnoopReqUnlock(req); -exit_rem_ifnametokey: + exit_rem_ifnametokey: virHashRemoveEntry(virNWFilterSnoopState.ifnameToKey, ifname); -exit_snoopunlock: + exit_snoopunlock: virNWFilterSnoopUnlock(); -exit_snoopreqput: + exit_snoopreqput: if (!threadPuts) virNWFilterSnoopReqPut(req); @@ -1799,7 +1799,7 @@ virNWFilterSnoopLeaseFileWrite(int lfd, const char *ifkey, ignore_value(fsync(lfd)); -cleanup: + cleanup: VIR_FREE(lbuf); VIR_FREE(dhcpstr); VIR_FREE(ipstr); @@ -1831,7 +1831,7 @@ virNWFilterSnoopLeaseFileSave(virNWFilterSnoopIPLeasePtr ipl) virAtomicIntGet(&virNWFilterSnoopState.nLeases) * 20) virNWFilterSnoopLeaseFileLoad(); /* load & refresh lease file */ -err_exit: + err_exit: virNWFilterSnoopUnlock(); } @@ -1935,7 +1935,7 @@ virNWFilterSnoopLeaseFileRefresh(void) } virAtomicIntSet(&virNWFilterSnoopState.wLeases, 0); -skip_rename: + skip_rename: virNWFilterSnoopLeaseFileOpen(); } @@ -2107,7 +2107,7 @@ virNWFilterDHCPSnoopInit(void) return 0; -err_exit: + err_exit: virHashFree(virNWFilterSnoopState.ifnameToKey); virNWFilterSnoopState.ifnameToKey = NULL; @@ -2182,7 +2182,7 @@ virNWFilterDHCPSnoopEnd(const char *ifname) virNWFilterSnoopLeaseFileLoad(); } -cleanup: + cleanup: virNWFilterSnoopUnlock(); } diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 4fab1f2..b41253d 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -245,23 +245,23 @@ nwfilterStateInitialize(bool privileged, return 0; -error: + error: VIR_FREE(base); nwfilterDriverUnlock(driverState); nwfilterStateCleanup(); return -1; -err_techdrivers_shutdown: + err_techdrivers_shutdown: virNWFilterTechDriversShutdown(); -err_dhcpsnoop_shutdown: + err_dhcpsnoop_shutdown: virNWFilterDHCPSnoopShutdown(); -err_exit_learnshutdown: + err_exit_learnshutdown: virNWFilterLearnShutdown(); -err_exit_ipaddrmapshutdown: + err_exit_ipaddrmapshutdown: virNWFilterIPAddrMapShutdown(); -err_free_driverstate: + err_free_driverstate: VIR_FREE(driverState); return -1; @@ -378,7 +378,7 @@ nwfilterLookupByUUID(virConnectPtr conn, ret = virGetNWFilter(conn, nwfilter->def->name, nwfilter->def->uuid); -cleanup: + cleanup: if (nwfilter) virNWFilterObjUnlock(nwfilter); return ret; @@ -408,7 +408,7 @@ nwfilterLookupByName(virConnectPtr conn, ret = virGetNWFilter(conn, nwfilter->def->name, nwfilter->def->uuid); -cleanup: + cleanup: if (nwfilter) virNWFilterObjUnlock(nwfilter); return ret; @@ -588,7 +588,7 @@ nwfilterDefineXML(virConnectPtr conn, ret = virGetNWFilter(conn, nwfilter->def->name, nwfilter->def->uuid); -cleanup: + cleanup: virNWFilterDefFree(def); if (nwfilter) virNWFilterObjUnlock(nwfilter); @@ -637,7 +637,7 @@ nwfilterUndefine(virNWFilterPtr obj) nwfilter = NULL; ret = 0; -cleanup: + cleanup: if (nwfilter) virNWFilterObjUnlock(nwfilter); @@ -673,7 +673,7 @@ nwfilterGetXMLDesc(virNWFilterPtr obj, ret = virNWFilterDefFormat(nwfilter->def); -cleanup: + cleanup: if (nwfilter) virNWFilterObjUnlock(nwfilter); return ret; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index e535356..8dbab18 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -978,7 +978,7 @@ iptablesHandleSrcMacAddr(virBufferPtr buf, return 0; -err_exit: + err_exit: virBufferFreeAndReset(buf); return -1; @@ -1174,7 +1174,7 @@ iptablesHandleIpHdr(virBufferPtr buf, return 0; -err_exit: + err_exit: virBufferFreeAndReset(buf); virBufferFreeAndReset(afterStateMatch); @@ -1246,7 +1246,7 @@ iptablesHandlePortData(virBufferPtr buf, return 0; -err_exit: + err_exit: return -1; } @@ -1741,14 +1741,14 @@ _iptablesCreateRuleInstance(bool directionIn, (isIPv6) ? RT_IP6TABLES : RT_IPTABLES); -err_exit: + err_exit: virBufferFreeAndReset(&buf); virBufferFreeAndReset(&prefix); virBufferFreeAndReset(&afterStateMatch); return -1; -exit_no_error: + exit_no_error: virBufferFreeAndReset(&buf); virBufferFreeAndReset(&prefix); virBufferFreeAndReset(&afterStateMatch); @@ -2628,7 +2628,7 @@ ebtablesCreateRuleInstance(char chainPrefix, rule->priority, RT_EBTABLES); -err_exit: + err_exit: virBufferFreeAndReset(&buf); return -1; @@ -3281,7 +3281,7 @@ ebtablesApplyBasicRules(const char *ifname, return 0; -tear_down_tmpebchains: + tear_down_tmpebchains: ebtablesCleanAll(ifname); virReportError(VIR_ERR_BUILD_FIREWALL, @@ -3429,7 +3429,7 @@ ebtablesApplyDHCPOnlyRules(const char *ifname, return 0; -tear_down_tmpebchains: + tear_down_tmpebchains: ebtablesCleanAll(ifname); virReportError(VIR_ERR_BUILD_FIREWALL, @@ -3499,7 +3499,7 @@ ebtablesApplyDropAllRules(const char *ifname) return 0; -tear_down_tmpebchains: + tear_down_tmpebchains: ebtablesCleanAll(ifname); virReportError(VIR_ERR_BUILD_FIREWALL, @@ -3565,7 +3565,7 @@ ebiptablesRuleOrderSort(const void *a, const void *b) if (root_b) { return 1; /* b before a */ } -normal: + normal: /* priorities are limited to range [-1000, 1000] */ return insta->priority - instb->priority; } @@ -3911,7 +3911,7 @@ ebiptablesApplyNewRules(const char *ifname, return 0; -tear_down_ebsubchains_and_unlink: + tear_down_ebsubchains_and_unlink: if (ebtables_cmd_path) { NWFILTER_SET_EBTABLES_SHELLVAR(&buf); @@ -3919,7 +3919,7 @@ tear_down_ebsubchains_and_unlink: ebtablesUnlinkTmpRootChain(&buf, false, ifname); } -tear_down_tmpip6tchains: + tear_down_tmpip6tchains: if (haveIp6tables) { NWFILTER_SET_IP6TABLES_SHELLVAR(&buf); @@ -3927,7 +3927,7 @@ tear_down_tmpip6tchains: iptablesRemoveTmpRootChains(&buf, ifname); } -tear_down_tmpiptchains: + tear_down_tmpiptchains: if (haveIptables) { NWFILTER_SET_IPTABLES_SHELLVAR(&buf); @@ -3935,7 +3935,7 @@ tear_down_tmpiptchains: iptablesRemoveTmpRootChains(&buf, ifname); } -tear_down_tmpebchains: + tear_down_tmpebchains: if (ebtables_cmd_path) { NWFILTER_SET_EBTABLES_SHELLVAR(&buf); @@ -3953,7 +3953,7 @@ tear_down_tmpebchains: errmsg ? ": " : "", errmsg ? errmsg : ""); -exit_free_sets: + exit_free_sets: virHashFree(chains_in_set); virHashFree(chains_out_set); @@ -4083,7 +4083,7 @@ ebiptablesRemoveRules(const char *ifname ATTRIBUTE_UNUSED, rc = 0; -cleanup: + cleanup: return rc; } @@ -4209,7 +4209,7 @@ ebiptablesDriverInitWithFirewallD(void) } } -err_exit: + err_exit: VIR_FREE(firewall_cmd_path); VIR_FREE(output); @@ -4365,7 +4365,7 @@ ebiptablesDriverProbeStateMatch(void) m_state_in_str = m_state_in_str_new; } -cleanup: + cleanup: VIR_FREE(cmdout); return; } diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 4f02f15..1ce5e70 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -345,7 +345,7 @@ virNWFilterCreateVarsFrom(virNWFilterHashTablePtr vars1, return res; -err_exit: + err_exit: virNWFilterHashTableFree(res); return NULL; } @@ -768,7 +768,7 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, virNWFilterUnlockIface(ifname); } -err_exit: + err_exit: for (j = 0; j < nEntries; j++) virNWFilterRuleInstFree(insts[j]); @@ -780,7 +780,7 @@ err_exit: return rc; -err_unresolvable_vars: + err_unresolvable_vars: buf = virNWFilterPrintVars(missing_vars->hashTable, ", ", false, reportIP); if (buf) { @@ -906,10 +906,10 @@ __virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, virNWFilterHashTableFree(vars); -err_exit_vars1: + err_exit_vars1: virNWFilterHashTableFree(vars1); -err_exit: + err_exit: virNWFilterObjUnlock(obj); VIR_FREE(str_ipaddr); @@ -961,7 +961,7 @@ _virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, false, foundNewFilter); -cleanup: + cleanup: virMutexUnlock(&updateMutex); return rc; diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index e01d4df..0eb5e7e 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -761,13 +761,13 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, return 0; -err_dereg_req: + err_dereg_req: virNWFilterDeregisterLearnReq(ifindex); -err_free_ht: + err_free_ht: virNWFilterHashTableFree(ht); -err_free_req: + err_free_req: virNWFilterIPAddrLearnReqFree(req); -err_no_req: + err_no_req: return -1; } -- 1.8.3.2

--- src/qemu/qemu_agent.c | 26 +-- src/qemu/qemu_capabilities.c | 50 ++--- src/qemu/qemu_cgroup.c | 26 +-- src/qemu/qemu_command.c | 162 +++++++-------- src/qemu/qemu_conf.c | 22 +- src/qemu/qemu_domain.c | 34 ++-- src/qemu/qemu_driver.c | 464 +++++++++++++++++++++---------------------- src/qemu/qemu_hostdev.c | 6 +- src/qemu/qemu_hotplug.c | 70 +++---- src/qemu/qemu_migration.c | 106 +++++----- src/qemu/qemu_monitor.c | 28 +-- src/qemu/qemu_monitor_json.c | 122 ++++++------ src/qemu/qemu_monitor_text.c | 100 +++++----- src/qemu/qemu_process.c | 72 +++---- 14 files changed, 644 insertions(+), 644 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 9f02e52..27af1be 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -240,7 +240,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) return monfd; -error: + error: VIR_FORCE_CLOSE(monfd); return -1; } @@ -264,7 +264,7 @@ qemuAgentOpenPty(const char *monitor) return monfd; -error: + error: VIR_FORCE_CLOSE(monfd); return -1; } @@ -352,7 +352,7 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, _("Unknown JSON reply '%s'"), line); } -cleanup: + cleanup: virJSONValueFree(obj); return ret; } @@ -777,7 +777,7 @@ qemuAgentOpen(virDomainObjPtr vm, return mon; -cleanup: + cleanup: /* We don't want the 'destroy' callback invoked during * cleanup from construction failure, because that can * give a double-unref on virDomainObjPtr in the caller, @@ -888,7 +888,7 @@ static int qemuAgentSend(qemuAgentPtr mon, ret = 0; -cleanup: + cleanup: mon->msg = NULL; qemuAgentUpdateWatch(mon); @@ -959,7 +959,7 @@ qemuAgentGuestSync(qemuAgentPtr mon) } ret = 0; -cleanup: + cleanup: virJSONValueFree(sync_msg.rxObject); VIR_FREE(sync_msg.txBuffer); return ret; @@ -1012,7 +1012,7 @@ qemuAgentCommand(qemuAgentPtr mon, } } -cleanup: + cleanup: VIR_FREE(cmdstr); VIR_FREE(msg.txBuffer); @@ -1226,7 +1226,7 @@ qemuAgentMakeCommand(const char *cmdname, return obj; -error: + error: virJSONValueFree(obj); virJSONValueFree(jargs); va_end(args); @@ -1317,7 +1317,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon) _("malformed return value")); } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1355,7 +1355,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) _("malformed return value")); } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1426,7 +1426,7 @@ qemuAgentArbitraryCommand(qemuAgentPtr mon, ret = -1; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1526,7 +1526,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, ret = ndata; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1590,7 +1590,7 @@ qemuAgentSetVCPUs(qemuAgentPtr mon, _("malformed return value")); } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); virJSONValueFree(cpu); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c71bf60..1e55121 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -482,7 +482,7 @@ virQEMUCapsProbeMachineTypes(virQEMUCapsPtr qemuCaps, ret = 0; -cleanup: + cleanup: VIR_FREE(output); virCommandFree(cmd); @@ -546,7 +546,7 @@ virQEMUCapsParseX86Models(const char *output, ret = 0; -cleanup: + cleanup: return ret; } @@ -595,7 +595,7 @@ virQEMUCapsParsePPCModels(const char *output, ret = 0; -cleanup: + cleanup: return ret; } @@ -630,7 +630,7 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid) ret = 0; -cleanup: + cleanup: VIR_FREE(output); virCommandFree(cmd); @@ -840,7 +840,7 @@ virQEMUCapsInitGuest(virCapsPtr caps, ret = 0; -cleanup: + cleanup: VIR_FREE(binary); VIR_FREE(kvmbin); virObjectUnref(qemubinCaps); @@ -848,7 +848,7 @@ cleanup: return ret; -error: + error: virCapabilitiesFreeMachines(machines, nmachines); goto cleanup; @@ -884,12 +884,12 @@ virQEMUCapsInitCPU(virCapsPtr caps, ret = 0; -cleanup: + cleanup: cpuDataFree(data); return ret; -error: + error: virCPUDefFree(cpu); goto cleanup; } @@ -937,7 +937,7 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache) return caps; -error: + error: virObjectUnref(caps); return NULL; } @@ -1325,7 +1325,7 @@ int virQEMUCapsParseHelpStr(const char *qemu, return 0; -fail: + fail: p = strchr(help, '\n'); if (!p) p = strchr(help, '\0'); @@ -1334,7 +1334,7 @@ fail: _("cannot parse %s version number in '%.*s'"), qemu, (int) (p - help), help); -cleanup: + cleanup: return -1; } @@ -1596,7 +1596,7 @@ virQEMUCapsParseDeviceStrObjectTypes(const char *str, *types = typelist; ret = ntypelist; -cleanup: + cleanup: if (ret < 0) virQEMUCapsFreeStringList(ntypelist, typelist); return ret; @@ -1649,7 +1649,7 @@ virQEMUCapsParseDeviceStrObjectProps(const char *str, *props = proplist; ret = nproplist; -cleanup: + cleanup: if (ret < 0) virQEMUCapsFreeStringList(nproplist, proplist); return ret; @@ -1731,7 +1731,7 @@ virQEMUCapsExtractDeviceStr(const char *qemu, ret = virQEMUCapsParseDeviceStr(qemuCaps, output); -cleanup: + cleanup: VIR_FREE(output); virCommandFree(cmd); return ret; @@ -1787,7 +1787,7 @@ virQEMUCapsNew(void) return qemuCaps; -error: + error: virObjectUnref(qemuCaps); return NULL; } @@ -1832,7 +1832,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) return ret; -error: + error: virObjectUnref(ret); return NULL; } @@ -1995,7 +1995,7 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, return 0; -error: + error: virCapabilitiesFreeMachines(*machines, *nmachines); *nmachines = 0; *machines = NULL; @@ -2179,7 +2179,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, ret = 0; -cleanup: + cleanup: for (i = 0; i < nmachines; i++) qemuMonitorMachineInfoFree(machines[i]); VIR_FREE(machines); @@ -2522,7 +2522,7 @@ virQEMUCapsLoadCache(virQEMUCapsPtr qemuCaps, const char *filename, VIR_FREE(nodes); ret = 0; -cleanup: + cleanup: VIR_FREE(str); VIR_FREE(nodes); xmlXPathFreeContext(ctxt); @@ -2815,7 +2815,7 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid) goto cleanup; ret = 0; -cleanup: + cleanup: virCommandFree(cmd); VIR_FREE(help); return ret; @@ -2928,7 +2928,7 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, ret = 0; -cleanup: + cleanup: VIR_FREE(archstr); return ret; } @@ -3013,7 +3013,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(package); return ret; } @@ -3140,7 +3140,7 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, ret = 0; -cleanup: + cleanup: if (mon) virObjectUnlock(mon); qemuMonitorClose(mon); @@ -3243,7 +3243,7 @@ virQEMUCapsPtr virQEMUCapsNewForBinary(const char *binary, return qemuCaps; -error: + error: virObjectUnref(qemuCaps); qemuCaps = NULL; return NULL; @@ -3301,7 +3301,7 @@ virQEMUCapsCacheNew(const char *libDir, return cache; -error: + error: virQEMUCapsCacheFree(cache); return NULL; } diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index da8cdbf..e625206 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -313,7 +313,7 @@ qemuSetupHostdevCGroup(virDomainObjPtr vm, } ret = 0; -cleanup: + cleanup: virPCIDeviceFree(pci); virUSBDeviceFree(usb); virSCSIDeviceFree(scsi); @@ -374,7 +374,7 @@ qemuTeardownHostdevCgroup(virDomainObjPtr vm, } ret = 0; -cleanup: + cleanup: virPCIDeviceFree(pci); VIR_FREE(path); return ret; @@ -569,7 +569,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, } ret = 0; -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -633,7 +633,7 @@ qemuSetupCpusetCgroup(virDomainObjPtr vm, } ret = 0; -cleanup: + cleanup: VIR_FREE(mem_mask); VIR_FREE(cpu_mask); return ret; @@ -716,9 +716,9 @@ qemuInitCgroup(virQEMUDriverPtr driver, goto cleanup; } -done: + done: ret = 0; -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -750,9 +750,9 @@ qemuConnectCgroup(virQEMUDriverPtr driver, &priv->cgroup) < 0) goto cleanup; -done: + done: ret = 0; -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -797,7 +797,7 @@ qemuSetupCgroup(virQEMUDriverPtr driver, goto cleanup; ret = 0; -cleanup: + cleanup: virObjectUnref(caps); return ret; } @@ -827,7 +827,7 @@ qemuSetupCgroupVcpuBW(virCgroupPtr cgroup, return 0; -error: + error: if (period) { virErrorPtr saved = virSaveLastError(); ignore_value(virCgroupSetCpuCfsPeriod(cgroup, old_period)); @@ -875,7 +875,7 @@ qemuSetupCgroupEmulatorPin(virCgroupPtr cgroup, goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(new_cpus); return ret; } @@ -948,7 +948,7 @@ qemuSetupCgroupForVcpu(virDomainObjPtr vm) return 0; -cleanup: + cleanup: if (cgroup_vcpu) { virCgroupRemove(cgroup_vcpu); virCgroupFree(&cgroup_vcpu); @@ -1013,7 +1013,7 @@ qemuSetupCgroupForEmulator(virQEMUDriverPtr driver, virBitmapFree(cpumap); return 0; -cleanup: + cleanup: virBitmapFree(cpumap); if (cgroup_emulator) { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0f8ecdb..b09a5b4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -196,7 +196,7 @@ qemuPhysIfaceConnect(virDomainDefPtr def, virObjectUnref(cfg); return rc; -error: + error: ignore_value(virNetDevMacVLanDeleteWithVPortProfile( res_ifname, &net->mac, virDomainNetGetActualDirectDev(net), @@ -274,7 +274,7 @@ static int qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, *tapfd = -1; } -cleanup: + cleanup: virCommandFree(cmd); VIR_FORCE_CLOSE(pair[0]); return *tapfd < 0 ? -1 : 0; @@ -402,7 +402,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, ret = 0; -cleanup: + cleanup: if (ret < 0) { size_t i; for (i = 0; i < *tapfdSize && tapfd[i] >= 0; i++) @@ -525,7 +525,7 @@ qemuOpenVhostNet(virDomainDefPtr def, virDomainAuditNetDevice(def, net, "/dev/vhost-net", *vhostfdSize); return 0; -error: + error: while (i--) VIR_FORCE_CLOSE(vhostfd[i]); @@ -579,7 +579,7 @@ qemuNetworkPrepareDevices(virDomainDefPtr def) } } ret = 0; -cleanup: + cleanup: return ret; } @@ -1155,7 +1155,7 @@ int qemuDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, ret = 0; -cleanup: + cleanup: VIR_FREE(addr); return ret; } @@ -1274,7 +1274,7 @@ qemuDomainCCWAddressSetCreate(void) addrs->next.assigned = 0; return addrs; -error: + error: qemuDomainCCWAddressSetFree(addrs); return NULL; } @@ -1329,7 +1329,7 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def, } ret = 0; -cleanup: + cleanup: qemuDomainCCWAddressSetFree(addrs); return ret; @@ -1459,7 +1459,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, ret = 0; -cleanup: + cleanup: return ret; } @@ -1866,7 +1866,7 @@ qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, goto cleanup; ret = 0; -cleanup: + cleanup: return ret; } @@ -1967,7 +1967,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, ret = 0; -cleanup: + cleanup: qemuDomainPCIAddressSetFree(addrs); return ret; @@ -2050,7 +2050,7 @@ qemuDomainPCIAddressSetCreate(virDomainDefPtr def, return addrs; -error: + error: qemuDomainPCIAddressSetFree(addrs); return NULL; } @@ -2130,7 +2130,7 @@ qemuDomainPCIAddressReserveAddr(qemuDomainPCIAddressSetPtr addrs, } ret = 0; -cleanup: + cleanup: VIR_FREE(addrStr); return ret; } @@ -2180,7 +2180,7 @@ int qemuDomainPCIAddressEnsureAddr(qemuDomainPCIAddressSetPtr addrs, ret = qemuDomainPCIAddressReserveNextSlot(addrs, dev, flags); } -cleanup: + cleanup: VIR_FREE(addrStr); return ret; } @@ -2212,7 +2212,7 @@ qemuDomainPCIAddressReleaseSlot(qemuDomainPCIAddressSetPtr addrs, addrs->buses[addr->bus].slots[addr->slot] = 0; ret = 0; -cleanup: + cleanup: VIR_FREE(addrStr); return ret; } @@ -2303,11 +2303,11 @@ qemuDomainPCIAddressGetNextSlot(qemuDomainPCIAddressSetPtr addrs, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No more available PCI slots")); -error: + error: VIR_FREE(addrStr); return -1; -success: + success: VIR_DEBUG("Found free PCI slot %.4x:%.2x:%.2x", a.domain, a.bus, a.slot); *next_addr = a; @@ -2499,7 +2499,7 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, } } ret = 0; -cleanup: + cleanup: VIR_FREE(addrStr); return ret; } @@ -2669,7 +2669,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, } } ret = 0; -cleanup: + cleanup: VIR_FREE(addrStr); return ret; } @@ -2995,7 +2995,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, return 0; -error: + error: return -1; } @@ -3111,7 +3111,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, } ret = 0; -cleanup: + cleanup: VIR_FREE(devStr); return ret; } @@ -3243,7 +3243,7 @@ qemuGetSecretString(virConnectPtr conn, secret = base64; } -cleanup: + cleanup: virObjectUnref(sec); return secret; } @@ -3290,7 +3290,7 @@ static int qemuAddRBDHost(virDomainDiskDefPtr disk, char *hostport) return 0; -error: + error: VIR_FREE(disk->src.hosts[disk->src.nhosts-1].port); VIR_FREE(disk->src.hosts[disk->src.nhosts-1].name); return -1; @@ -3359,7 +3359,7 @@ static int qemuParseRBDString(virDomainDiskDefPtr disk) VIR_FREE(options); return 0; -error: + error: VIR_FREE(options); return -1; } @@ -3441,12 +3441,12 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, def->src.nhosts = 1; ret = 0; -cleanup: + cleanup: virURIFree(uri); return ret; -error: + error: virDomainDiskHostDefClear(def->src.hosts); VIR_FREE(def->src.hosts); goto cleanup; @@ -3549,7 +3549,7 @@ qemuParseNBDString(virDomainDiskDefPtr disk) disk->src.hosts = h; return 0; -error: + error: virDomainDiskHostDefClear(h); VIR_FREE(h); return -1; @@ -3813,7 +3813,7 @@ qemuBuildNetworkDriveURI(int protocol, goto cleanup; } -cleanup: + cleanup: virBufferFreeAndReset(&buf); virURIFree(uri); @@ -3907,7 +3907,7 @@ qemuDomainDiskGetSourceString(virConnectPtr conn, secret, source); -cleanup: + cleanup: VIR_FREE(secret); return ret; } @@ -4270,7 +4270,7 @@ qemuBuildDriveStr(virConnectPtr conn, return virBufferContentAndReset(&opt); -error: + error: VIR_FREE(source); virBufferFreeAndReset(&opt); return NULL; @@ -4612,7 +4612,7 @@ qemuBuildDriveDevStr(virDomainDefPtr def, return virBufferContentAndReset(&opt); -error: + error: virBufferFreeAndReset(&opt); return NULL; } @@ -4688,7 +4688,7 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, return virBufferContentAndReset(&opt); -error: + error: virBufferFreeAndReset(&opt); return NULL; } @@ -4722,7 +4722,7 @@ qemuBuildFSDevStr(virDomainDefPtr def, return virBufferContentAndReset(&opt); -error: + error: virBufferFreeAndReset(&opt); return NULL; } @@ -4948,7 +4948,7 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5061,7 +5061,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5226,7 +5226,7 @@ qemuBuildWatchdogDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5267,7 +5267,7 @@ qemuBuildMemballoonDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5294,7 +5294,7 @@ qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5330,7 +5330,7 @@ qemuBuildUSBInputDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5383,7 +5383,7 @@ qemuBuildSoundDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5427,7 +5427,7 @@ qemuBuildSoundCodecStr(virDomainSoundDefPtr sound, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5498,7 +5498,7 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5574,7 +5574,7 @@ qemuBuildPCIHostdevDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5678,7 +5678,7 @@ qemuBuildRedirdevDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5718,7 +5718,7 @@ qemuBuildUSBHostdevDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5756,7 +5756,7 @@ qemuBuildHubDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -5825,7 +5825,7 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, VIR_FREE(sg); return virBufferContentAndReset(&buf); -error: + error: VIR_FREE(sg); virBufferFreeAndReset(&buf); return NULL; @@ -5889,7 +5889,7 @@ qemuBuildSCSIHostdevDevStr(virDomainDefPtr def, } return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -6010,7 +6010,7 @@ qemuBuildChrChardevStr(virDomainChrSourceDefPtr dev, const char *alias, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -6105,7 +6105,7 @@ qemuBuildChrArgStr(virDomainChrSourceDefPtr dev, const char *prefix) return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -6185,7 +6185,7 @@ qemuBuildVirtioSerialPortDevStr(virDomainChrDefPtr dev, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -6217,7 +6217,7 @@ qemuBuildSclpDevStr(virDomainChrDefPtr dev) return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -6275,7 +6275,7 @@ qemuBuildRNGBackendArgs(virCommandPtr cmd, ret = 0; -cleanup: + cleanup: virBufferFreeAndReset(&buf); VIR_FREE(backend); return ret; @@ -6324,7 +6324,7 @@ qemuBuildRNGDeviceArgs(virCommandPtr cmd, ret = 0; -cleanup: + cleanup: virBufferFreeAndReset(&buf); return ret; } @@ -6444,7 +6444,7 @@ static char *qemuBuildSmbiosBiosStr(virSysinfoDefPtr def) return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -6491,7 +6491,7 @@ static char *qemuBuildSmbiosSystemStr(virSysinfoDefPtr def, bool skip_uuid) return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -6595,7 +6595,7 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } @@ -6838,7 +6838,7 @@ qemuBuildCpuArgStr(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: VIR_FREE(compare_msg); cpuDataFree(data); virCPUDefFree(guest); @@ -7085,7 +7085,7 @@ qemuBuildNumaArgStr(const virDomainDef *def, virCommandPtr cmd) } ret = 0; -cleanup: + cleanup: VIR_FREE(cpumask); virBufferFreeAndReset(&buf); return ret; @@ -7231,7 +7231,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, return 0; -error: + error: VIR_FREE(netAddr); virBufferFreeAndReset(&opt); return -1; @@ -7456,7 +7456,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, return 0; -error: + error: VIR_FREE(netAddr); virBufferFreeAndReset(&opt); return -1; @@ -7657,7 +7657,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, } ret = 0; -cleanup: + cleanup: if (ret < 0) virDomainConfNWFilterTeardown(net); for (i = 0; tapfd && i < tapfdSize && tapfd[i] >= 0; i++) { @@ -9742,7 +9742,7 @@ qemuBuildCommandLine(virConnectPtr conn, virObjectUnref(cfg); return cmd; -error: + error: virObjectUnref(cfg); /* free up any resources in the network driver * but don't overwrite the original error */ @@ -9808,7 +9808,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, *deviceStr = virBufferContentAndReset(&cmd); return 0; -error: + error: virBufferFreeAndReset(&cmd); return -1; } @@ -9861,7 +9861,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, } ret = 0; -cleanup: + cleanup: VIR_FREE(addr); return ret; } @@ -9896,7 +9896,7 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, } ret = 0; -cleanup: + cleanup: return ret; } @@ -10029,7 +10029,7 @@ static int qemuStringToArgvEnv(const char *args, return 0; -error: + error: VIR_FREE(progenv); VIR_FREE(progargv); virStringFreeList(arglist); @@ -10151,7 +10151,7 @@ qemuParseKeywords(const char *str, *retnkeywords = keywordCount; return 0; -error: + error: for (i = 0; i < keywordCount; i++) { VIR_FREE(keywords[i]); VIR_FREE(values[i]); @@ -10481,7 +10481,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, /* fall through to "cleanup" */ } -cleanup: + cleanup: for (i = 0; i < nkeywords; i++) { VIR_FREE(keywords[i]); VIR_FREE(values[i]); @@ -10490,7 +10490,7 @@ cleanup: VIR_FREE(values); return def; -error: + error: virDomainDiskDefFree(def); def = NULL; goto cleanup; @@ -10677,7 +10677,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt, if (genmac) virDomainNetGenerateMAC(xmlopt, &def->mac); -cleanup: + cleanup: for (i = 0; i < nkeywords; i++) { VIR_FREE(keywords[i]); VIR_FREE(values[i]); @@ -10907,7 +10907,7 @@ qemuParseCommandLineChr(virDomainChrSourceDefPtr source, return 0; -error: + error: return -1; } @@ -11112,13 +11112,13 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, ret = 0; -cleanup: + cleanup: VIR_FREE(model); virStringFreeList(tokens); virStringFreeList(hv_tokens); return ret; -syntax: + syntax: virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown CPU syntax '%s'"), val); goto cleanup; @@ -11181,7 +11181,7 @@ qemuParseCommandLineSmp(virDomainDefPtr dom, ret = 0; -cleanup: + cleanup: for (i = 0; i < nkws; i++) { VIR_FREE(kws[i]); VIR_FREE(vals[i]); @@ -11191,10 +11191,10 @@ cleanup: return ret; -syntax: + syntax: virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse CPU topology '%s'"), val); -error: + error: ret = -1; goto cleanup; } @@ -12167,7 +12167,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, return def; -error: + error: virDomainDiskDefFree(disk); qemuDomainCmdlineDefFree(cmd); virDomainDefFree(def); @@ -12199,7 +12199,7 @@ virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps, def = qemuParseCommandLine(qemuCaps, xmlopt, progenv, progargv, pidfile, monConfig, monJSON); -cleanup: + cleanup: virStringFreeList(progargv); virStringFreeList(progenv); @@ -12246,7 +12246,7 @@ static int qemuParseProcFileStrings(int pid_value, ret = nstr-1; *list = str; -cleanup: + cleanup: if (ret < 0) virStringFreeList(str); VIR_FREE(data); @@ -12290,7 +12290,7 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps, VIR_FREE(def->emulator); def->emulator = emulator; -cleanup: + cleanup: VIR_FREE(exepath); virStringFreeList(progargv); virStringFreeList(progenv); diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0d6bcfe..dc9b3ae 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -257,7 +257,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) return cfg; -error: + error: virObjectUnref(cfg); return NULL; } @@ -578,7 +578,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, ret = 0; -cleanup: + cleanup: virConfFree(conf); return ret; } @@ -662,7 +662,7 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver) virObjectUnref(cfg); return caps; -error: + error: VIR_FREE(sec_managers); virObjectUnref(caps); virObjectUnref(cfg); @@ -806,7 +806,7 @@ qemuCheckSharedDevice(virHashTablePtr sharedDevices, } ret = -1; -cleanup: + cleanup: VIR_FREE(sysfs_path); VIR_FREE(key); return ret; @@ -866,7 +866,7 @@ qemuSharedDeviceEntryCopy(const qemuSharedDeviceEntry *entry) return ret; -cleanup: + cleanup: qemuSharedDeviceEntryFree(ret, NULL); return NULL; } @@ -973,7 +973,7 @@ qemuAddSharedDevice(virQEMUDriverPtr driver, } ret = 0; -cleanup: + cleanup: qemuDriverUnlock(driver); VIR_FREE(dev_name); VIR_FREE(dev_path); @@ -1067,7 +1067,7 @@ qemuRemoveSharedDevice(virQEMUDriverPtr driver, } ret = 0; -cleanup: + cleanup: qemuDriverUnlock(driver); VIR_FREE(dev_name); VIR_FREE(dev_path); @@ -1133,7 +1133,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) virSetDeviceUnprivSGIO(path, NULL, val) < 0) ret = -1; -cleanup: + cleanup: VIR_FREE(sysfs_path); return ret; } @@ -1199,7 +1199,7 @@ qemuAddISCSIPoolSourceHost(virDomainDiskDefPtr def, ret = 0; -cleanup: + cleanup: virStringFreeList(tokens); return ret; } @@ -1252,7 +1252,7 @@ qemuTranslateDiskSourcePoolAuth(virDomainDiskDefPtr def, } ret = 0; -cleanup: + cleanup: return ret; } @@ -1400,7 +1400,7 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, } ret = 0; -cleanup: + cleanup: if (ret < 0) savedError = virSaveLastError(); if (pool) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6fea543..36cb2c6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -232,7 +232,7 @@ qemuDomainObjPrivateAlloc(void) return priv; -error: + error: VIR_FREE(priv); return NULL; } @@ -520,7 +520,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) return 0; -error: + error: virDomainChrSourceDefFree(priv->monConfig); priv->monConfig = NULL; VIR_FREE(nodes); @@ -643,7 +643,7 @@ qemuDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED, return 0; -error: + error: VIR_FREE(nodes); qemuDomainDefNamespaceFree(cmd); return -1; @@ -934,7 +934,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, ret = 0; -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -1071,7 +1071,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, virObjectRef(obj); -retry: + retry: if (cfg->maxQueuedJobs && priv->jobs_queued > cfg->maxQueuedJobs) { goto error; @@ -1119,7 +1119,7 @@ retry: virObjectUnref(cfg); return 0; -error: + error: VIR_WARN("Cannot start job (%s, %s) for domain %s;" " current job is (%s, %s) owned by (%llu, %llu)", qemuDomainJobTypeToString(job), @@ -1451,7 +1451,7 @@ qemuDomainDefCopy(virQEMUDriverPtr driver, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; -cleanup: + cleanup: VIR_FREE(xml); virObjectUnref(caps); return ret; @@ -1558,7 +1558,7 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, ret = virDomainDefFormatInternal(def, flags, buf); -cleanup: + cleanup: def->cpu = def_cpu; virCPUDefFree(cpu); if (controllers) { @@ -1766,7 +1766,7 @@ qemuDomainOpenLogHelper(virQEMUDriverConfigPtr cfg, goto cleanup; } -cleanup: + cleanup: VIR_FREE(logfile); return fd; } @@ -1856,7 +1856,7 @@ int qemuDomainAppendLog(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: va_end(argptr); if (fd != logFD) @@ -1907,7 +1907,7 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, ret = virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); -cleanup: + cleanup: VIR_FREE(snapFile); VIR_FREE(snapDir); VIR_FREE(newxml); @@ -2066,7 +2066,7 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: VIR_FREE(snapFile); virObjectUnref(cfg); return ret; @@ -2150,7 +2150,7 @@ qemuDomainSetFakeReboot(virQEMUDriverPtr driver, if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); -cleanup: + cleanup: virObjectUnref(cfg); } @@ -2230,7 +2230,7 @@ qemuDomainCheckDiskStartupPolicy(virQEMUDriverPtr driver, return 0; -error: + error: return -1; } @@ -2266,7 +2266,7 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, ret = 0; -error: + error: return ret; } @@ -2426,7 +2426,7 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, if (!disk->backingChain) ret = -1; -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -2469,7 +2469,7 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, ret = virDomainDefCheckABIStability(migratableDefSrc, migratableDefDst); -cleanup: + cleanup: virDomainDefFree(migratableDefSrc); virDomainDefFree(migratableDefDst); return ret; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 76f789e..05e4c74 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -299,7 +299,7 @@ qemuAutostartDomain(virDomainObjPtr vm, } ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(cfg); @@ -389,7 +389,7 @@ qemuSecurityInit(virQEMUDriverPtr driver) virObjectUnref(cfg); return 0; -error: + error: VIR_ERROR(_("Failed to initialize security drivers")); virObjectUnref(stack); virObjectUnref(mgr); @@ -508,7 +508,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, virResetLastError(); ret = 0; -cleanup: + cleanup: if (dir) closedir(dir); VIR_FREE(snapDir); @@ -837,7 +837,7 @@ qemuStateInitialize(bool privileged, virNWFilterRegisterCallbackDriver(&qemuCallbackDriver); return 0; -error: + error: virObjectUnref(conn); VIR_FREE(driverConf); VIR_FREE(membase); @@ -899,7 +899,7 @@ qemuStateReload(void) caps, qemu_driver->xmlopt, QEMU_EXPECTED_VIRT_TYPES, qemuNotifyLoadDomain, qemu_driver); -cleanup: + cleanup: virObjectUnref(cfg); virObjectUnref(caps); return 0; @@ -1083,7 +1083,7 @@ static virDrvOpenStatus qemuConnectOpen(virConnectPtr conn, conn->privateData = qemu_driver; ret = VIR_DRV_OPEN_SUCCESS; -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -1175,7 +1175,7 @@ kvmGetMaxVCPUs(void) * that 4 should be used as the maximum number of cpus */ ret = 4; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); return ret; } @@ -1246,7 +1246,7 @@ static char *qemuConnectGetCapabilities(virConnectPtr conn) { virReportOOMError(); virObjectUnref(caps); -cleanup: + cleanup: return xml; } @@ -1349,7 +1349,7 @@ static virDomainPtr qemuDomainLookupByID(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -1378,7 +1378,7 @@ static virDomainPtr qemuDomainLookupByUUID(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -1405,7 +1405,7 @@ static virDomainPtr qemuDomainLookupByName(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -1425,7 +1425,7 @@ static int qemuDomainIsActive(virDomainPtr dom) ret = virDomainObjIsActive(obj); -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -1444,7 +1444,7 @@ static int qemuDomainIsPersistent(virDomainPtr dom) ret = obj->persistent; -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -1463,7 +1463,7 @@ static int qemuDomainIsUpdated(virDomainPtr dom) ret = obj->updated; -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -1490,7 +1490,7 @@ static int qemuConnectGetVersion(virConnectPtr conn, unsigned long *version) *version = qemuVersion; ret = 0; -cleanup: + cleanup: virObjectUnref(caps); return ret; } @@ -1647,7 +1647,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: virDomainDefFree(def); if (vm) virObjectUnlock(vm); @@ -1730,11 +1730,11 @@ static int qemuDomainSuspend(virDomainPtr dom) goto endjob; ret = 0; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); @@ -1796,11 +1796,11 @@ static int qemuDomainResume(virDomainPtr dom) goto endjob; ret = 0; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) @@ -1879,11 +1879,11 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) qemuDomainObjExitMonitor(driver, vm); } -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1979,11 +1979,11 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) qemuDomainSetFakeReboot(driver, vm, isReboot); } -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2022,11 +2022,11 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) priv->fakeReboot = false; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2115,11 +2115,11 @@ qemuDomainDestroyFlags(virDomainPtr dom, } ret = 0; -endjob: + endjob: if (vm && !qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) @@ -2145,7 +2145,7 @@ static char *qemuDomainGetOSType(virDomainPtr dom) { ignore_value(VIR_STRDUP(type, vm->def->os.type)); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return type; @@ -2166,7 +2166,7 @@ qemuDomainGetMaxMemory(virDomainPtr dom) ret = vm->def->mem.max_balloon; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2269,11 +2269,11 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, } ret = 0; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -2343,11 +2343,11 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period, } ret = 0; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -2391,11 +2391,11 @@ static int qemuDomainInjectNMI(virDomainPtr domain, unsigned int flags) ret = qemuMonitorInjectNMI(priv->mon); qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2455,11 +2455,11 @@ static int qemuDomainSendKey(virDomainPtr domain, ret = qemuMonitorSendKey(priv->mon, holdtime, keycodes, nkeycodes); qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2539,7 +2539,7 @@ static int qemuDomainGetInfo(virDomainPtr dom, info->nrVirtCpu = vm->def->vcpus; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2565,7 +2565,7 @@ qemuDomainGetState(virDomainPtr dom, *state = virDomainObjGetState(vm, reason); ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2618,7 +2618,7 @@ qemuDomainGetControlInfo(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2708,7 +2708,7 @@ qemuDomainSaveHeader(int fd, const char *path, const char *xml, _("failed to write xml to '%s'"), path); goto endjob; } -endjob: + endjob: return ret; } @@ -2878,14 +2878,14 @@ qemuOpenFileAs(uid_t fallback_uid, gid_t fallback_gid, bypass_security = true; } } -cleanup: + cleanup: if (needUnlink) *needUnlink = need_unlink; if (bypassSecurityDriver) *bypassSecurityDriver = bypass_security; return fd; -error: + error: virReportSystemError(-fd, oflags & O_CREAT ? _("Failed to create file '%s'") : _("Failed to open file '%s'"), @@ -3008,7 +3008,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); virFileWrapperFdFree(wrapperFd); VIR_FREE(xml); @@ -3112,7 +3112,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, vm = NULL; } -endjob: + endjob: if (vm) { if (ret != 0) { if (was_running && virDomainObjIsActive(vm)) { @@ -3131,7 +3131,7 @@ endjob: vm = NULL; } -cleanup: + cleanup: VIR_FREE(xml); if (event) qemuDomainEventQueue(driver, event); @@ -3204,7 +3204,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, dxml, flags); vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(cfg); @@ -3291,7 +3291,7 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); VIR_FREE(name); @@ -3316,7 +3316,7 @@ qemuDomainManagedSaveLoad(virDomainObjPtr vm, vm->hasManagedSave = virFileExists(name); ret = 0; -cleanup: + cleanup: virObjectUnlock(vm); VIR_FREE(name); return ret; @@ -3339,7 +3339,7 @@ qemuDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) ret = vm->hasManagedSave; -cleanup: + cleanup: virObjectUnlock(vm); return ret; } @@ -3373,7 +3373,7 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) vm->hasManagedSave = false; ret = 0; -cleanup: + cleanup: VIR_FREE(name); virObjectUnlock(vm); return ret; @@ -3414,7 +3414,7 @@ static int qemuDumpToFd(virQEMUDriverPtr driver, virDomainObjPtr vm, ret = qemuMonitorDumpToFd(priv->mon, fd, dumpformat); -cleanup: + cleanup: qemuDomainObjExitMonitor(driver, vm); return ret; @@ -3495,7 +3495,7 @@ doCoreDump(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); if (ret != 0) unlink(path); @@ -3532,7 +3532,7 @@ getCompressionType(virQEMUDriverPtr driver) goto cleanup; } } -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -3595,7 +3595,7 @@ static int qemuDomainCoreDumpWithFormat(virDomainPtr dom, paused = true; -endjob: + endjob: if ((ret == 0) && (flags & VIR_DUMP_CRASH)) { qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, 0); virDomainAuditStop(vm, "crashed"); @@ -3635,7 +3635,7 @@ endjob: vm = NULL; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) @@ -3726,7 +3726,7 @@ qemuDomainScreenshot(virDomainPtr dom, ignore_value(VIR_STRDUP(ret, "image/x-portable-pixmap")); -endjob: + endjob: VIR_FORCE_CLOSE(tmp_fd); if (unlink_tmp) unlink(tmp); @@ -3735,7 +3735,7 @@ endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(cfg); @@ -3795,13 +3795,13 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in goto cleanup; } -endjob: + endjob: /* Safe to ignore value since ref count was incremented in * qemuProcessHandleWatchdog(). */ ignore_value(qemuDomainObjEndAsyncJob(driver, vm)); -cleanup: + cleanup: virObjectUnref(cfg); } @@ -3845,13 +3845,13 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Dump failed")); -endjob: + endjob: /* Safe to ignore value since ref count was incremented in * qemuProcessHandleGuestPanic(). */ ignore_value(qemuDomainObjEndAsyncJob(driver, vm)); -cleanup: + cleanup: VIR_FREE(dumpfile); virObjectUnref(cfg); return ret; @@ -3948,7 +3948,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver, break; } -cleanup: + cleanup: virObjectUnref(cfg); } @@ -4143,7 +4143,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, priv->vcpupids = cpupids; cpupids = NULL; -cleanup: + cleanup: qemuDomainObjExitMonitor(driver, vm); vm->def->vcpus = vcpus; VIR_FREE(cpupids); @@ -4152,7 +4152,7 @@ cleanup: virCgroupFree(&cgroup_vcpu); return ret; -unsupported: + unsupported: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot change vcpu count of this domain")); goto cleanup; @@ -4295,11 +4295,11 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, ret = 0; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -4482,7 +4482,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (cgroup_vcpu) virCgroupFree(&cgroup_vcpu); if (vm) @@ -4585,7 +4585,7 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom, } ret = ncpumaps; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -4742,7 +4742,7 @@ qemuDomainPinEmulator(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (cgroup_emulator) virCgroupFree(&cgroup_emulator); virBitmapFree(pcpumap); @@ -4821,7 +4821,7 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom, ret = 1; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -4916,7 +4916,7 @@ qemuDomainGetVcpus(virDomainPtr dom, } ret = maxinfo; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -4983,7 +4983,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) ncpuinfo = qemuAgentGetVCPUs(priv->agent, &cpuinfo); qemuDomainObjExitAgent(vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; @@ -5009,7 +5009,7 @@ endjob: } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -5070,7 +5070,7 @@ static int qemuDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr secl ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -5136,7 +5136,7 @@ static int qemuDomainGetSecurityLabelList(virDomainPtr dom, VIR_FREE(mgrs); } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -5184,7 +5184,7 @@ static int qemuNodeGetSecurityModel(virConnectPtr conn, } strcpy(secmodel->doi, p); -cleanup: + cleanup: virObjectUnref(caps); return ret; } @@ -5359,7 +5359,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, return fd; -error: + error: virDomainDefFree(def); VIR_FREE(xml); VIR_FORCE_CLOSE(fd); @@ -5470,7 +5470,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, ret = 0; -cleanup: + cleanup: virCommandFree(cmd); VIR_FREE(errbuf); if (virSecurityManagerRestoreSavedStateLabel(driver->securityManager, @@ -5537,7 +5537,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, vm = NULL; } -cleanup: + cleanup: virDomainDefFree(def); VIR_FORCE_CLOSE(fd); virFileWrapperFdFree(wrapperFd); @@ -5577,7 +5577,7 @@ qemuDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *path, ret = qemuDomainDefFormatXML(driver, def, flags); -cleanup: + cleanup: virDomainDefFree(def); VIR_FORCE_CLOSE(fd); return ret; @@ -5646,7 +5646,7 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, const char *path, ret = 0; -cleanup: + cleanup: virDomainDefFree(def); VIR_FORCE_CLOSE(fd); VIR_FREE(xml); @@ -5700,7 +5700,7 @@ qemuDomainObjRestore(virConnectPtr conn, if (virFileWrapperFdClose(wrapperFd) < 0) VIR_WARN("Failed to close %s", path); -cleanup: + cleanup: virDomainDefFree(def); VIR_FORCE_CLOSE(fd); virFileWrapperFdFree(wrapperFd); @@ -5749,7 +5749,7 @@ static char *qemuDomainGetXMLDesc(virDomainPtr dom, err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; goto cleanup; @@ -5767,7 +5767,7 @@ endjob: ret = qemuDomainFormatXML(driver, vm, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -5808,7 +5808,7 @@ static char *qemuConnectDomainXMLFromNative(virConnectPtr conn, xml = qemuDomainDefFormatXML(driver, def, VIR_DOMAIN_XML_INACTIVE); -cleanup: + cleanup: virDomainDefFree(def); virObjectUnref(caps); return xml; @@ -6000,7 +6000,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, ret = virCommandToString(cmd); -cleanup: + cleanup: virObjectUnref(qemuCaps); virCommandFree(cmd); @@ -6023,7 +6023,7 @@ static int qemuConnectListDefinedDomains(virConnectPtr conn, virConnectListDefinedDomainsCheckACL, conn); -cleanup: + cleanup: return ret; } @@ -6039,7 +6039,7 @@ static int qemuConnectNumOfDefinedDomains(virConnectPtr conn) virConnectNumOfDefinedDomainsCheckACL, conn); -cleanup: + cleanup: return ret; } @@ -6120,7 +6120,7 @@ qemuDomainObjStart(virConnectPtr conn, } } -cleanup: + cleanup: VIR_FREE(managed_save); return ret; } @@ -6159,11 +6159,11 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) ret = 0; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virNWFilterUnlockFilterUpdates(); @@ -6257,7 +6257,7 @@ static virDomainPtr qemuDomainDefineXML(virConnectPtr conn, const char *xml) dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; -cleanup: + cleanup: virDomainDefFree(oldDef); virDomainDefFree(def); if (vm) @@ -6354,7 +6354,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, ret = 0; -cleanup: + cleanup: VIR_FREE(name); if (vm) virObjectUnlock(vm); @@ -6600,7 +6600,7 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn, VIR_WARN("Failed to teardown cgroup for disk path %s", NULLSTR(virDomainDiskGetSource(disk))); -end: + end: virObjectUnref(caps); virDomainDeviceDefFree(dev_copy); return ret; @@ -7064,11 +7064,11 @@ static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, } } -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: virObjectUnref(qemuCaps); virDomainDefFree(vmdef); if (dev != dev_copy) @@ -7210,11 +7210,11 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, } } -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: virObjectUnref(qemuCaps); virDomainDefFree(vmdef); if (dev != dev_copy) @@ -7351,11 +7351,11 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, } } -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: virObjectUnref(qemuCaps); virDomainDefFree(vmdef); if (dev != dev_copy) @@ -7389,7 +7389,7 @@ static int qemuDomainGetAutostart(virDomainPtr dom, *autostart = vm->autostart; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -7453,7 +7453,7 @@ static int qemuDomainSetAutostart(virDomainPtr dom, } ret = 0; -cleanup: + cleanup: VIR_FREE(configFile); VIR_FREE(autostartLink); if (vm) @@ -7510,7 +7510,7 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom, ignore_value(VIR_STRDUP(ret, "posix")); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(cfg); @@ -7607,11 +7607,11 @@ qemuDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type, return 0; -error: + error: virReportError(VIR_ERR_INVALID_ARG, _("unable to parse blkio device '%s' '%s'"), type, blkioDeviceStr); -cleanup: + cleanup: virBlkioDeviceArrayClear(result, ndevices); VIR_FREE(result); return -1; @@ -7892,7 +7892,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, ret = -1; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -8324,7 +8324,7 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, *nparams = QEMU_NB_BLKIO_PARAM; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -8469,7 +8469,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, ret = 0; -cleanup: + cleanup: virObjectUnlock(vm); virObjectUnref(caps); virObjectUnref(cfg); @@ -8615,12 +8615,12 @@ qemuDomainGetMemoryParameters(virDomainPtr dom, } } -out: + out: if (QEMU_NB_MEM_PARAM < *nparams) *nparams = QEMU_NB_MEM_PARAM; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -8826,7 +8826,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -8928,7 +8928,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, *nparams = QEMU_NB_NUMA_PARAM; ret = 0; -cleanup: + cleanup: VIR_FREE(nodeset); if (vm) virObjectUnlock(vm); @@ -8965,7 +8965,7 @@ qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup, return 0; -cleanup: + cleanup: virCgroupFree(&cgroup_vcpu); return -1; } @@ -8993,7 +8993,7 @@ qemuSetEmulatorBandwidthLive(virDomainObjPtr vm, virCgroupPtr cgroup, virCgroupFree(&cgroup_emulator); return 0; -cleanup: + cleanup: virCgroupFree(&cgroup_emulator); return -1; } @@ -9169,7 +9169,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, ret = 0; -cleanup: + cleanup: virDomainDefFree(vmdef); if (vm) virObjectUnlock(vm); @@ -9232,10 +9232,10 @@ qemuGetVcpusBWLive(virDomainObjPtr vm, if (rc < 0) goto cleanup; -out: + out: ret = 0; -cleanup: + cleanup: virCgroupFree(&cgroup_vcpu); return ret; } @@ -9267,7 +9267,7 @@ qemuGetEmulatorBandwidthLive(virDomainObjPtr vm, virCgroupPtr cgroup, ret = 0; -cleanup: + cleanup: virCgroupFree(&cgroup_emulator); return ret; } @@ -9360,7 +9360,7 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom, goto cleanup; } -out: + out: if (virTypedParameterAssign(&params[0], VIR_DOMAIN_SCHEDULER_CPU_SHARES, VIR_TYPED_PARAM_ULLONG, shares) < 0) goto cleanup; @@ -9406,7 +9406,7 @@ out: ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -9498,11 +9498,11 @@ qemuDomainBlockResize(virDomainPtr dom, ret = 0; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: VIR_FREE(device); if (vm) virObjectUnlock(vm); @@ -9575,11 +9575,11 @@ qemuDomainBlockStats(virDomainPtr dom, &stats->errs); qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -9749,11 +9749,11 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, ret = 0; *nparams = tmp; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -9796,7 +9796,7 @@ qemuDomainInterfaceStats(virDomainPtr dom, virReportError(VIR_ERR_INVALID_ARG, _("invalid path, '%s' is not a known interface"), path); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -9979,7 +9979,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, } ret = 0; -cleanup: + cleanup: virNetDevBandwidthFree(bandwidth); virNetDevBandwidthFree(newBandwidth); if (vm) @@ -10101,7 +10101,7 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom, *nparams = QEMU_NB_BANDWIDTH_PARAM; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); @@ -10155,7 +10155,7 @@ qemuDomainMemoryStats(virDomainPtr dom, if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -10212,7 +10212,7 @@ qemuDomainBlockPeek(virDomainPtr dom, ret = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); if (vm) virObjectUnlock(vm); @@ -10294,11 +10294,11 @@ qemuDomainMemoryPeek(virDomainPtr dom, ret = 0; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); if (tmp) unlink(tmp); @@ -10466,7 +10466,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, ret = 0; } -cleanup: + cleanup: VIR_FREE(alias); virStorageFileFreeMetadata(meta); VIR_FORCE_CLOSE(fd); @@ -10505,7 +10505,7 @@ qemuConnectDomainEventRegister(virConnectPtr conn, ret = 0; -cleanup: + cleanup: return ret; } @@ -10527,7 +10527,7 @@ qemuConnectDomainEventDeregister(virConnectPtr conn, ret = 0; -cleanup: + cleanup: return ret; } @@ -10552,7 +10552,7 @@ qemuConnectDomainEventRegisterAny(virConnectPtr conn, callback, opaque, freecb, &ret) < 0) ret = -1; -cleanup: + cleanup: return ret; } @@ -10574,7 +10574,7 @@ qemuConnectDomainEventDeregisterAny(virConnectPtr conn, ret = 0; -cleanup: + cleanup: return ret; } @@ -10626,7 +10626,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, NULL, 0, NULL, NULL, /* No cookies in v2 */ st, &def, origname, flags); -cleanup: + cleanup: VIR_FREE(origname); virDomainDefFree(def); return ret; @@ -10686,7 +10686,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, uri_in, uri_out, &def, origname, NULL, flags); -cleanup: + cleanup: VIR_FREE(origname); virDomainDefFree(def); return ret; @@ -10740,7 +10740,7 @@ qemuDomainMigratePerform(virDomainPtr dom, NULL, NULL, /* No output cookies in v2 */ flags, dname, resource, false); -cleanup: + cleanup: return ret; } @@ -10779,7 +10779,7 @@ qemuDomainMigrateFinish2(virConnectPtr dconn, NULL, 0, NULL, NULL, /* No cookies */ flags, retcode, false); -cleanup: + cleanup: return dom; } @@ -10892,7 +10892,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, uri_in, uri_out, &def, origname, NULL, flags); -cleanup: + cleanup: VIR_FREE(origname); virDomainDefFree(def); return ret; @@ -10959,7 +10959,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, uri_in, uri_out, &def, origname, listenAddress, flags); -cleanup: + cleanup: VIR_FREE(origname); virDomainDefFree(def); virObjectUnref(cfg); @@ -11003,7 +11003,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, cookieout, cookieoutlen, st, &def, origname, flags); -cleanup: + cleanup: VIR_FREE(origname); virDomainDefFree(def); return ret; @@ -11056,7 +11056,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, cookieout, cookieoutlen, st, &def, origname, flags); -cleanup: + cleanup: VIR_FREE(origname); virDomainDefFree(def); return ret; @@ -11317,7 +11317,7 @@ qemuNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def, } ret = 0; -out: + out: return ret; } @@ -11394,7 +11394,7 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, } ret = virHostdevPCINodeDeviceDetach(hostdev_mgr, pci); -cleanup: + cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); VIR_FREE(xml); @@ -11439,7 +11439,7 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) ret = virHostdevPCINodeDeviceReAttach(hostdev_mgr, pci); virPCIDeviceFree(pci); -cleanup: + cleanup: virNodeDeviceDefFree(def); VIR_FREE(xml); return ret; @@ -11477,7 +11477,7 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) ret = virHostdevPCINodeDeviceReset(hostdev_mgr, pci); virPCIDeviceFree(pci); -cleanup: + cleanup: virNodeDeviceDefFree(def); VIR_FREE(xml); return ret; @@ -11508,7 +11508,7 @@ qemuConnectCompareCPU(virConnectPtr conn, ret = cpuCompareXML(caps->host.cpu, xmlDesc); } -cleanup: + cleanup: virObjectUnref(caps); return ret; } @@ -11529,7 +11529,7 @@ qemuConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, cpu = cpuBaselineXML(xmlCPUs, ncpus, NULL, 0, flags); -cleanup: + cleanup: return cpu; } @@ -11573,7 +11573,7 @@ static int qemuDomainGetJobInfo(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -11714,7 +11714,7 @@ qemuDomainGetJobStats(virDomainPtr dom, *nparams = npar; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (ret < 0) @@ -11764,11 +11764,11 @@ static int qemuDomainAbortJob(virDomainPtr dom) ret = qemuMonitorMigrateCancel(priv->mon); qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -11815,11 +11815,11 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, ret = qemuMonitorSetMigrationDowntime(priv->mon, downtime); qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -11870,11 +11870,11 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -11926,11 +11926,11 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -11974,7 +11974,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, if (ret == 0) priv->migMaxBandwidth = bandwidth; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; } else { @@ -11982,7 +11982,7 @@ endjob: ret = 0; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -12010,7 +12010,7 @@ qemuDomainMigrateGetMaxSpeed(virDomainPtr dom, *bandwidth = priv->migMaxBandwidth; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -12086,7 +12086,7 @@ qemuDomainPrepareDiskChainElement(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: disk->src.path = origsrc; disk->src.format = origformat; disk->backingChain = origchain; @@ -12235,7 +12235,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: virCommandFree(cmd); /* unlink images if creation has failed */ @@ -12313,7 +12313,7 @@ qemuDomainSnapshotCreateActiveInternal(virConnectPtr conn, vm = NULL; } -cleanup: + cleanup: if (resume && virDomainObjIsActive(vm) && qemuProcessStartCPUs(driver, vm, conn, VIR_DOMAIN_RUNNING_UNPAUSED, @@ -12327,7 +12327,7 @@ cleanup: } } -endjob: + endjob: if (vm && !qemuDomainObjEndJob(driver, vm)) { /* Only possible if a transient vm quit while our locks were down, * in which case we don't want to save snapshot metadata. */ @@ -12529,7 +12529,7 @@ qemuDomainSnapshotPrepareDiskExternal(virConnectPtr conn, ret = 0; -cleanup: + cleanup: virStorageFileFree(snapfile); return ret; } @@ -12725,7 +12725,7 @@ qemuDomainSnapshotPrepare(virConnectPtr conn, ret = 0; -cleanup: + cleanup: return ret; } @@ -12894,7 +12894,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, persistHosts = NULL; } -cleanup: + cleanup: if (need_unlink && virStorageFileUnlink(snapfile)) VIR_WARN("unable to unlink just-created %s", source); virStorageFileFree(snapfile); @@ -12961,7 +12961,7 @@ qemuDomainSnapshotUndoSingleDiskActive(virQEMUDriverPtr driver, origdisk->src.hosts); } -cleanup: + cleanup: virStorageFileFree(diskfile); VIR_FREE(source); VIR_FREE(persistSource); @@ -13072,7 +13072,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, } } -cleanup: + cleanup: if (ret == 0 || !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION)) { if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0 || @@ -13241,7 +13241,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, ret = 0; -endjob: + endjob: if (resume && vm && virDomainObjIsActive(vm) && qemuProcessStartCPUs(driver, vm, conn, VIR_DOMAIN_RUNNING_UNPAUSED, @@ -13274,7 +13274,7 @@ endjob: ret = -1; } -cleanup: + cleanup: VIR_FREE(xml); virObjectUnref(cfg); if (memory_unlink && ret < 0) @@ -13494,7 +13494,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, */ snapshot = virGetDomainSnapshot(domain, snap->def->name); -cleanup: + cleanup: if (vm) { if (snapshot && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) { if (qemuDomainSnapshotWriteMetadata(vm, snap, @@ -13548,7 +13548,7 @@ static int qemuDomainSnapshotListNames(virDomainPtr domain, char **names, n = virDomainSnapshotObjListGetNames(vm->snapshots, NULL, names, nameslen, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -13571,7 +13571,7 @@ static int qemuDomainSnapshotNum(virDomainPtr domain, n = virDomainSnapshotObjListNum(vm->snapshots, NULL, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -13595,7 +13595,7 @@ qemuDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, n = virDomainListSnapshots(vm->snapshots, NULL, domain, snaps, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -13626,7 +13626,7 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, n = virDomainSnapshotObjListGetNames(vm->snapshots, snap, names, nameslen, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -13654,7 +13654,7 @@ qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, n = virDomainSnapshotObjListNum(vm->snapshots, snap, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -13684,7 +13684,7 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, n = virDomainListSnapshots(vm->snapshots, snap, snapshot->domain, snaps, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -13711,7 +13711,7 @@ static virDomainSnapshotPtr qemuDomainSnapshotLookupByName(virDomainPtr domain, snapshot = virGetDomainSnapshot(domain, snap->def->name); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return snapshot; @@ -13733,7 +13733,7 @@ static int qemuDomainHasCurrentSnapshot(virDomainPtr domain, ret = (vm->current_snapshot != NULL); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -13767,7 +13767,7 @@ qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, parent = virGetDomainSnapshot(snapshot->domain, snap->def->parent); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return parent; @@ -13795,7 +13795,7 @@ static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, snapshot = virGetDomainSnapshot(domain, vm->current_snapshot->def->name); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return snapshot; @@ -13824,7 +13824,7 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, xml = virDomainSnapshotDefFormat(uuidstr, snap->def, flags, 0); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return xml; @@ -13852,7 +13852,7 @@ qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, ret = (vm->current_snapshot && STREQ(snapshot->name, vm->current_snapshot->def->name)); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -13883,7 +13883,7 @@ qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, * that, then we would have a reason to return 0 here. */ ret = 1; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -14214,11 +14214,11 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, ret = 0; -endjob: + endjob: if (vm && !qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm && ret == 0) { if (qemuDomainSnapshotWriteMetadata(vm, snap, cfg->snapshotDir) < 0) @@ -14380,11 +14380,11 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, ret = qemuDomainSnapshotDiscard(driver, vm, snap, true, metadata_only); } -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(cfg); @@ -14433,12 +14433,12 @@ static int qemuDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, ret = qemuMonitorArbitraryCommand(priv->mon, cmd, result, hmp); qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -14532,7 +14532,7 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: virDomainDefFree(def); virDomainChrSourceDefFree(monConfig); if (vm) @@ -14620,7 +14620,7 @@ qemuDomainOpenConsole(virDomainPtr dom, ret = -1; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -14695,7 +14695,7 @@ qemuDomainOpenChannel(virDomainPtr dom, ret = -1; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -14721,7 +14721,7 @@ qemuDiskPathToAlias(virDomainObjPtr vm, const char *path, int *idxret) return NULL; } -cleanup: + cleanup: if (!ret) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("No device found for specified path")); @@ -14859,7 +14859,7 @@ qemuDomainBlockPivot(virConnectPtr conn, disk->mirrorFormat = VIR_STORAGE_FILE_NONE; disk->mirroring = false; -cleanup: + cleanup: if (resume && virDomainObjIsActive(vm) && qemuProcessStartCPUs(driver, vm, conn, VIR_DOMAIN_RUNNING_UNPAUSED, @@ -15023,13 +15023,13 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, } } -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; goto cleanup; } -cleanup: + cleanup: VIR_FREE(device); if (vm) virObjectUnlock(vm); @@ -15244,7 +15244,7 @@ qemuDomainBlockCopy(virDomainObjPtr vm, disk->mirror = mirror; mirror = NULL; -endjob: + endjob: if (need_unlink && unlink(dest)) VIR_WARN("unable to unlink just-created %s", dest); if (ret < 0 && disk) @@ -15253,7 +15253,7 @@ endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: VIR_FREE(device); if (vm) virObjectUnlock(vm); @@ -15435,7 +15435,7 @@ qemuDomainBlockCommit(virDomainPtr dom, const char *path, const char *base, base ? base : base_canon, bandwidth); qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (ret < 0 && clean_access) { /* Revert access to read-only, if possible. */ qemuDomainPrepareDiskChainElement(driver, vm, disk, base_canon, @@ -15448,7 +15448,7 @@ endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: VIR_FREE(device); if (vm) virObjectUnlock(vm); @@ -15515,7 +15515,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -15693,11 +15693,11 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, } } -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: VIR_FREE(device); if (vm) virObjectUnlock(vm); @@ -15837,11 +15837,11 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, *nparams = QEMU_NB_BLOCK_IO_TUNE_PARAM; ret = 0; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: VIR_FREE(device); if (vm) virObjectUnlock(vm); @@ -15912,11 +15912,11 @@ qemuDomainGetDiskErrors(virDomainPtr dom, ret = n; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virHashFree(table); @@ -15958,7 +15958,7 @@ qemuDomainSetMetadata(virDomainPtr dom, ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps, driver->xmlopt, cfg->configDir, flags); -cleanup: + cleanup: virObjectUnlock(vm); virObjectUnref(caps); virObjectUnref(cfg); @@ -15987,7 +15987,7 @@ qemuDomainGetMetadata(virDomainPtr dom, ret = virDomainObjGetMetadata(vm, type, uri, caps, driver->xmlopt, flags); -cleanup: + cleanup: virObjectUnlock(vm); virObjectUnref(caps); return ret; @@ -16044,7 +16044,7 @@ getSumVcpuPercpuStats(virDomainObjPtr vm, } ret = 0; -cleanup: + cleanup: virCgroupFree(&group_vcpu); VIR_FREE(buf); return ret; @@ -16146,7 +16146,7 @@ qemuDomainGetPercpuStats(virDomainObjPtr vm, } rv = param_idx + 1; -cleanup: + cleanup: VIR_FREE(sum_cpu_time); VIR_FREE(buf); return rv; @@ -16195,7 +16195,7 @@ qemuDomainGetCPUStats(virDomainPtr domain, else ret = qemuDomainGetPercpuStats(vm, params, nparams, start_cpu, ncpus); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -16285,11 +16285,11 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, ret = qemuAgentSuspend(priv->agent, target); qemuDomainObjExitAgent(vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -16334,11 +16334,11 @@ qemuDomainPMWakeup(virDomainPtr dom, ret = qemuMonitorSystemWakeup(priv->mon); qemuDomainObjExitMonitor(driver, vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -16360,7 +16360,7 @@ qemuConnectListAllDomains(virConnectPtr conn, ret = virDomainObjListExport(driver->domains, conn, domains, virConnectListAllDomainsCheckACL, flags); -cleanup: + cleanup: return ret; } @@ -16410,11 +16410,11 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, if (ret < 0) VIR_FREE(result); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return result; @@ -16443,7 +16443,7 @@ qemuConnectDomainQemuMonitorEventRegister(virConnectPtr conn, &ret) < 0) ret = -1; -cleanup: + cleanup: return ret; } @@ -16464,7 +16464,7 @@ qemuConnectDomainQemuMonitorEventDeregister(virConnectPtr conn, ret = 0; -cleanup: + cleanup: return ret; } @@ -16519,11 +16519,11 @@ qemuDomainFSTrim(virDomainPtr dom, ret = qemuAgentFSTrim(priv->agent, minimum); qemuDomainObjExitAgent(vm); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index cdd4137..c5ba003 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -114,7 +114,7 @@ qemuHostdevHostSupportsPassthroughVFIO(void) ret = true; -cleanup: + cleanup: if (iommuDir) closedir(iommuDir); @@ -140,7 +140,7 @@ qemuHostdevHostSupportsPassthroughLegacy(void) ret = true; # endif -cleanup: + cleanup: VIR_FORCE_CLOSE(kvmfd); return ret; @@ -235,7 +235,7 @@ qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver, ret = virHostdevPreparePCIDevices(hostdev_mgr, QEMU_DRIVER_NAME, name, uuid, hostdevs, nhostdevs, flags); -out: + out: return ret; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b948f2c..19d96cb 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -153,7 +153,7 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, src, format); qemuDomainObjExitMonitor(driver, vm); } -audit: + audit: if (src) virDomainAuditDisk(vm, virDomainDiskGetSource(origdisk), src, "update", ret >= 0); @@ -176,12 +176,12 @@ audit: virDomainDiskDefFree(disk); -cleanup: + cleanup: VIR_FREE(driveAlias); virObjectUnref(cfg); return ret; -error: + error: if (virSecurityManagerRestoreImageLabel(driver->securityManager, vm->def, disk) < 0) VIR_WARN("Unable to restore security label on new media %s", src); @@ -229,7 +229,7 @@ qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: virHashFree(table); return ret; } @@ -337,13 +337,13 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, virDomainDiskInsertPreAlloced(vm->def, disk); -cleanup: + cleanup: VIR_FREE(devstr); VIR_FREE(drivestr); virObjectUnref(cfg); return ret; -error: + error: if (releaseaddr) qemuDomainReleaseDeviceAddress(vm, &disk->info, src); @@ -429,7 +429,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver, virDomainControllerInsertPreAlloced(vm->def, controller); } -cleanup: + cleanup: if (ret != 0 && releaseaddr) qemuDomainReleaseDeviceAddress(vm, &controller->info, NULL); @@ -590,13 +590,13 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn, virDomainDiskInsertPreAlloced(vm->def, disk); -cleanup: + cleanup: VIR_FREE(devstr); VIR_FREE(drivestr); virObjectUnref(cfg); return ret; -error: + error: if (virSecurityManagerRestoreImageLabel(driver->securityManager, vm->def, disk) < 0) VIR_WARN("Unable to restore security label on %s", src); @@ -684,13 +684,13 @@ qemuDomainAttachUSBMassstorageDevice(virConnectPtr conn, virDomainDiskInsertPreAlloced(vm->def, disk); -cleanup: + cleanup: VIR_FREE(devstr); VIR_FREE(drivestr); virObjectUnref(cfg); return ret; -error: + error: if (virSecurityManagerRestoreImageLabel(driver->securityManager, vm->def, disk) < 0) VIR_WARN("Unable to restore security label on %s", src); @@ -809,7 +809,7 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, NULLSTR(src)); } -end: + end: if (ret != 0) ignore_value(qemuRemoveSharedDevice(driver, dev, vm->def->name)); virObjectUnref(caps); @@ -1076,7 +1076,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, ret = 0; -cleanup: + cleanup: if (!ret) { vm->def->nets[vm->def->nnets++] = net; } else { @@ -1127,7 +1127,7 @@ cleanup: return ret; -try_remove: + try_remove: if (!virDomainObjIsActive(vm)) goto cleanup; @@ -1282,7 +1282,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, return 0; -error: + error: if (teardowncgroup && qemuTeardownHostdevCgroup(vm, hostdev) < 0) VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail"); if (teardownlabel && @@ -1299,7 +1299,7 @@ error: VIR_FREE(configfd_name); VIR_FORCE_CLOSE(configfd); -cleanup: + cleanup: virObjectUnref(cfg); return -1; } @@ -1341,7 +1341,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, return 0; -error: + error: VIR_FREE(devstr); return -1; @@ -1467,7 +1467,7 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, qemuDomainObjExitMonitor(driver, vm); ret = 0; -cleanup: + cleanup: if (ret < 0 && need_remove) qemuDomainChrRemove(vmdef, chr); VIR_FREE(charAlias); @@ -1526,7 +1526,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr driver, vm->def->hostdevs[vm->def->nhostdevs++] = hostdev; ret = 0; -cleanup: + cleanup: if (ret < 0) { if (teardowncgroup && qemuTeardownHostdevCgroup(vm, hostdev) < 0) VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail"); @@ -1622,7 +1622,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr driver, vm->def->hostdevs[vm->def->nhostdevs++] = hostdev; ret = 0; -cleanup: + cleanup: if (ret < 0) { qemuDomainReAttachHostSCSIDevices(driver, vm->def->name, &hostdev, 1); if (teardowncgroup && qemuTeardownHostdevCgroup(vm, hostdev) < 0) @@ -1676,7 +1676,7 @@ int qemuDomainAttachHostDevice(virQEMUDriverPtr driver, return 0; -error: + error: return -1; } @@ -1742,7 +1742,7 @@ qemuDomainNetGetBridgeName(virConnectPtr conn, virDomainNetDefPtr net) virDomainNetGetActualType(net)); } -cleanup: + cleanup: return brname; } @@ -1797,7 +1797,7 @@ qemuDomainChangeNetBridge(virConnectPtr conn, } /* caller will replace entire olddev with newdev in domain nets list */ ret = 0; -cleanup: + cleanup: VIR_FREE(oldbridge); VIR_FREE(newbridge); return ret; @@ -1865,7 +1865,7 @@ int qemuDomainChangeNetLinkState(virQEMUDriverPtr driver, /* modify the device configuration */ dev->linkstate = linkstate; -cleanup: + cleanup: qemuDomainObjExitMonitor(driver, vm); return ret; @@ -2226,7 +2226,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, } ret = 0; -cleanup: + cleanup: /* When we get here, we will be in one of these two states: * * 1) newdev has been moved into the domain's list of nets and @@ -2430,7 +2430,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, break; } -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -2894,7 +2894,7 @@ qemuDomainDetachVirtioDiskDevice(virQEMUDriverPtr driver, qemuDomainRemoveDiskDevice(driver, vm, detach); ret = 0; -cleanup: + cleanup: qemuDomainResetDeviceRemoval(vm); VIR_FREE(drivestr); return ret; @@ -2948,7 +2948,7 @@ qemuDomainDetachDiskDevice(virQEMUDriverPtr driver, qemuDomainRemoveDiskDevice(driver, vm, detach); ret = 0; -cleanup: + cleanup: qemuDomainResetDeviceRemoval(vm); VIR_FREE(drivestr); return ret; @@ -3134,7 +3134,7 @@ int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: qemuDomainResetDeviceRemoval(vm); return ret; } @@ -3251,7 +3251,7 @@ qemuDomainDetachHostSCSIDevice(virQEMUDriverPtr driver, } qemuDomainObjExitMonitor(driver, vm); -cleanup: + cleanup: VIR_FREE(drvstr); VIR_FREE(devstr); return ret; @@ -3457,7 +3457,7 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: qemuDomainResetDeviceRemoval(vm); VIR_FREE(hostnet_name); return ret; @@ -3527,9 +3527,9 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, } } -end_job: + end_job: qemuDomainObjExitMonitor(driver, vm); -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -3553,7 +3553,7 @@ int qemuDomainAttachLease(virQEMUDriverPtr driver, virDomainLeaseInsertPreAlloced(vm->def, lease); ret = 0; -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -3621,7 +3621,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver, qemuDomainRemoveChrDevice(driver, vm, tmpChr); ret = 0; -cleanup: + cleanup: qemuDomainResetDeviceRemoval(vm); VIR_FREE(devstr); VIR_FREE(charAlias); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fc8ff3d..4732b64 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -268,7 +268,7 @@ qemuDomainExtractTLSSubject(const char *certdir) return subject; -error: + error: VIR_FREE(certfile); VIR_FREE(pemdata); return NULL; @@ -320,7 +320,7 @@ qemuMigrationCookieGraphicsAlloc(virQEMUDriverPtr driver, virObjectUnref(cfg); return mig; -error: + error: qemuMigrationCookieGraphicsFree(mig); virObjectUnref(cfg); return NULL; @@ -373,7 +373,7 @@ qemuMigrationCookieNetworkAlloc(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, } return mig; -error: + error: qemuMigrationCookieNetworkFree(mig); return NULL; } @@ -406,7 +406,7 @@ qemuMigrationCookieNew(virDomainObjPtr dom) return mig; -error: + error: qemuMigrationCookieFree(mig); return NULL; } @@ -719,7 +719,7 @@ qemuMigrationCookieGraphicsXMLParse(xmlXPathContextPtr ctxt) return grap; -error: + error: qemuMigrationCookieGraphicsFree(grap); return NULL; } @@ -763,11 +763,11 @@ qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr ctxt) VIR_FREE(interfaces); -cleanup: + cleanup: ctxt->node = save_ctxt; return optr; -error: + error: VIR_FREE(interfaces); qemuMigrationCookieNetworkFree(optr); optr = NULL; @@ -953,7 +953,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, virObjectUnref(caps); return 0; -error: + error: VIR_FREE(tmp); VIR_FREE(nodes); virObjectUnref(caps); @@ -978,7 +978,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookiePtr mig, ret = qemuMigrationCookieXMLParse(mig, driver, doc, ctxt, flags); -cleanup: + cleanup: xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); @@ -1080,7 +1080,7 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, return mig; -error: + error: qemuMigrationCookieFree(mig); return NULL; } @@ -1188,7 +1188,7 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, priv->nbdPort = port; ret = 0; -cleanup: + cleanup: VIR_FREE(diskAlias); if (ret < 0) virPortAllocatorRelease(driver->remotePorts, port); @@ -1337,13 +1337,13 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, QEMU_MONITOR_MIGRATE_NON_SHARED_INC); ret = 0; -cleanup: + cleanup: VIR_FREE(diskAlias); VIR_FREE(nbd_dest); VIR_FREE(hoststr); return ret; -error: + error: /* don't overwrite any errors */ err = virSaveLastError(); /* cancel any outstanding jobs */ @@ -1432,7 +1432,7 @@ qemuMigrationCancelDriveMirror(qemuMigrationCookiePtr mig, qemuDomainObjExitMonitor(driver, vm); } -cleanup: + cleanup: VIR_FREE(diskAlias); return; } @@ -1617,7 +1617,7 @@ qemuMigrationSetCompression(virQEMUDriverPtr driver, priv->mon, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE); -cleanup: + cleanup: qemuDomainObjExitMonitor(driver, vm); return ret; } @@ -1651,7 +1651,7 @@ qemuMigrationSetAutoConverge(virQEMUDriverPtr driver, priv->mon, QEMU_MONITOR_MIGRATION_CAPS_AUTO_CONVERGE); -cleanup: + cleanup: qemuDomainObjExitMonitor(driver, vm); return ret; } @@ -1834,13 +1834,13 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, virDomainObjPtr vm, virObjectLock(vm); } -cleanup: + cleanup: if (priv->job.info.type == VIR_DOMAIN_JOB_COMPLETED) return 0; else return -1; -cancel: + cancel: if (virDomainObjIsActive(vm)) { if (qemuDomainObjEnterMonitorAsync(driver, vm, priv->job.asyncJob) == 0) { @@ -1938,7 +1938,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, qemuDomainObjExitMonitor(driver, vm); } -cleanup: + cleanup: virURIFree(uri); return ret; } @@ -1976,7 +1976,7 @@ qemuDomainMigrateOPDRelocate(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, } ret = 0; -cleanup: + cleanup: return ret; } @@ -2039,7 +2039,7 @@ qemuMigrationCleanup(virDomainObjPtr vm, ; } -cleanup: + cleanup: return vm; } @@ -2138,7 +2138,7 @@ static char rv = qemuDomainDefFormatLive(driver, vm->def, false, true); } -cleanup: + cleanup: qemuMigrationCookieFree(mig); virObjectUnref(caps); virDomainDefFree(def); @@ -2208,12 +2208,12 @@ qemuMigrationBegin(virConnectPtr conn, goto endjob; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return xml; -endjob: + endjob: if ((flags & VIR_MIGRATE_CHANGE_PROTECTION)) { if (qemuMigrationJobFinish(driver, vm) == 0) vm = NULL; @@ -2497,7 +2497,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, VIR_DEBUG("Received no lockstate"); } -done: + done: if (flags & VIR_MIGRATE_OFFLINE) cookieFlags = 0; else @@ -2547,7 +2547,7 @@ done: priv->migrationPort = port; ret = 0; -cleanup: + cleanup: VIR_FREE(migrateFrom); VIR_FREE(xmlout); VIR_FORCE_CLOSE(dataFD[0]); @@ -2568,11 +2568,11 @@ cleanup: virObjectUnref(caps); return ret; -stop: + stop: virDomainAuditStart(vm, "migrated", false); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0); -endjob: + endjob: if (!qemuMigrationJobFinish(driver, vm)) { vm = NULL; } @@ -2743,7 +2743,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, def, origname, NULL, port, autoPort, listenAddress, flags); -cleanup: + cleanup: virURIFree(uri); VIR_FREE(hostname); if (ret != 0) { @@ -2787,7 +2787,7 @@ qemuMigrationPrepareDef(virQEMUDriverPtr driver, } } -cleanup: + cleanup: virObjectUnref(caps); if (def && origname) *origname = name; @@ -2861,11 +2861,11 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver, } } -done: + done: qemuMigrationCookieFree(mig); rv = 0; -cleanup: + cleanup: if (event) qemuDomainEventQueue(driver, event); virObjectUnref(cfg); @@ -2913,7 +2913,7 @@ qemuMigrationConfirm(virConnectPtr conn, vm = NULL; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(cfg); @@ -3058,7 +3058,7 @@ static void qemuMigrationIOFunc(void *arg) return; -abrt: + abrt: err = virSaveLastError(); if (err && err->code == VIR_ERR_OK) { virFreeError(err); @@ -3070,7 +3070,7 @@ abrt: virFreeError(err); } -error: + error: virCopyLastError(&data->err); virResetLastError(); VIR_FREE(buffer); @@ -3108,7 +3108,7 @@ qemuMigrationStartTunnel(virStreamPtr st, return io; -error: + error: VIR_FORCE_CLOSE(wakeupFD[0]); VIR_FORCE_CLOSE(wakeupFD[1]); VIR_FREE(io); @@ -3142,7 +3142,7 @@ qemuMigrationStopTunnel(qemuMigrationIOThreadPtr io, bool error) rv = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(io->wakeupSendFD); VIR_FORCE_CLOSE(io->wakeupRecvFD); VIR_FREE(io); @@ -3185,7 +3185,7 @@ qemuMigrationConnect(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: VIR_FREE(port); if (ret < 0) VIR_FORCE_CLOSE(spec->dest.fd.qemu); @@ -3391,7 +3391,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: if (ret < 0 && !orig_err) orig_err = virSaveLastError(); @@ -3422,7 +3422,7 @@ cleanup: return ret; -cancel: + cancel: orig_err = virSaveLastError(); if (virDomainObjIsActive(vm)) { @@ -3574,7 +3574,7 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, cookieoutlen, flags, resource, &spec, dconn, graphicsuri); -cleanup: + cleanup: if (spec.destType == MIGRATION_DEST_FD) { VIR_FORCE_CLOSE(spec.dest.fd.qemu); VIR_FORCE_CLOSE(spec.dest.fd.local); @@ -3698,7 +3698,7 @@ static int doPeer2PeerMigrate2(virQEMUDriverPtr driver, */ cancelled = ret < 0; -finish: + finish: /* In version 2 of the migration protocol, we pass the * status code from the sender to the destination host, * so it can do any cleanup if the migration failed. @@ -3713,7 +3713,7 @@ finish: if (cancelled && ddomain) VIR_ERROR(_("finish step ignored that migration was cancelled")); -cleanup: + cleanup: if (ddomain) { virObjectUnref(ddomain); ret = 0; @@ -3922,7 +3922,7 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, */ cancelled = ret < 0; -finish: + finish: /* * The status code from the source is passed to the destination. * The dest can cleanup in the source indicated it failed to @@ -4128,7 +4128,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, dconnuri, flags, dname, resource); } -cleanup: + cleanup: orig_err = virSaveLastError(); qemuDomainObjEnterRemote(vm); virObjectUnref(dconn); @@ -4214,7 +4214,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, VIR_DOMAIN_EVENT_STOPPED_MIGRATED); } -endjob: + endjob: if (ret < 0) orig_err = virSaveLastError(); @@ -4240,7 +4240,7 @@ endjob: virFreeError(orig_err); } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) @@ -4300,7 +4300,7 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver, qemuMigrationCleanup) < 0) goto endjob; -endjob: + endjob: if (ret < 0) hasrefs = qemuMigrationJobFinish(driver, vm); else @@ -4312,7 +4312,7 @@ endjob: vm = NULL; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) @@ -4418,7 +4418,7 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) return 0; -err_exit: + err_exit: for (i = 0; last_good_net != -1 && i < last_good_net; i++) { net = def->nets[i]; if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { @@ -4634,7 +4634,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, 0) < 0) VIR_WARN("Unable to encode migration cookie"); -endjob: + endjob: if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; } else if (!vm->persistent && !virDomainObjIsActive(vm)) { @@ -4642,7 +4642,7 @@ endjob: vm = NULL; } -cleanup: + cleanup: virPortAllocatorRelease(driver->migrationPorts, port); if (vm) { VIR_FREE(priv->origname); @@ -4787,7 +4787,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, ret = 0; -cleanup: + cleanup: /* Restore max migration bandwidth */ if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5a3210b..205002b 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -319,7 +319,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) return monfd; -error: + error: VIR_FORCE_CLOSE(monfd); return -1; } @@ -357,12 +357,12 @@ qemuMonitorGetErrorFromLog(qemuMonitorPtr mon) if ((len = qemuProcessReadLog(mon->logfd, logbuf, 4096 - 1, 0, true)) <= 0) goto error; -cleanup: + cleanup: errno = orig_errno; VIR_FORCE_CLOSE(mon->logfd); return logbuf; -error: + error: VIR_FREE(logbuf); goto cleanup; } @@ -830,7 +830,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm, return mon; -cleanup: + cleanup: /* We don't want the 'destroy' callback invoked during * cleanup from construction failure, because that can * give a double-unref on virDomainObjPtr in the caller, @@ -985,7 +985,7 @@ int qemuMonitorSend(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: mon->msg = NULL; qemuMonitorUpdateWatch(mon); @@ -1108,7 +1108,7 @@ qemuMonitorFindBalloonObjectPath(qemuMonitorPtr mon, } } -cleanup: + cleanup: for (i = 0; i < npaths; i++) qemuMonitorJSONListPathFree(paths[i]); VIR_FREE(paths); @@ -1141,7 +1141,7 @@ int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, ret = qemuMonitorTextCommandWithFd(mon, cmd, scm_fd, reply); } -cleanup: + cleanup: VIR_FREE(json_cmd); return ret; } @@ -1403,7 +1403,7 @@ int qemuMonitorSetCapabilities(qemuMonitorPtr mon) ret = 0; } -cleanup: + cleanup: return ret; } @@ -2251,7 +2251,7 @@ int qemuMonitorMigrateToCommand(qemuMonitorPtr mon, else ret = qemuMonitorTextMigrate(mon, flags, dest); -cleanup: + cleanup: VIR_FREE(argstr); VIR_FREE(dest); return ret; @@ -2316,7 +2316,7 @@ int qemuMonitorMigrateToFile(qemuMonitorPtr mon, else ret = qemuMonitorTextMigrate(mon, flags, dest); -cleanup: + cleanup: VIR_FREE(safe_target); VIR_FREE(argstr); VIR_FREE(dest); @@ -2661,7 +2661,7 @@ int qemuMonitorCloseFileHandle(qemuMonitorPtr mon, else ret = qemuMonitorTextCloseFileHandle(mon, fdname); -cleanup: + cleanup: if (error) { virSetError(error); virFreeError(error); @@ -2733,7 +2733,7 @@ qemuMonitorRemoveFd(qemuMonitorPtr mon, int fdset, int fd) virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("remove fd requires JSON monitor")); -cleanup: + cleanup: if (error) { virSetError(error); virFreeError(error); @@ -2776,7 +2776,7 @@ int qemuMonitorAddHostNetwork(qemuMonitorPtr mon, else ret = qemuMonitorTextAddHostNetwork(mon, netstr); -cleanup: + cleanup: if (ret < 0) { while (i--) { if (qemuMonitorCloseFileHandle(mon, tapfdName[i]) < 0) @@ -2848,7 +2848,7 @@ int qemuMonitorAddNetdev(qemuMonitorPtr mon, else ret = qemuMonitorTextAddNetdev(mon, netdevstr); -cleanup: + cleanup: if (ret < 0) { while (i--) { if (qemuMonitorCloseFileHandle(mon, tapfdName[i]) < 0) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e167df4..a692a07 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -211,7 +211,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, _("Unknown JSON reply '%s'"), line); } -cleanup: + cleanup: virJSONValueFree(obj); return ret; } @@ -301,7 +301,7 @@ qemuMonitorJSONCommandWithFd(qemuMonitorPtr mon, } } -cleanup: + cleanup: VIR_FREE(id); VIR_FREE(cmdstr); VIR_FREE(msg.txBuffer); @@ -524,7 +524,7 @@ qemuMonitorJSONMakeCommandRaw(bool wrap, const char *cmdname, ...) return obj; -error: + error: virJSONValueFree(obj); virJSONValueFree(jargs); va_end(args); @@ -582,7 +582,7 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) qemuFreeKeywords(nkeywords, keywords, values); return ret; -error: + error: qemuFreeKeywords(nkeywords, keywords, values); virJSONValueFree(ret); return NULL; @@ -857,7 +857,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, break; } -out: + out: qemuMonitorEmitBlockJob(mon, device, type, event); } @@ -1002,7 +1002,7 @@ qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1135,7 +1135,7 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1261,7 +1261,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, threads = NULL; ret = ncpus; -cleanup: + cleanup: VIR_FREE(threads); return ret; } @@ -1333,7 +1333,7 @@ int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon, *virtType = VIR_DOMAIN_VIRT_KVM; } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1392,7 +1392,7 @@ int qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, } } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1498,7 +1498,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, VIR_DOMAIN_MEMORY_STAT_AVAILABLE, 1024); -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); @@ -1622,7 +1622,7 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1782,7 +1782,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, } ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1856,7 +1856,7 @@ int qemuMonitorJSONGetBlockStatsParamsNumber(qemuMonitorPtr mon, *nparams = num; ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1951,7 +1951,7 @@ int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon, } ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1985,7 +1985,7 @@ int qemuMonitorJSONBlockResize(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -2041,7 +2041,7 @@ int qemuMonitorJSONSetPassword(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -2072,7 +2072,7 @@ int qemuMonitorJSONExpirePassword(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -2109,7 +2109,7 @@ int qemuMonitorJSONSetBalloon(qemuMonitorPtr mon, ret = 1; } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -2150,12 +2150,12 @@ int qemuMonitorJSONSetCPU(qemuMonitorPtr mon, if (ret == 0) ret = 1; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; -fallback: + fallback: VIR_DEBUG("no QMP support for cpu_set, trying HMP"); ret = qemuMonitorTextSetCPU(mon, cpu, online); goto cleanup; @@ -2342,7 +2342,7 @@ qemuMonitorJSONGetMigrationCacheSize(qemuMonitorPtr mon, } ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -2716,7 +2716,7 @@ qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitorPtr mon, ret = 0; } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -2944,12 +2944,12 @@ qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name) } } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; -error: + error: /* Best effort cleanup - kill the entire fdset (even if it has * earlier successful fd registrations), since we don't know which * fd qemu got, and don't want to leave the fd leaked in qemu. */ @@ -3007,7 +3007,7 @@ int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon, if (ret == 0) ret = qemuMonitorJSONCheckError(cmd, reply); -cleanup: + cleanup: virJSONValueFree(args); virJSONValueFree(cmd); virJSONValueFree(reply); @@ -3104,7 +3104,7 @@ static int qemuMonitorJSONExtractPtyPaths(virJSONValuePtr reply, ret = 0; -cleanup: + cleanup: return ret; } @@ -3202,7 +3202,7 @@ int qemuMonitorJSONAddDevice(qemuMonitorPtr mon, if (ret == 0) ret = qemuMonitorJSONCheckError(cmd, reply); -cleanup: + cleanup: virJSONValueFree(args); virJSONValueFree(cmd); virJSONValueFree(reply); @@ -3322,7 +3322,7 @@ qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, virJSONValuePtr actions, ret = qemuMonitorJSONCheckError(cmd, reply); } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -3357,7 +3357,7 @@ qemuMonitorJSONDriveMirror(qemuMonitorPtr mon, goto cleanup; ret = qemuMonitorJSONCheckError(cmd, reply); -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -3384,7 +3384,7 @@ qemuMonitorJSONTransaction(qemuMonitorPtr mon, virJSONValuePtr actions) ret = qemuMonitorJSONCheckError(cmd, reply); -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); actions->protect = protect; @@ -3414,7 +3414,7 @@ qemuMonitorJSONBlockCommit(qemuMonitorPtr mon, const char *device, goto cleanup; ret = qemuMonitorJSONCheckError(cmd, reply); -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -3439,7 +3439,7 @@ qemuMonitorJSONDrivePivot(qemuMonitorPtr mon, const char *device, goto cleanup; ret = qemuMonitorJSONCheckError(cmd, reply); -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -3470,7 +3470,7 @@ int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); @@ -3497,7 +3497,7 @@ int qemuMonitorJSONInjectNMI(qemuMonitorPtr mon) ret = qemuMonitorJSONCheckError(cmd, reply); } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -3565,7 +3565,7 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); } -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); virJSONValueFree(keys); @@ -3898,7 +3898,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result, } ret = 0; -cleanup: + cleanup: return ret; } #undef GET_THROTTLE_STATS @@ -4070,7 +4070,7 @@ int qemuMonitorJSONGetVersion(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -4165,7 +4165,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, ret = n; *machines = infolist; -cleanup: + cleanup: if (ret < 0 && infolist) { for (i = 0; i < n; i++) qemuMonitorMachineInfoFree(infolist[i]); @@ -4248,7 +4248,7 @@ int qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, ret = n; *cpus = cpulist; -cleanup: + cleanup: if (ret < 0) virStringFreeList(cpulist); virJSONValueFree(cmd); @@ -4316,7 +4316,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, ret = n; *commands = commandlist; -cleanup: + cleanup: if (ret < 0) virStringFreeList(commandlist); virJSONValueFree(cmd); @@ -4389,7 +4389,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, ret = n; *events = eventlist; -cleanup: + cleanup: if (ret < 0) virStringFreeList(eventlist); virJSONValueFree(cmd); @@ -4502,7 +4502,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, ret = n; *params = paramlist; -cleanup: + cleanup: /* If we failed before getting the JSON array of options, we (try) * to cache an empty array to speed up the next failure. */ if (!qemuMonitorGetOptions(mon)) @@ -4560,7 +4560,7 @@ int qemuMonitorJSONGetKVMState(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -4626,7 +4626,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, ret = n; *types = typelist; -cleanup: + cleanup: if (ret < 0) virStringFreeList(typelist); virJSONValueFree(cmd); @@ -4713,7 +4713,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, ret = n; *paths = pathlist; -cleanup: + cleanup: if (ret < 0 && pathlist) { for (i = 0; i < n; i++) qemuMonitorJSONListPathFree(pathlist[i]); @@ -4811,7 +4811,7 @@ int qemuMonitorJSONGetObjectProperty(qemuMonitorPtr mon, } ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); @@ -4872,7 +4872,7 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mon, if ((ret = qemuMonitorJSONCommand(mon, cmd, &reply)) == 0) ret = qemuMonitorJSONCheckError(cmd, reply); -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); @@ -4948,7 +4948,7 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, ret = n; *props = proplist; -cleanup: + cleanup: if (ret < 0) virStringFreeList(proplist); virJSONValueFree(cmd); @@ -4992,7 +4992,7 @@ qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon) ignore_value(VIR_STRDUP(ret, arch)); -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -5057,7 +5057,7 @@ qemuMonitorJSONGetMigrationCapability(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -5107,7 +5107,7 @@ qemuMonitorJSONSetMigrationCapability(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); -cleanup: + cleanup: virJSONValueFree(caps); virJSONValueFree(cap); virJSONValueFree(cmd); @@ -5134,7 +5134,7 @@ qemuMonitorJSONBuildInetSocketAddress(const char *host, goto error; return addr; -error: + error: virJSONValueFree(data); virJSONValueFree(addr); return NULL; @@ -5156,7 +5156,7 @@ qemuMonitorJSONBuildUnixSocketAddress(const char *path) goto error; return addr; -error: + error: virReportOOMError(); virJSONValueFree(data); virJSONValueFree(addr); @@ -5196,7 +5196,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(port_str); virJSONValueFree(reply); virJSONValueFree(cmd); @@ -5318,7 +5318,7 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, ret = n; *array = list; -cleanup: + cleanup: if (ret < 0) virStringFreeList(list); virJSONValueFree(cmd); @@ -5443,9 +5443,9 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, return ret; -no_memory: + no_memory: virReportOOMError(); -error: + error: virJSONValueFree(addr); virJSONValueFree(data); virJSONValueFree(backend); @@ -5493,7 +5493,7 @@ qemuMonitorJSONAttachCharDev(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -5553,7 +5553,7 @@ qemuMonitorJSONGetDeviceAliases(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: for (i = 0; i < n; i++) qemuMonitorJSONListPathFree(paths[i]); VIR_FREE(paths); @@ -5708,7 +5708,7 @@ qemuMonitorJSONGetCPUx86Data(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); virCPUx86DataFree(x86Data); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 558f93c..ad63140 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -430,7 +430,7 @@ qemuMonitorTextGetStatus(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(reply); return ret; } @@ -486,7 +486,7 @@ qemuMonitorTextSetLink(qemuMonitorPtr mon, VIR_FREE(cmd); return 0; -error: + error: VIR_FREE(info); VIR_FREE(cmd); @@ -556,7 +556,7 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, *pids = cpupids; return ncpupids; -error: + error: VIR_FREE(qemucpus); VIR_FREE(cpupids); @@ -707,7 +707,7 @@ int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon, ret = 0; } -cleanup: + cleanup: VIR_FREE(reply); return ret; } @@ -834,7 +834,7 @@ int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(info); VIR_FREE(reply); return ret; @@ -1071,7 +1071,7 @@ int qemuMonitorTextBlockResize(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -1145,7 +1145,7 @@ int qemuMonitorTextSetPassword(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(reply); VIR_FREE(cmd); return ret; @@ -1174,7 +1174,7 @@ int qemuMonitorTextExpirePassword(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(reply); VIR_FREE(cmd); return ret; @@ -1276,7 +1276,7 @@ int qemuMonitorTextEjectMedia(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(reply); VIR_FREE(cmd); return ret; @@ -1320,7 +1320,7 @@ int qemuMonitorTextChangeMedia(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(reply); VIR_FREE(cmd); VIR_FREE(safepath); @@ -1351,7 +1351,7 @@ static int qemuMonitorTextSaveMemory(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); VIR_FREE(safepath); @@ -1391,7 +1391,7 @@ int qemuMonitorTextSetMigrationSpeed(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(info); VIR_FREE(cmd); return ret; @@ -1413,7 +1413,7 @@ int qemuMonitorTextSetMigrationDowntime(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(info); VIR_FREE(cmd); return ret; @@ -1545,10 +1545,10 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon, } } -done: + done: ret = 0; -cleanup: + cleanup: VIR_FREE(reply); if (ret < 0) memset(status, 0, sizeof(*status)); @@ -1607,7 +1607,7 @@ int qemuMonitorTextMigrate(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(extrastr); VIR_FREE(safedest); VIR_FREE(info); @@ -1681,7 +1681,7 @@ int qemuMonitorTextAddUSBDisk(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(safepath); VIR_FREE(info); @@ -1712,7 +1712,7 @@ static int qemuMonitorTextAddUSBDevice(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -1848,7 +1848,7 @@ int qemuMonitorTextAddPCIHostDevice(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -1870,7 +1870,7 @@ int qemuMonitorTextAddPCIDisk(qemuMonitorPtr mon, if (!safe_path) return -1; -try_command: + try_command: if (virAsprintf(&cmd, "pci_add %s storage file=%s,if=%s", (tryOldSyntax ? "0": "pci_addr=auto"), safe_path, bus) < 0) goto cleanup; @@ -1893,7 +1893,7 @@ try_command: ret = 0; -cleanup: + cleanup: VIR_FREE(safe_path); VIR_FREE(cmd); VIR_FREE(reply); @@ -1923,7 +1923,7 @@ int qemuMonitorTextAddPCINetwork(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(reply); VIR_FREE(cmd); return ret; @@ -1938,7 +1938,7 @@ int qemuMonitorTextRemovePCIDevice(qemuMonitorPtr mon, bool tryOldSyntax = false; int ret = -1; -try_command: + try_command: if (tryOldSyntax) { if (virAsprintf(&cmd, "pci_del 0 %.2x", guestAddr->slot) < 0) goto cleanup; @@ -1974,7 +1974,7 @@ try_command: ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -2013,7 +2013,7 @@ int qemuMonitorTextSendFileHandle(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -2044,7 +2044,7 @@ int qemuMonitorTextCloseFileHandle(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -2073,7 +2073,7 @@ int qemuMonitorTextAddHostNetwork(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -2098,7 +2098,7 @@ int qemuMonitorTextRemoveHostNetwork(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -2122,7 +2122,7 @@ int qemuMonitorTextAddNetdev(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -2146,7 +2146,7 @@ int qemuMonitorTextRemoveNetdev(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -2229,7 +2229,7 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(reply); return ret; } @@ -2244,7 +2244,7 @@ int qemuMonitorTextAttachPCIDiskController(qemuMonitorPtr mon, bool tryOldSyntax = false; int ret = -1; -try_command: + try_command: if (virAsprintf(&cmd, "pci_add %s storage if=%s", (tryOldSyntax ? "0": "pci_addr=auto"), bus) < 0) goto cleanup; @@ -2267,7 +2267,7 @@ try_command: ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -2334,7 +2334,7 @@ int qemuMonitorTextAttachDrive(qemuMonitorPtr mon, if (!safe_str) return -1; -try_command: + try_command: if (virAsprintf(&cmd, "drive_add %s%.2x:%.2x:%.2x %s", (tryOldSyntax ? "" : "pci_addr="), controllerAddr->domain, controllerAddr->bus, @@ -2364,7 +2364,7 @@ try_command: ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); VIR_FREE(safe_str); @@ -2487,7 +2487,7 @@ int qemuMonitorTextGetAllPCIAddresses(qemuMonitorPtr mon, return naddrs; -error: + error: VIR_FREE(addrs); VIR_FREE(reply); return -1; @@ -2524,7 +2524,7 @@ int qemuMonitorTextDelDevice(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); VIR_FREE(safedev); @@ -2567,7 +2567,7 @@ int qemuMonitorTextAddDevice(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); VIR_FREE(safedev); @@ -2609,7 +2609,7 @@ int qemuMonitorTextAddDrive(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); VIR_FREE(safe_str); @@ -2655,7 +2655,7 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); VIR_FREE(safedev); @@ -2694,7 +2694,7 @@ int qemuMonitorTextSetDrivePassphrase(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); VIR_FREE(safe_str); @@ -2737,7 +2737,7 @@ int qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, const char *name) ret = 0; -cleanup: + cleanup: VIR_FREE(safename); VIR_FREE(cmd); VIR_FREE(reply); @@ -2790,7 +2790,7 @@ int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, const char *name) ret = 0; -cleanup: + cleanup: VIR_FREE(safename); VIR_FREE(cmd); VIR_FREE(reply); @@ -2827,7 +2827,7 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, const char *name) ret = 0; -cleanup: + cleanup: VIR_FREE(safename); VIR_FREE(cmd); VIR_FREE(reply); @@ -2918,7 +2918,7 @@ int qemuMonitorTextSendKey(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(reply); return ret; @@ -2944,7 +2944,7 @@ int qemuMonitorTextScreendump(qemuMonitorPtr mon, const char *file) ret = 0; -cleanup: + cleanup: VIR_FREE(reply); VIR_FREE(cmd); return ret; @@ -2971,7 +2971,7 @@ int qemuMonitorTextOpenGraphics(qemuMonitorPtr mon, ret = 0; -cleanup: + cleanup: VIR_FREE(reply); VIR_FREE(cmd); return ret; @@ -3005,7 +3005,7 @@ int qemuMonitorTextSetBlockIoThrottle(qemuMonitorPtr mon, } ret = 0; -cleanup: + cleanup: VIR_FREE(cmd); VIR_FREE(result); return ret; @@ -3082,7 +3082,7 @@ qemuMonitorTextParseBlockIoThrottle(const char *result, virReportError(VIR_ERR_INVALID_ARG, _("No info for device '%s'"), device); -cleanup: + cleanup: return ret; } @@ -3105,7 +3105,7 @@ int qemuMonitorTextGetBlockIoThrottle(qemuMonitorPtr mon, ret = qemuMonitorTextParseBlockIoThrottle(result, device, reply); -cleanup: + cleanup: VIR_FREE(result); return ret; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 96dc66b..583ff76 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -107,7 +107,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); ret = 0; -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -151,7 +151,7 @@ qemuProcessHandleAgentEOF(qemuAgentPtr agent, qemuAgentClose(agent); return; -unlock: + unlock: virObjectUnlock(vm); return; } @@ -276,7 +276,7 @@ qemuConnectAgent(virQEMUDriverPtr driver, virDomainObjPtr vm) ret = 0; -cleanup: + cleanup: return ret; } @@ -334,10 +334,10 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED, goto cleanup; } -unlock: + unlock: virObjectUnlock(vm); -cleanup: + cleanup: if (event) qemuDomainEventQueue(driver, event); } @@ -488,7 +488,7 @@ qemuProcessGetVolumeQcowPassphrase(virConnectPtr conn, ret = 0; -cleanup: + cleanup: return ret; } @@ -512,7 +512,7 @@ qemuProcessFindVolumeQcowPassphrase(qemuMonitorPtr mon ATTRIBUTE_UNUSED, ret = qemuProcessGetVolumeQcowPassphrase(conn, disk, secretRet, secretLen); -cleanup: + cleanup: virObjectUnlock(vm); return ret; } @@ -608,11 +608,11 @@ qemuProcessFakeReboot(void *opaque) ret = 0; -endjob: + endjob: if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -cleanup: + cleanup: if (vm) { if (ret == -1) { ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE)); @@ -722,7 +722,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, qemuProcessShutdownOrReboot(driver, vm); -unlock: + unlock: virObjectUnlock(vm); if (event) qemuDomainEventQueue(driver, event); @@ -769,7 +769,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } } -unlock: + unlock: virObjectUnlock(vm); if (event) qemuDomainEventQueue(driver, event); @@ -823,7 +823,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } } -unlock: + unlock: virObjectUnlock(vm); if (event) qemuDomainEventQueue(driver, event); @@ -1109,7 +1109,7 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED, return 0; -error: + error: if (localAddr) { VIR_FREE(localAddr->service); VIR_FREE(localAddr->node); @@ -1354,7 +1354,7 @@ qemuProcessHandleGuestPanic(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_FREE(processEvent); } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); @@ -1387,7 +1387,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitorPtr mon ATTRIBUTE_UNUSED, if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) VIR_WARN("unable to save domain status with balloon change"); -cleanup: + cleanup: virObjectUnlock(vm); virObjectUnref(cfg); return 0; @@ -1476,7 +1476,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int logfd) ret = virQEMUCapsProbeQMP(priv->qemuCaps, priv->mon); qemuDomainObjExitMonitor(driver, vm); -error: + error: return ret; } @@ -1594,7 +1594,7 @@ qemuProcessReadLogOutput(virDomainObjPtr vm, _("Timed out while reading %s log output: %s"), what, buf); -cleanup: + cleanup: return ret; } @@ -1657,7 +1657,7 @@ qemuProcessReadChildErrors(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(logfd); return ret; } @@ -1924,7 +1924,7 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, if (ret == 0) ret = qemuProcessFindCharDevicePTYsMonitor(vm, qemuCaps, paths); -cleanup: + cleanup: virHashFree(paths); if (pos != -1 && kill(vm->pid, 0) == -1 && errno == ESRCH) { @@ -1948,7 +1948,7 @@ cleanup: ret = -1; } -closelog: + closelog: if (VIR_CLOSE(logfd) < 0) { char ebuf[1024]; VIR_WARN("Unable to close logfile: %s", @@ -2049,7 +2049,7 @@ qemuPrepareCpumap(virQEMUDriverPtr driver, } } -cleanup: + cleanup: virObjectUnref(caps); return cpumap; } @@ -2097,7 +2097,7 @@ qemuProcessInitCpuAffinity(virQEMUDriverPtr driver, ret = 0; -cleanup: + cleanup: virBitmapFree(cpumap); return ret; } @@ -2164,7 +2164,7 @@ qemuProcessSetVcpuAffinities(virConnectPtr conn ATTRIBUTE_UNUSED, } ret = 0; -cleanup: + cleanup: return ret; } @@ -2241,7 +2241,7 @@ qemuProcessInitPasswords(virConnectPtr conn, } } -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -2706,7 +2706,7 @@ static int qemuProcessHook(void *data) ret = 0; -cleanup: + cleanup: virObjectUnref(h->cfg); VIR_DEBUG("Hook complete ret=%d", ret); return ret; @@ -2765,7 +2765,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); } -cleanup: + cleanup: virObjectUnref(cfg); return ret; } @@ -3123,7 +3123,7 @@ qemuProcessUpdateDevices(virQEMUDriverPtr driver, } ret = 0; -cleanup: + cleanup: virStringFreeList(old); return ret; } @@ -3295,7 +3295,7 @@ qemuProcessReconnect(void *opaque) if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); -endjob: + endjob: if (!qemuDomainObjEndJob(driver, obj)) obj = NULL; @@ -3307,7 +3307,7 @@ endjob: return; -error: + error: if (!qemuDomainObjEndJob(driver, obj)) obj = NULL; @@ -3411,7 +3411,7 @@ qemuProcessReconnectHelper(virDomainObjPtr obj, return 0; -error: + error: VIR_FREE(data); return -1; } @@ -3533,7 +3533,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, return 0; -error: + error: virPortAllocatorRelease(driver->remotePorts, port); return -1; } @@ -3597,7 +3597,7 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver, virDomainObjPtr vm) ret = true; -cleanup: + cleanup: cpuDataFree(guestcpu); return ret; } @@ -4198,7 +4198,7 @@ int qemuProcessStart(virConnectPtr conn, return 0; -cleanup: + cleanup: /* We jump here if we failed to start the VM for any reason, or * if we failed to initialize the now running VM. kill it off and * pretend we never started it */ @@ -4440,7 +4440,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, networkReleaseActualDevice(vm->def, net); } -retry: + retry: if ((ret = qemuRemoveCgroup(vm)) < 0) { if (ret == -EBUSY && (retries++ < 5)) { usleep(200*1000); @@ -4741,7 +4741,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, return 0; -error: + error: /* We jump here if we failed to attach to the VM for any reason. * Leave the domain running, but pretend we never attempted to * attach to it. */ @@ -4800,7 +4800,7 @@ qemuProcessAutoDestroy(virDomainObjPtr dom, if (event) qemuDomainEventQueue(driver, event); -cleanup: + cleanup: return dom; } -- 1.8.3.2

--- src/rpc/virkeepalive.c | 6 +++--- src/rpc/virnetclient.c | 22 +++++++++++----------- src/rpc/virnetclientprogram.c | 6 +++--- src/rpc/virnetclientstream.c | 14 +++++++------- src/rpc/virnetmessage.c | 18 +++++++++--------- src/rpc/virnetsaslcontext.c | 28 ++++++++++++++-------------- src/rpc/virnetserver.c | 30 +++++++++++++++--------------- src/rpc/virnetserverclient.c | 18 +++++++++--------- src/rpc/virnetserverprogram.c | 8 ++++---- src/rpc/virnetserverservice.c | 12 ++++++------ src/rpc/virnetsocket.c | 36 ++++++++++++++++++------------------ src/rpc/virnetsshsession.c | 26 +++++++++++++------------- src/rpc/virnettlscontext.c | 28 ++++++++++++++-------------- 13 files changed, 126 insertions(+), 126 deletions(-) diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index f5c48b7..c882313 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -108,7 +108,7 @@ virKeepAliveMessage(virKeepAlivePtr ka, int proc) return msg; -error: + error: VIR_WARN("Failed to generate keepalive %s", procstr); return NULL; } @@ -181,7 +181,7 @@ virKeepAliveTimer(int timer ATTRIBUTE_UNUSED, void *opaque) virObjectLock(ka); virObjectUnref(ka); -cleanup: + cleanup: virObjectUnlock(ka); } @@ -294,7 +294,7 @@ virKeepAliveStart(virKeepAlivePtr ka, virObjectRef(ka); ret = 0; -cleanup: + cleanup: virObjectUnlock(ka); return ret; } diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 255997b..a156fe1 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -329,7 +329,7 @@ static virNetClientPtr virNetClientNew(virNetSocketPtr sock, client, client->sock); return client; -error: + error: VIR_FORCE_CLOSE(wakeupFD[0]); VIR_FORCE_CLOSE(wakeupFD[1]); virObjectUnref(client); @@ -484,7 +484,7 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host, goto cleanup; sock = NULL; -cleanup: + cleanup: VIR_FREE(command); VIR_FREE(privkey); VIR_FREE(knownhosts); @@ -494,7 +494,7 @@ cleanup: virObjectUnref(sock); return ret; -no_memory: + no_memory: virReportOOMError(); goto cleanup; } @@ -834,7 +834,7 @@ int virNetClientSetTLSSession(virNetClientPtr client, virObjectUnlock(client); return 0; -error: + error: virObjectUnref(client->tls); client->tls = NULL; virObjectUnlock(client); @@ -886,7 +886,7 @@ int virNetClientAddProgram(virNetClientPtr client, virObjectUnlock(client); return 0; -error: + error: virObjectUnlock(client); return -1; } @@ -905,7 +905,7 @@ int virNetClientAddStream(virNetClientPtr client, virObjectUnlock(client); return 0; -error: + error: virObjectUnlock(client); return -1; } @@ -926,7 +926,7 @@ void virNetClientRemoveStream(virNetClientPtr client, VIR_DELETE_ELEMENT(client->streams, i, client->nstreams); virObjectUnref(st); -cleanup: + cleanup: virObjectUnlock(client); } @@ -1597,7 +1597,7 @@ static int virNetClientIOEventLoop(virNetClientPtr client, } } -error: + error: virNetClientCallRemove(&client->waitDispatch, thiscall); virNetClientIOEventLoopPassTheBuck(client, thiscall); return -1; @@ -1792,7 +1792,7 @@ static int virNetClientIO(virNetClientPtr client, virGetLastError()) rv = -1; -cleanup: + cleanup: VIR_DEBUG("All done with our call head=%p call=%p rv=%d", client->waitDispatch, thiscall, rv); return rv; @@ -1843,7 +1843,7 @@ void virNetClientIncomingEvent(virNetSocketPtr sock, NULL); virNetClientIOUpdateCallback(client, true); -done: + done: if (client->wantClose && !client->haveTheBuck) { virNetClientCloseLocked(client); virNetClientCallRemovePredicate(&client->waitDispatch, @@ -1900,7 +1900,7 @@ virNetClientCallNew(virNetMessagePtr msg, return call; -error: + error: VIR_FREE(call); return NULL; } diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index 3ff27d3..e620dec 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -188,7 +188,7 @@ virNetClientProgramDispatchError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, ret = 0; -cleanup: + cleanup: xdr_free((xdrproc_t)xdr_virNetMessageError, (void*)&err); return ret; } @@ -262,7 +262,7 @@ int virNetClientProgramDispatch(virNetClientProgramPtr prog, xdr_free(event->msg_filter, evdata); -cleanup: + cleanup: VIR_FREE(evdata); return 0; } @@ -394,7 +394,7 @@ int virNetClientProgramCall(virNetClientProgramPtr prog, return 0; -error: + error: virNetMessageFree(msg); if (infds && ninfds) { for (i = 0; i < *ninfds; i++) diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 521bdda..b428f4b 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -254,7 +254,7 @@ int virNetClientStreamSetError(virNetClientStreamPtr st, ret = 0; -cleanup: + cleanup: xdr_free((xdrproc_t)xdr_virNetMessageError, (void*)&err); virObjectUnlock(st); return ret; @@ -296,7 +296,7 @@ int virNetClientStreamQueuePacket(virNetClientStreamPtr st, ret = 0; -cleanup: + cleanup: virObjectUnlock(st); return ret; } @@ -350,7 +350,7 @@ int virNetClientStreamSendPacket(virNetClientStreamPtr st, return nbytes; -error: + error: virNetMessageFree(msg); return -1; } @@ -415,7 +415,7 @@ int virNetClientStreamRecvPacket(virNetClientStreamPtr st, virNetClientStreamEventTimerUpdate(st); -cleanup: + cleanup: virObjectUnlock(st); return rv; } @@ -455,7 +455,7 @@ int virNetClientStreamEventAddCallback(virNetClientStreamPtr st, ret = 0; -cleanup: + cleanup: virObjectUnlock(st); return ret; } @@ -478,7 +478,7 @@ int virNetClientStreamEventUpdateCallback(virNetClientStreamPtr st, ret = 0; -cleanup: + cleanup: virObjectUnlock(st); return ret; } @@ -505,7 +505,7 @@ int virNetClientStreamEventRemoveCallback(virNetClientStreamPtr st) ret = 0; -cleanup: + cleanup: virObjectUnlock(st); return ret; } diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 4e8e17d..19b2d6c 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -152,7 +152,7 @@ int virNetMessageDecodeLength(virNetMessagePtr msg) ret = 0; -cleanup: + cleanup: xdr_destroy(&xdr); return ret; } @@ -197,7 +197,7 @@ int virNetMessageDecodeHeader(virNetMessagePtr msg) ret = 0; -cleanup: + cleanup: xdr_destroy(&xdr); return ret; } @@ -257,7 +257,7 @@ int virNetMessageEncodeHeader(virNetMessagePtr msg) ret = 0; -cleanup: + cleanup: xdr_destroy(&xdr); return ret; } @@ -289,7 +289,7 @@ int virNetMessageEncodeNumFDs(virNetMessagePtr msg) ret = 0; -cleanup: + cleanup: xdr_destroy(&xdr); return ret; } @@ -327,7 +327,7 @@ int virNetMessageDecodeNumFDs(virNetMessagePtr msg) ret = 0; -cleanup: + cleanup: xdr_destroy(&xdr); return ret; } @@ -386,7 +386,7 @@ int virNetMessageEncodePayload(virNetMessagePtr msg, msg->bufferOffset = 0; return 0; -error: + error: xdr_destroy(&xdr); return -1; } @@ -414,7 +414,7 @@ int virNetMessageDecodePayload(virNetMessagePtr msg, xdr_destroy(&xdr); return 0; -error: + error: xdr_destroy(&xdr); return -1; } @@ -466,7 +466,7 @@ int virNetMessageEncodePayloadRaw(virNetMessagePtr msg, msg->bufferOffset = 0; return 0; -error: + error: xdr_destroy(&xdr); return -1; } @@ -491,7 +491,7 @@ int virNetMessageEncodePayloadEmpty(virNetMessagePtr msg) msg->bufferOffset = 0; return 0; -error: + error: xdr_destroy(&xdr); return -1; } diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index abf3334..37a5da2 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -159,7 +159,7 @@ int virNetSASLContextCheckIdentity(virNetSASLContextPtr ctxt, _("Client's username is not on the list of allowed clients")); ret = 0; -cleanup: + cleanup: virObjectUnlock(ctxt); return ret; } @@ -198,7 +198,7 @@ virNetSASLSessionPtr virNetSASLSessionNewClient(virNetSASLContextPtr ctxt ATTRIB return sasl; -cleanup: + cleanup: virObjectUnref(sasl); return NULL; } @@ -234,7 +234,7 @@ virNetSASLSessionPtr virNetSASLSessionNewServer(virNetSASLContextPtr ctxt ATTRIB return sasl; -cleanup: + cleanup: virObjectUnref(sasl); return NULL; } @@ -256,7 +256,7 @@ int virNetSASLSessionExtKeySize(virNetSASLSessionPtr sasl, ret = 0; -cleanup: + cleanup: virObjectUnlock(sasl); return ret; } @@ -282,7 +282,7 @@ const char *virNetSASLSessionGetIdentity(virNetSASLSessionPtr sasl) } VIR_DEBUG("SASL client username %s", (const char *)val); -cleanup: + cleanup: virObjectUnlock(sasl); return (const char*)val; } @@ -305,7 +305,7 @@ int virNetSASLSessionGetKeySize(virNetSASLSessionPtr sasl) } ssf = *(const int *)val; -cleanup: + cleanup: virObjectUnlock(sasl); return ssf; } @@ -341,7 +341,7 @@ int virNetSASLSessionSecProps(virNetSASLSessionPtr sasl, ret = 0; -cleanup: + cleanup: virObjectUnlock(sasl); return ret; } @@ -392,7 +392,7 @@ char *virNetSASLSessionListMechanisms(virNetSASLSessionPtr sasl) } ignore_value(VIR_STRDUP(ret, mechlist)); -cleanup: + cleanup: virObjectUnlock(sasl); return ret; } @@ -441,7 +441,7 @@ int virNetSASLSessionClientStart(virNetSASLSessionPtr sasl, break; } -cleanup: + cleanup: virObjectUnlock(sasl); return ret; } @@ -490,7 +490,7 @@ int virNetSASLSessionClientStep(virNetSASLSessionPtr sasl, break; } -cleanup: + cleanup: virObjectUnlock(sasl); return ret; } @@ -536,7 +536,7 @@ int virNetSASLSessionServerStart(virNetSASLSessionPtr sasl, break; } -cleanup: + cleanup: virObjectUnlock(sasl); return ret; } @@ -581,7 +581,7 @@ int virNetSASLSessionServerStep(virNetSASLSessionPtr sasl, break; } -cleanup: + cleanup: virObjectUnlock(sasl); return ret; } @@ -629,7 +629,7 @@ ssize_t virNetSASLSessionEncode(virNetSASLSessionPtr sasl, } ret = 0; -cleanup: + cleanup: virObjectUnlock(sasl); return ret; } @@ -667,7 +667,7 @@ ssize_t virNetSASLSessionDecode(virNetSASLSessionPtr sasl, } ret = 0; -cleanup: + cleanup: virObjectUnlock(sasl); return ret; } diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 14fd102..7e3fc0a 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -175,10 +175,10 @@ static int virNetServerProcessMsg(virNetServerPtr srv, msg) < 0) goto cleanup; -done: + done: ret = 0; -cleanup: + cleanup: return ret; } @@ -198,7 +198,7 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) VIR_FREE(job); return; -error: + error: virObjectUnref(job->prog); virNetMessageFree(job->msg); virNetServerClientClose(job->client); @@ -252,7 +252,7 @@ static int virNetServerDispatchNewMessage(virNetServerClientPtr client, ret = virNetServerProcessMsg(srv, client, prog, msg); } -cleanup: + cleanup: virObjectUnlock(srv); return ret; @@ -306,7 +306,7 @@ static int virNetServerAddClient(virNetServerPtr srv, virObjectUnlock(srv); return 0; -error: + error: virObjectUnlock(srv); return -1; } @@ -403,7 +403,7 @@ virNetServerPtr virNetServerNew(size_t min_workers, return srv; -error: + error: virObjectUnref(srv); return NULL; } @@ -564,7 +564,7 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, return srv; -error: + error: virObjectUnref(srv); return NULL; } @@ -672,7 +672,7 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv) return object; -error: + error: virJSONValueFree(object); virObjectUnlock(srv); return NULL; @@ -729,7 +729,7 @@ static void virNetServerGotInhibitReply(DBusPendingCall *pending, } dbus_message_unref(reply); -cleanup: + cleanup: virObjectUnlock(srv); } @@ -879,7 +879,7 @@ virNetServerSignalEvent(int watch, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected signal received: %d"), siginfo.si_signo); -cleanup: + cleanup: virObjectUnlock(srv); } @@ -911,7 +911,7 @@ static int virNetServerSignalSetup(virNetServerPtr srv) return 0; -error: + error: VIR_FORCE_CLOSE(fds[0]); VIR_FORCE_CLOSE(fds[1]); return -1; @@ -952,7 +952,7 @@ int virNetServerAddSignalHandler(virNetServerPtr srv, virObjectUnlock(srv); return 0; -error: + error: VIR_FREE(sigdata); virObjectUnlock(srv); return -1; @@ -988,7 +988,7 @@ int virNetServerAddService(virNetServerPtr srv, virObjectUnlock(srv); return 0; -error: + error: virObjectUnlock(srv); return -1; } @@ -1006,7 +1006,7 @@ int virNetServerAddProgram(virNetServerPtr srv, virObjectUnlock(srv); return 0; -error: + error: virObjectUnlock(srv); return -1; } @@ -1169,7 +1169,7 @@ void virNetServerRun(virNetServerPtr srv) } } -cleanup: + cleanup: virObjectUnlock(srv); } diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 1251b2d..3493ef5 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -389,7 +389,7 @@ virNetServerClientNewInternal(virNetSocketPtr sock, return client; -error: + error: virObjectUnref(client); return NULL; } @@ -506,7 +506,7 @@ virNetServerClientPtr virNetServerClientNewPostExecRestart(virJSONValuePtr objec return client; -error: + error: virObjectUnref(client); return NULL; } @@ -549,7 +549,7 @@ virJSONValuePtr virNetServerClientPreExecRestart(virNetServerClientPtr client) virObjectUnlock(client); return object; -error: + error: virObjectUnlock(client); virJSONValueFree(object); return NULL; @@ -767,7 +767,7 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) seccontext) < 0) goto error; -cleanup: + cleanup: VIR_FREE(username); VIR_FREE(userid); VIR_FREE(groupname); @@ -783,7 +783,7 @@ cleanup: #endif return ret; -error: + error: virObjectUnref(ret); ret = NULL; goto cleanup; @@ -1085,7 +1085,7 @@ int virNetServerClientInit(virNetServerClientPtr client) virObjectUnlock(client); return 0; -error: + error: client->wantClose = true; virObjectUnlock(client); return -1; @@ -1130,7 +1130,7 @@ static ssize_t virNetServerClientRead(virNetServerClientPtr client) */ static void virNetServerClientDispatchRead(virNetServerClientPtr client) { -readmore: + readmore: if (client->rx->nfds == 0) { if (virNetServerClientRead(client) < 0) { client->wantClose = true; @@ -1534,7 +1534,7 @@ virNetServerClientInitKeepAlive(virNetServerClientPtr client, client->keepalive = ka; -cleanup: + cleanup: virObjectUnlock(client); return ret; @@ -1558,7 +1558,7 @@ virNetServerClientStartKeepAlive(virNetServerClientPtr client) ret = virKeepAliveStart(client->keepalive, 0, 0); -cleanup: + cleanup: virObjectUnlock(client); return ret; } diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 8aea9f0..a4d9295 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -175,7 +175,7 @@ virNetServerProgramSendError(unsigned program, return 0; -error: + error: VIR_WARN("Failed to serialize remote error '%p'", rerr); xdr_free((xdrproc_t)xdr_virNetMessageError, (void*)rerr); return -1; @@ -333,7 +333,7 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog, return ret; -error: + error: if (msg->header.type == VIR_NET_CALL || msg->header.type == VIR_NET_CALL_WITH_FDS) { ret = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header); @@ -348,7 +348,7 @@ error: ret = 0; } -cleanup: + cleanup: return ret; } @@ -493,7 +493,7 @@ virNetServerProgramDispatchCall(virNetServerProgramPtr prog, /* Put reply on end of tx queue to send out */ return virNetServerClientSendMessage(client, msg); -error: + error: /* Bad stuff (de-)serializing message, but we have an * RPC error message we can send back to the client */ rv = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header); diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 4113ec9..320a02c 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -85,7 +85,7 @@ static void virNetServerServiceAccept(virNetSocketPtr sock, svc->dispatchFunc(svc, clientsock, svc->dispatchOpaque); -cleanup: + cleanup: virObjectUnref(clientsock); } @@ -142,7 +142,7 @@ virNetServerServicePtr virNetServerServiceNewTCP(const char *nodename, return svc; -error: + error: virObjectUnref(svc); return NULL; } @@ -206,7 +206,7 @@ virNetServerServicePtr virNetServerServiceNewUNIX(const char *path, return svc; -error: + error: virObjectUnref(svc); return NULL; } @@ -257,7 +257,7 @@ virNetServerServicePtr virNetServerServiceNewFD(int fd, return svc; -error: + error: virObjectUnref(svc); return NULL; } @@ -338,7 +338,7 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj return svc; -error: + error: virObjectUnref(svc); return NULL; } @@ -381,7 +381,7 @@ virJSONValuePtr virNetServerServicePreExecRestart(virNetServerServicePtr svc) return object; -error: + error: virJSONValueFree(object); return NULL; } diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 16a2521..2e94a6c 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -208,7 +208,7 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr, return sock; -error: + error: sock->fd = sock->errfd = -1; /* Caller owns fd/errfd on failure */ virObjectUnref(sock); return NULL; @@ -320,7 +320,7 @@ int virNetSocketNewListenTCP(const char *nodename, *nretsocks = nsocks; return 0; -error: + error: for (i = 0; i < nsocks; i++) virObjectUnref(socks[i]); VIR_FREE(socks); @@ -389,7 +389,7 @@ int virNetSocketNewListenUNIX(const char *path, return 0; -error: + error: if (path[0] != '@') unlink(path); VIR_FORCE_CLOSE(fd); @@ -506,7 +506,7 @@ int virNetSocketNewConnectTCP(const char *nodename, return 0; -error: + error: freeaddrinfo(ai); VIR_FORCE_CLOSE(fd); return -1; @@ -548,7 +548,7 @@ int virNetSocketNewConnectUNIX(const char *path, if (remoteAddr.data.un.sun_path[0] == '@') remoteAddr.data.un.sun_path[0] = '\0'; -retry: + retry: if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { if ((errno == ECONNREFUSED || errno == ENOENT) && @@ -581,7 +581,7 @@ retry: return 0; -error: + error: VIR_FORCE_CLOSE(fd); return -1; } @@ -642,7 +642,7 @@ int virNetSocketNewConnectCommand(virCommandPtr cmd, return 0; -error: + error: VIR_FORCE_CLOSE(sv[0]); VIR_FORCE_CLOSE(sv[1]); VIR_FORCE_CLOSE(errfd[0]); @@ -845,7 +845,7 @@ virNetSocketNewConnectLibSSH2(const char *host, VIR_FREE(authMethodsCopy); return 0; -error: + error: virObjectUnref(sock); virObjectUnref(sess); VIR_FREE(authMethodsCopy); @@ -1007,7 +1007,7 @@ virJSONValuePtr virNetSocketPreExecRestart(virNetSocketPtr sock) virObjectUnlock(sock); return object; -error: + error: virObjectUnlock(sock); virJSONValueFree(object); return NULL; @@ -1145,7 +1145,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, ret = 0; -cleanup: + cleanup: virObjectUnlock(sock); return ret; } @@ -1230,7 +1230,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, ret = 0; -cleanup: + cleanup: virObjectUnlock(sock); return ret; } @@ -1272,7 +1272,7 @@ int virNetSocketGetSELinuxContext(virNetSocketPtr sock, goto cleanup; ret = 0; -cleanup: + cleanup: freecon(seccon); virObjectUnlock(sock); return ret; @@ -1411,7 +1411,7 @@ static ssize_t virNetSocketReadWire(virNetSocketPtr sock, char *buf, size_t len) return virNetSocketLibSSH2Read(sock, buf, len); #endif -reread: + reread: #if WITH_GNUTLS if (sock->tlsSession && virNetTLSSessionGetHandshakeStatus(sock->tlsSession) == @@ -1470,7 +1470,7 @@ static ssize_t virNetSocketWriteWire(virNetSocketPtr sock, const char *buf, size return virNetSocketLibSSH2Write(sock, buf, len); #endif -rewrite: + rewrite: #if WITH_GNUTLS if (sock->tlsSession && virNetTLSSessionGetHandshakeStatus(sock->tlsSession) == @@ -1655,7 +1655,7 @@ int virNetSocketSendFD(virNetSocketPtr sock, int fd) } ret = 1; -cleanup: + cleanup: virObjectUnlock(sock); return ret; } @@ -1689,7 +1689,7 @@ int virNetSocketRecvFD(virNetSocketPtr sock, int *fd) "sock=%p fd=%d", sock, *fd); ret = 1; -cleanup: + cleanup: virObjectUnlock(sock); return ret; } @@ -1749,7 +1749,7 @@ int virNetSocketAccept(virNetSocketPtr sock, virNetSocketPtr *clientsock) fd = -1; ret = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); virObjectUnlock(sock); return ret; @@ -1824,7 +1824,7 @@ int virNetSocketAddIOCallback(virNetSocketPtr sock, ret = 0; -cleanup: + cleanup: virObjectUnlock(sock); if (ret != 0) virObjectUnref(sock); diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 789ba2e..9d09699 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -192,7 +192,7 @@ virNetSSHSessionAuthMethodNew(virNetSSHSessionPtr sess) return auth; -error: + error: VIR_FREE(auth); return NULL; } @@ -267,7 +267,7 @@ virNetSSHKbIntCb(const char *name ATTRIBUTE_UNUSED, responses[i].length = askcred[i].resultlen; } -cleanup: + cleanup: if (askcred) { for (i = 0; i < num_prompts; i++) { char *prompt = (char *)askcred[i].prompt; @@ -755,7 +755,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, else return -1; -cleanup: + cleanup: VIR_FREE(password); return ret; } @@ -1034,7 +1034,7 @@ virNetSSHSessionAuthAddPasswordAuth(virNetSSHSessionPtr sess, virObjectUnlock(sess); return 0; -error: + error: VIR_FREE(user); virObjectUnlock(sess); return -1; @@ -1068,7 +1068,7 @@ virNetSSHSessionAuthAddAgentAuth(virNetSSHSessionPtr sess, virObjectUnlock(sess); return 0; -error: + error: VIR_FREE(user); virObjectUnlock(sess); return -1; @@ -1111,7 +1111,7 @@ virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSessionPtr sess, virObjectUnlock(sess); return 0; -error: + error: VIR_FREE(user); VIR_FREE(pass); VIR_FREE(file); @@ -1149,7 +1149,7 @@ virNetSSHSessionAuthAddKeyboardAuth(virNetSSHSessionPtr sess, virObjectUnlock(sess); return 0; -error: + error: VIR_FREE(user); virObjectUnlock(sess); return -1; @@ -1222,7 +1222,7 @@ virNetSSHSessionSetHostKeyVerification(virNetSSHSessionPtr sess, virObjectUnlock(sess); return 0; -error: + error: virObjectUnlock(sess); return -1; } @@ -1273,7 +1273,7 @@ virNetSSHSessionPtr virNetSSHSessionNew(void) return sess; -error: + error: virObjectUnref(sess); return NULL; } @@ -1330,7 +1330,7 @@ virNetSSHSessionConnect(virNetSSHSessionPtr sess, virObjectUnlock(sess); return ret; -error: + error: sess->state = VIR_NET_SSH_STATE_ERROR; virObjectUnlock(sess); return ret; @@ -1439,11 +1439,11 @@ virNetSSHChannelRead(virNetSSHSessionPtr sess, return -1; } -success: + success: virObjectUnlock(sess); return read_n; -error: + error: sess->state = VIR_NET_SSH_STATE_ERROR; virObjectUnlock(sess); return ret; @@ -1501,7 +1501,7 @@ virNetSSHChannelWrite(virNetSSHSessionPtr sess, _("write failed: %s"), msg); } -cleanup: + cleanup: virObjectUnlock(sess); return ret; } diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 4eaf469..8693c61 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -537,7 +537,7 @@ static gnutls_x509_crt_t virNetTLSContextLoadCertFromFile(const char *certFile, ret = 0; -cleanup: + cleanup: if (ret != 0) { gnutls_x509_crt_deinit(cert); cert = NULL; @@ -575,7 +575,7 @@ static int virNetTLSContextLoadCACertListFromFile(const char *certFile, ret = 0; -cleanup: + cleanup: VIR_FREE(buf); return ret; } @@ -616,7 +616,7 @@ static int virNetTLSContextSanityCheckCredentials(bool isServer, ret = 0; -cleanup: + cleanup: if (cert) gnutls_x509_crt_deinit(cert); for (i = 0; i < ncacerts; i++) @@ -699,7 +699,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSContextPtr ctxt, ret = 0; -cleanup: + cleanup: return ret; } @@ -783,7 +783,7 @@ static virNetTLSContextPtr virNetTLSContextNew(const char *cacert, return ctxt; -error: + error: if (isServer) gnutls_dh_params_deinit(ctxt->dhParams); gnutls_certificate_free_credentials(ctxt->x509cred); @@ -906,7 +906,7 @@ static int virNetTLSContextLocateCredentials(const char *pkipath, return 0; -error: + error: VIR_FREE(*cacert); VIR_FREE(*cacrl); VIR_FREE(*key); @@ -1117,14 +1117,14 @@ static int virNetTLSContextValidCertificate(virNetTLSContextPtr ctxt, return 0; -authdeny: + authdeny: PROBE(RPC_TLS_CONTEXT_SESSION_DENY, "ctxt=%p sess=%p dname=%s", ctxt, sess, dnameptr); return -1; -authfail: + authfail: PROBE(RPC_TLS_CONTEXT_SESSION_FAIL, "ctxt=%p sess=%p", ctxt, sess); @@ -1153,7 +1153,7 @@ int virNetTLSContextCheckCertificate(virNetTLSContextPtr ctxt, ret = 0; -cleanup: + cleanup: virObjectUnlock(ctxt); virObjectUnlock(sess); @@ -1264,7 +1264,7 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt, return sess; -error: + error: virObjectUnref(sess); return NULL; } @@ -1311,7 +1311,7 @@ ssize_t virNetTLSSessionWrite(virNetTLSSessionPtr sess, ret = -1; -cleanup: + cleanup: virObjectUnlock(sess); return ret; } @@ -1341,7 +1341,7 @@ ssize_t virNetTLSSessionRead(virNetTLSSessionPtr sess, ret = -1; -cleanup: + cleanup: virObjectUnlock(sess); return ret; } @@ -1373,7 +1373,7 @@ int virNetTLSSessionHandshake(virNetTLSSessionPtr sess) gnutls_strerror(ret)); ret = -1; -cleanup: + cleanup: virObjectUnlock(sess); return ret; } @@ -1406,7 +1406,7 @@ int virNetTLSSessionGetKeySize(virNetTLSSessionPtr sess) goto cleanup; } -cleanup: + cleanup: virObjectUnlock(sess); return ssf; } -- 1.8.3.2

--- src/test/test_driver.c | 272 ++++++++++++++++++++++++------------------------- 1 file changed, 136 insertions(+), 136 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5694680..ef88d4b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -294,7 +294,7 @@ testDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED, *data = nsdata; return 0; -error: + error: VIR_FREE(nodes); testDomainDefNamespaceFree(nsdata); return -1; @@ -385,7 +385,7 @@ testBuildCapabilities(virConnectPtr conn) return caps; -error: + error: virObjectUnref(caps); return NULL; } @@ -642,7 +642,7 @@ testDomainUpdateVCPUs(testConnPtr privconn, dom->def->vcpus = nvcpus; ret = 0; -cleanup: + cleanup: return ret; } @@ -685,7 +685,7 @@ testDomainStartState(testConnPtr privconn, dom->hasManagedSave = false; ret = 0; -cleanup: + cleanup: if (ret < 0) testDomainShutdownState(NULL, dom, VIR_DOMAIN_SHUTOFF_FAILED); return ret; @@ -835,7 +835,7 @@ testOpenDefault(virConnectPtr conn) return VIR_DRV_OPEN_SUCCESS; -error: + error: virObjectUnref(privconn->domains); virNetworkObjListFree(&privconn->networks); virInterfaceObjListFree(&privconn->ifaces); @@ -915,7 +915,7 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type) ret = node; } -error: + error: xmlFreeDoc(doc); VIR_FREE(absFile); return ret; @@ -1006,7 +1006,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) } return 0; -error: + error: return -1; } @@ -1063,7 +1063,7 @@ testParseDomainSnapshots(testConnPtr privconn, } ret = 0; -error: + error: return ret; } @@ -1129,7 +1129,7 @@ testParseDomains(testConnPtr privconn, } ret = 0; -error: + error: VIR_FREE(nodes); return ret; } @@ -1170,7 +1170,7 @@ testParseNetworks(testConnPtr privconn, } ret = 0; -error: + error: VIR_FREE(nodes); return ret; } @@ -1211,7 +1211,7 @@ testParseInterfaces(testConnPtr privconn, } ret = 0; -error: + error: VIR_FREE(nodes); return ret; } @@ -1267,7 +1267,7 @@ testOpenVolumesForPool(const char *file, } ret = 0; -error: + error: virStorageVolDefFree(def); VIR_FREE(nodes); return ret; @@ -1321,7 +1321,7 @@ testParseStorage(testConnPtr privconn, } ret = 0; -error: + error: VIR_FREE(nodes); return ret; } @@ -1361,7 +1361,7 @@ testParseNodedevs(testConnPtr privconn, } ret = 0; -error: + error: VIR_FREE(nodes); return ret; } @@ -1401,7 +1401,7 @@ testParseAuthUsers(testConnPtr privconn, } ret = 0; -error: + error: VIR_FREE(nodes); return ret; } @@ -1520,7 +1520,7 @@ testConnectAuthenticate(virConnectPtr conn, } i = -1; -found_user: + found_user: /* Even if we didn't find the user, we still ask for a password. */ if (i == -1 || privconn->auths[i].password != NULL) { password = virAuthGetPassword(conn, auth, "test", @@ -1540,7 +1540,7 @@ found_user: } ret = 0; -cleanup: + cleanup: VIR_FREE(username); VIR_FREE(password); return ret; @@ -1726,7 +1726,7 @@ static int testDomainIsActive(virDomainPtr dom) } ret = virDomainObjIsActive(obj); -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -1747,7 +1747,7 @@ static int testDomainIsPersistent(virDomainPtr dom) } ret = obj->persistent; -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -1797,7 +1797,7 @@ testDomainCreateXML(virConnectPtr conn, const char *xml, if (ret) ret->id = dom->def->id; -cleanup: + cleanup: if (dom) virObjectUnlock(dom); if (event) @@ -1828,7 +1828,7 @@ static virDomainPtr testDomainLookupByID(virConnectPtr conn, if (ret) ret->id = dom->def->id; -cleanup: + cleanup: if (dom) virObjectUnlock(dom); return ret; @@ -1854,7 +1854,7 @@ static virDomainPtr testDomainLookupByUUID(virConnectPtr conn, if (ret) ret->id = dom->def->id; -cleanup: + cleanup: if (dom) virObjectUnlock(dom); return ret; @@ -1880,7 +1880,7 @@ static virDomainPtr testDomainLookupByName(virConnectPtr conn, if (ret) ret->id = dom->def->id; -cleanup: + cleanup: if (dom) virObjectUnlock(dom); return ret; @@ -1928,7 +1928,7 @@ static int testDomainDestroy(virDomainPtr domain) } ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); if (event) @@ -1967,7 +1967,7 @@ static int testDomainResume(virDomainPtr domain) VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); if (event) { @@ -2009,7 +2009,7 @@ static int testDomainSuspend(virDomainPtr domain) VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); @@ -2058,7 +2058,7 @@ static int testDomainShutdownFlags(virDomainPtr domain, } ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); if (event) @@ -2134,7 +2134,7 @@ static int testDomainReboot(virDomainPtr domain, } ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); if (event) @@ -2174,7 +2174,7 @@ static int testDomainGetInfo(virDomainPtr domain, info->cpuTime = ((tv.tv_sec * 1000ll * 1000ll * 1000ll) + (tv.tv_usec * 1000ll)); ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -2205,7 +2205,7 @@ testDomainGetState(virDomainPtr domain, *state = virDomainObjGetState(privdom, reason); ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -2297,7 +2297,7 @@ testDomainSaveFlags(virDomainPtr domain, const char *path, } ret = 0; -cleanup: + cleanup: VIR_FREE(xml); /* Don't report failure in close or unlink, because @@ -2409,7 +2409,7 @@ testDomainRestoreFlags(virConnectPtr conn, VIR_DOMAIN_EVENT_STARTED_RESTORED); ret = 0; -cleanup: + cleanup: virDomainDefFree(def); VIR_FREE(xml); VIR_FORCE_CLOSE(fd); @@ -2489,7 +2489,7 @@ static int testDomainCoreDumpWithFormat(virDomainPtr domain, } ret = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); if (privdom) virObjectUnlock(privdom); @@ -2539,7 +2539,7 @@ testDomainGetMaxMemory(virDomainPtr domain) ret = privdom->def->mem.max_balloon; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -2566,7 +2566,7 @@ static int testDomainSetMaxMemory(virDomainPtr domain, privdom->def->mem.max_balloon = memory; ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -2597,7 +2597,7 @@ static int testDomainSetMemory(virDomainPtr domain, privdom->def->mem.cur_balloon = memory; ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -2636,7 +2636,7 @@ testDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) ret = (flags & VIR_DOMAIN_VCPU_MAXIMUM) ? def->maxvcpus : def->vcpus; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2735,7 +2735,7 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, break; } -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -2830,7 +2830,7 @@ static int testDomainGetVcpus(virDomainPtr domain, } ret = maxinfo; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -2888,7 +2888,7 @@ static int testDomainPinVcpu(virDomainPtr domain, } ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -2919,7 +2919,7 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) ret = virDomainDefFormat(def, flags); -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -2991,7 +2991,7 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn, if (ret) ret->id = dom->def->id; -cleanup: + cleanup: virDomainDefFree(def); virDomainDefFree(oldDef); if (dom) @@ -3027,7 +3027,7 @@ static char *testDomainGetMetadata(virDomainPtr dom, ret = virDomainObjGetMetadata(privdom, type, uri, privconn->caps, privconn->xmlopt, flags); -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -3061,7 +3061,7 @@ static int testDomainSetMetadata(virDomainPtr dom, privconn->caps, privconn->xmlopt, NULL, flags); -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -3091,7 +3091,7 @@ static int testNodeGetCellsFreeMemory(virConnectPtr conn, } ret = i; -cleanup: + cleanup: testDriverUnlock(privconn); return ret; } @@ -3131,7 +3131,7 @@ static int testDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) VIR_DOMAIN_EVENT_STARTED_BOOTED); ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); if (event) @@ -3207,7 +3207,7 @@ static int testDomainUndefineFlags(virDomainPtr domain, ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); if (event) @@ -3241,7 +3241,7 @@ static int testDomainGetAutostart(virDomainPtr domain, *autostart = privdom->autostart; ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -3268,7 +3268,7 @@ static int testDomainSetAutostart(virDomainPtr domain, privdom->autostart = autostart ? 1 : 0; ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -3318,7 +3318,7 @@ testDomainGetSchedulerParametersFlags(virDomainPtr domain, *nparams = 1; ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -3369,7 +3369,7 @@ testDomainSetSchedulerParametersFlags(virDomainPtr domain, ret = 0; -cleanup: + cleanup: if (privdom) virObjectUnlock(privdom); return ret; @@ -3430,7 +3430,7 @@ static int testDomainBlockStats(virDomainPtr domain, stats->errs = tv.tv_sec / 2; ret = 0; -error: + error: if (privdom) virObjectUnlock(privdom); return ret; @@ -3489,7 +3489,7 @@ static int testDomainInterfaceStats(virDomainPtr domain, stats->tx_drop = tv.tv_sec / 4; ret = 0; -error: + error: if (privdom) virObjectUnlock(privdom); return ret; @@ -3533,7 +3533,7 @@ static virNetworkPtr testNetworkLookupByUUID(virConnectPtr conn, ret = virGetNetwork(conn, net->def->name, net->def->uuid); -cleanup: + cleanup: if (net) virNetworkObjUnlock(net); return ret; @@ -3557,7 +3557,7 @@ static virNetworkPtr testNetworkLookupByName(virConnectPtr conn, ret = virGetNetwork(conn, net->def->name, net->def->uuid); -cleanup: + cleanup: if (net) virNetworkObjUnlock(net); return ret; @@ -3602,7 +3602,7 @@ static int testConnectListNetworks(virConnectPtr conn, char **const names, int n return n; -error: + error: for (n = 0; n < nnames; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -3647,7 +3647,7 @@ static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names return n; -error: + error: for (n = 0; n < nnames; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -3686,7 +3686,7 @@ static int testNetworkIsActive(virNetworkPtr net) } ret = virNetworkObjIsActive(obj); -cleanup: + cleanup: if (obj) virNetworkObjUnlock(obj); return ret; @@ -3707,7 +3707,7 @@ static int testNetworkIsPersistent(virNetworkPtr net) } ret = obj->persistent; -cleanup: + cleanup: if (obj) virNetworkObjUnlock(obj); return ret; @@ -3737,7 +3737,7 @@ static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml) ret = virGetNetwork(conn, net->def->name, net->def->uuid); -cleanup: + cleanup: virNetworkDefFree(def); if (event) testObjectEventQueue(privconn, event); @@ -3771,7 +3771,7 @@ virNetworkPtr testNetworkDefineXML(virConnectPtr conn, const char *xml) ret = virGetNetwork(conn, net->def->name, net->def->uuid); -cleanup: + cleanup: virNetworkDefFree(def); if (event) testObjectEventQueue(privconn, event); @@ -3812,7 +3812,7 @@ static int testNetworkUndefine(virNetworkPtr network) privnet = NULL; ret = 0; -cleanup: + cleanup: if (event) testObjectEventQueue(privconn, event); if (privnet) @@ -3864,7 +3864,7 @@ testNetworkUpdate(virNetworkPtr net, goto cleanup; ret = 0; -cleanup: + cleanup: testDriverUnlock(privconn); return ret; } @@ -3898,7 +3898,7 @@ static int testNetworkCreate(virNetworkPtr network) 0); ret = 0; -cleanup: + cleanup: if (event) testObjectEventQueue(privconn, event); if (privnet) @@ -3933,7 +3933,7 @@ static int testNetworkDestroy(virNetworkPtr network) } ret = 0; -cleanup: + cleanup: if (event) testObjectEventQueue(privconn, event); if (privnet) @@ -3963,7 +3963,7 @@ static char *testNetworkGetXMLDesc(virNetworkPtr network, ret = virNetworkDefFormat(privnet->def, flags); -cleanup: + cleanup: if (privnet) virNetworkObjUnlock(privnet); return ret; @@ -3993,7 +3993,7 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) { ignore_value(VIR_STRDUP(bridge, privnet->def->bridge)); -cleanup: + cleanup: if (privnet) virNetworkObjUnlock(privnet); return bridge; @@ -4019,7 +4019,7 @@ static int testNetworkGetAutostart(virNetworkPtr network, *autostart = privnet->autostart; ret = 0; -cleanup: + cleanup: if (privnet) virNetworkObjUnlock(privnet); return ret; @@ -4045,7 +4045,7 @@ static int testNetworkSetAutostart(virNetworkPtr network, privnet->autostart = autostart ? 1 : 0; ret = 0; -cleanup: + cleanup: if (privnet) virNetworkObjUnlock(privnet); return ret; @@ -4116,7 +4116,7 @@ static int testConnectListInterfaces(virConnectPtr conn, char **const names, int return n; -error: + error: for (n = 0; n < nnames; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -4163,7 +4163,7 @@ static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const nam return n; -error: + error: for (n = 0; n < nnames; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -4188,7 +4188,7 @@ static virInterfacePtr testInterfaceLookupByName(virConnectPtr conn, ret = virGetInterface(conn, iface->def->name, iface->def->mac); -cleanup: + cleanup: if (iface) virInterfaceObjUnlock(iface); return ret; @@ -4218,7 +4218,7 @@ static virInterfacePtr testInterfaceLookupByMACString(virConnectPtr conn, ret = virGetInterface(conn, iface->def->name, iface->def->mac); -cleanup: + cleanup: if (iface) virInterfaceObjUnlock(iface); return ret; @@ -4239,7 +4239,7 @@ static int testInterfaceIsActive(virInterfacePtr iface) } ret = virInterfaceObjIsActive(obj); -cleanup: + cleanup: if (obj) virInterfaceObjUnlock(obj); return ret; @@ -4267,7 +4267,7 @@ static int testInterfaceChangeBegin(virConnectPtr conn, goto cleanup; ret = 0; -cleanup: + cleanup: testDriverUnlock(privconn); return ret; } @@ -4294,7 +4294,7 @@ static int testInterfaceChangeCommit(virConnectPtr conn, ret = 0; -cleanup: + cleanup: testDriverUnlock(privconn); return ret; @@ -4327,7 +4327,7 @@ static int testInterfaceChangeRollback(virConnectPtr conn, ret = 0; -cleanup: + cleanup: testDriverUnlock(privconn); return ret; } @@ -4353,7 +4353,7 @@ static char *testInterfaceGetXMLDesc(virInterfacePtr iface, ret = virInterfaceDefFormat(privinterface->def); -cleanup: + cleanup: if (privinterface) virInterfaceObjUnlock(privinterface); return ret; @@ -4380,7 +4380,7 @@ static virInterfacePtr testInterfaceDefineXML(virConnectPtr conn, const char *xm ret = virGetInterface(conn, iface->def->name, iface->def->mac); -cleanup: + cleanup: virInterfaceDefFree(def); if (iface) virInterfaceObjUnlock(iface); @@ -4407,7 +4407,7 @@ static int testInterfaceUndefine(virInterfacePtr iface) privinterface); ret = 0; -cleanup: + cleanup: testDriverUnlock(privconn); return ret; } @@ -4438,7 +4438,7 @@ static int testInterfaceCreate(virInterfacePtr iface, privinterface->active = 1; ret = 0; -cleanup: + cleanup: if (privinterface) virInterfaceObjUnlock(privinterface); testDriverUnlock(privconn); @@ -4471,7 +4471,7 @@ static int testInterfaceDestroy(virInterfacePtr iface, privinterface->active = 0; ret = 0; -cleanup: + cleanup: if (privinterface) virInterfaceObjUnlock(privinterface); testDriverUnlock(privconn); @@ -4535,7 +4535,7 @@ testStoragePoolLookupByUUID(virConnectPtr conn, ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, NULL, NULL); -cleanup: + cleanup: if (pool) virStoragePoolObjUnlock(pool); return ret; @@ -4561,7 +4561,7 @@ testStoragePoolLookupByName(virConnectPtr conn, ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, NULL, NULL); -cleanup: + cleanup: if (pool) virStoragePoolObjUnlock(pool); return ret; @@ -4613,7 +4613,7 @@ testConnectListStoragePools(virConnectPtr conn, return n; -error: + error: for (n = 0; n < nnames; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -4663,7 +4663,7 @@ testConnectListDefinedStoragePools(virConnectPtr conn, return n; -error: + error: for (n = 0; n < nnames; n++) VIR_FREE(names[n]); testDriverUnlock(privconn); @@ -4703,7 +4703,7 @@ static int testStoragePoolIsActive(virStoragePoolPtr pool) } ret = virStoragePoolObjIsActive(obj); -cleanup: + cleanup: if (obj) virStoragePoolObjUnlock(obj); return ret; @@ -4724,7 +4724,7 @@ static int testStoragePoolIsPersistent(virStoragePoolPtr pool) } ret = obj->configFile ? 1 : 0; -cleanup: + cleanup: if (obj) virStoragePoolObjUnlock(obj); return ret; @@ -4761,7 +4761,7 @@ testStoragePoolCreate(virStoragePoolPtr pool, privpool->active = 1; ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -4814,7 +4814,7 @@ testConnectFindStoragePoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, _("pool type '%s' does not support source discovery"), type); } -cleanup: + cleanup: virStoragePoolSourceFree(source); return ret; } @@ -4859,7 +4859,7 @@ testStoragePoolCreateXML(virConnectPtr conn, ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, NULL, NULL); -cleanup: + cleanup: virStoragePoolDefFree(def); if (pool) virStoragePoolObjUnlock(pool); @@ -4900,7 +4900,7 @@ testStoragePoolDefineXML(virConnectPtr conn, ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, NULL, NULL); -cleanup: + cleanup: virStoragePoolDefFree(def); if (pool) virStoragePoolObjUnlock(pool); @@ -4933,7 +4933,7 @@ testStoragePoolUndefine(virStoragePoolPtr pool) virStoragePoolObjRemove(&privconn->pools, privpool); ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); testDriverUnlock(privconn); @@ -4967,7 +4967,7 @@ testStoragePoolBuild(virStoragePoolPtr pool, } ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5004,7 +5004,7 @@ testStoragePoolDestroy(virStoragePoolPtr pool) } ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); testDriverUnlock(privconn); @@ -5040,7 +5040,7 @@ testStoragePoolDelete(virStoragePoolPtr pool, ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5074,7 +5074,7 @@ testStoragePoolRefresh(virStoragePoolPtr pool, } ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5109,7 +5109,7 @@ testStoragePoolGetInfo(virStoragePoolPtr pool, info->available = privpool->def->available; ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5137,7 +5137,7 @@ testStoragePoolGetXMLDesc(virStoragePoolPtr pool, ret = virStoragePoolDefFormat(privpool->def); -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5168,7 +5168,7 @@ testStoragePoolGetAutostart(virStoragePoolPtr pool, } ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5202,7 +5202,7 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool, privpool->autostart = autostart; ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5234,7 +5234,7 @@ testStoragePoolNumOfVolumes(virStoragePoolPtr pool) ret = privpool->volumes.count; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5393,7 +5393,7 @@ testStorageVolLookupByName(virStoragePoolPtr pool, privvol->name, privvol->key, NULL, NULL); -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5538,7 +5538,7 @@ testStorageVolCreateXML(virStoragePoolPtr pool, NULL, NULL); privvol = NULL; -cleanup: + cleanup: virStorageVolDefFree(privvol); if (privpool) virStoragePoolObjUnlock(privpool); @@ -5622,7 +5622,7 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool, NULL, NULL); privvol = NULL; -cleanup: + cleanup: virStorageVolDefFree(privvol); if (privpool) virStoragePoolObjUnlock(privpool); @@ -5682,7 +5682,7 @@ testStorageVolDelete(virStorageVolPtr vol, } ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5742,7 +5742,7 @@ testStorageVolGetInfo(virStorageVolPtr vol, info->allocation = privvol->allocation; ret = 0; -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5786,7 +5786,7 @@ testStorageVolGetXMLDesc(virStorageVolPtr vol, ret = virStorageVolDefFormat(privpool->def, privvol); -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5827,7 +5827,7 @@ testStorageVolGetPath(virStorageVolPtr vol) ignore_value(VIR_STRDUP(ret, privvol->target.path)); -cleanup: + cleanup: if (privpool) virStoragePoolObjUnlock(privpool); return ret; @@ -5930,7 +5930,7 @@ testNodeDeviceLookupByName(virConnectPtr conn, const char *name) ret = virGetNodeDevice(conn, name); -cleanup: + cleanup: if (obj) virNodeDeviceObjUnlock(obj); return ret; @@ -5959,7 +5959,7 @@ testNodeDeviceGetXMLDesc(virNodeDevicePtr dev, ret = virNodeDeviceDefFormat(obj->def); -cleanup: + cleanup: if (obj) virNodeDeviceObjUnlock(obj); return ret; @@ -5990,7 +5990,7 @@ testNodeDeviceGetParent(virNodeDevicePtr dev) "%s", _("no parent for this device")); } -cleanup: + cleanup: if (obj) virNodeDeviceObjUnlock(obj); return ret; @@ -6021,7 +6021,7 @@ testNodeDeviceNumOfCaps(virNodeDevicePtr dev) ++ncaps; ret = ncaps; -cleanup: + cleanup: if (obj) virNodeDeviceObjUnlock(obj); return ret; @@ -6054,7 +6054,7 @@ testNodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) } ret = ncaps; -cleanup: + cleanup: if (obj) virNodeDeviceObjUnlock(obj); if (ret == -1) { @@ -6124,7 +6124,7 @@ testNodeDeviceCreateXML(virConnectPtr conn, dev = virGetNodeDevice(conn, def->name); def = NULL; -cleanup: + cleanup: testDriverUnlock(driver); virNodeDeviceDefFree(def); VIR_FREE(wwnn); @@ -6175,7 +6175,7 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) virNodeDeviceObjLock(obj); virNodeDeviceObjRemove(&driver->devs, obj); -out: + out: if (obj) virNodeDeviceObjUnlock(obj); VIR_FREE(parent_name); @@ -6385,7 +6385,7 @@ testNodeGetCPUMap(virConnectPtr conn, ret = 8; -cleanup: + cleanup: testDriverUnlock(privconn); return ret; } @@ -6459,7 +6459,7 @@ testDomainManagedSave(virDomainPtr dom, unsigned int flags) vm->hasManagedSave = true; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) { @@ -6490,7 +6490,7 @@ testDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) } ret = vm->hasManagedSave; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); testDriverUnlock(privconn); @@ -6516,7 +6516,7 @@ testDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) vm->hasManagedSave = false; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); testDriverUnlock(privconn); @@ -6568,7 +6568,7 @@ testDomainSnapshotNum(virDomainPtr domain, unsigned int flags) n = virDomainSnapshotObjListNum(vm->snapshots, NULL, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -6592,7 +6592,7 @@ testDomainSnapshotListNames(virDomainPtr domain, n = virDomainSnapshotObjListGetNames(vm->snapshots, NULL, names, nameslen, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -6614,7 +6614,7 @@ testDomainListAllSnapshots(virDomainPtr domain, n = virDomainListSnapshots(vm->snapshots, NULL, domain, snaps, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -6642,7 +6642,7 @@ testDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, n = virDomainSnapshotObjListGetNames(vm->snapshots, snap, names, nameslen, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -6667,7 +6667,7 @@ testDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, n = virDomainSnapshotObjListNum(vm->snapshots, snap, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -6694,7 +6694,7 @@ testDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, n = virDomainListSnapshots(vm->snapshots, snap, snapshot->domain, snaps, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return n; @@ -6719,7 +6719,7 @@ testDomainSnapshotLookupByName(virDomainPtr domain, snapshot = virGetDomainSnapshot(domain, snap->def->name); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return snapshot; @@ -6739,7 +6739,7 @@ testDomainHasCurrentSnapshot(virDomainPtr domain, ret = (vm->current_snapshot != NULL); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -6770,7 +6770,7 @@ testDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, parent = virGetDomainSnapshot(snapshot->domain, snap->def->parent); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return parent; @@ -6796,7 +6796,7 @@ testDomainSnapshotCurrent(virDomainPtr domain, snapshot = virGetDomainSnapshot(domain, vm->current_snapshot->def->name); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return snapshot; @@ -6823,7 +6823,7 @@ testDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, xml = virDomainSnapshotDefFormat(uuidstr, snap->def, flags, 0); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return xml; @@ -6844,7 +6844,7 @@ testDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, ret = (vm->current_snapshot && STREQ(snapshot->name, vm->current_snapshot->def->name)); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -6868,7 +6868,7 @@ testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, ret = 1; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -6998,7 +6998,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain, } snapshot = virGetDomainSnapshot(domain, snap->def->name); -cleanup: + cleanup: VIR_FREE(xml); if (vm) { if (snapshot) { @@ -7150,7 +7150,7 @@ testDomainSnapshotDelete(virDomainSnapshotPtr snapshot, } ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -7356,7 +7356,7 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, vm->current_snapshot = snap; ret = 0; -cleanup: + cleanup: if (event) { testObjectEventQueue(privconn, event); if (event2) -- 1.8.3.2

--- src/vbox/vbox_MSCOMGlue.c | 6 +-- src/vbox/vbox_XPCOMCGlue.c | 2 +- src/vbox/vbox_tmpl.c | 106 ++++++++++++++++++++++----------------------- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index 0a0b4d1..c1d3ec3 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -389,7 +389,7 @@ vboxLookupRegistryValue(HKEY key, const char *keyName, const char *valueName) value[length] = '\0'; } - cleanup: + cleanup: return value; } @@ -441,7 +441,7 @@ vboxLookupVersionInRegistry(void) result = 0; - cleanup: + cleanup: VIR_FREE(value); RegCloseKey(key); @@ -580,7 +580,7 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVirtualBox **ppVirtualBox, result = 0; - cleanup: + cleanup: if (result < 0) { if (vboxVirtualBox != NULL) { vboxVirtualBox->vtbl->nsisupports.Release((nsISupports *)vboxVirtualBox); diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 7775079..d0c4a15 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -164,7 +164,7 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing, VIR_DEBUG("Found %s in dynamic linker search path", DYNLIB_NAME); } -cleanup: + cleanup: if (hVBoxXPCOMC != NULL && result < 0) { dlclose(hVBoxXPCOMC); hVBoxXPCOMC = NULL; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 06b24b3..5839184 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -856,7 +856,7 @@ vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16, result = 0; -cleanup: + cleanup: VBOX_UTF8_FREE(utf8); return result; @@ -907,7 +907,7 @@ static virCapsPtr vboxCapsInit(void) return caps; -no_memory: + no_memory: virObjectUnref(caps); return NULL; } @@ -960,7 +960,7 @@ vboxInitialize(vboxGlobalData *data) return 0; -cleanup: + cleanup: return -1; } @@ -1202,7 +1202,7 @@ static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) } } -cleanup: + cleanup: vboxArrayRelease(&machines); return ret; } @@ -1238,7 +1238,7 @@ static int vboxConnectNumOfDomains(virConnectPtr conn) } } -cleanup: + cleanup: vboxArrayRelease(&machines); return ret; } @@ -1569,7 +1569,7 @@ static int vboxDomainIsPersistent(virDomainPtr dom ATTRIBUTE_UNUSED) ret = 1; -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; @@ -1595,7 +1595,7 @@ static int vboxDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) ret = 0; -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; @@ -1647,7 +1647,7 @@ static int vboxDomainSuspend(virDomainPtr dom) } } -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; @@ -1700,7 +1700,7 @@ static int vboxDomainResume(virDomainPtr dom) } } -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; @@ -1754,7 +1754,7 @@ static int vboxDomainShutdownFlags(virDomainPtr dom, VBOX_SESSION_CLOSE(); } -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; @@ -1809,7 +1809,7 @@ static int vboxDomainReboot(virDomainPtr dom, unsigned int flags) } } -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; @@ -1871,7 +1871,7 @@ vboxDomainDestroyFlags(virDomainPtr dom, VBOX_SESSION_CLOSE(); } -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; @@ -1946,7 +1946,7 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) } } -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; @@ -2050,7 +2050,7 @@ static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) vboxArrayRelease(&machines); -cleanup: + cleanup: return ret; } @@ -2085,7 +2085,7 @@ vboxDomainGetState(virDomainPtr dom, ret = 0; -cleanup: + cleanup: vboxIIDUnalloc(&domiid); return ret; } @@ -2356,10 +2356,10 @@ static void vboxHostDeviceGetXMLDesc(vboxGlobalData *data, virDomainDefPtr def, USBFilterCount++; } -release_filters: + release_filters: vboxArrayRelease(&deviceFilters); #if VBOX_API_VERSION < 4003000 -release_controller: + release_controller: VBOX_RELEASE(USBController); #else VBOX_RELEASE(USBDeviceFilters); @@ -2367,7 +2367,7 @@ release_controller: return; -release_hostdevs: + release_hostdevs: for (i = 0; i < def->nhostdevs; i++) virDomainHostdevDefFree(def->hostdevs[i]); VIR_FREE(def->hostdevs); @@ -3047,7 +3047,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { } } -sharedFoldersCleanup: + sharedFoldersCleanup: vboxArrayRelease(&sharedFolders); /* dump network cards if present */ @@ -3491,7 +3491,7 @@ sharedFoldersCleanup: if (gotAllABoutDef == 0) ret = virDomainDefFormat(def, flags); -cleanup: + cleanup: vboxIIDUnalloc(&iid); virDomainDefFree(def); return ret; @@ -3546,7 +3546,7 @@ static int vboxConnectListDefinedDomains(virConnectPtr conn, char ** const names } } -cleanup: + cleanup: vboxArrayRelease(&machines); return ret; } @@ -3584,7 +3584,7 @@ static int vboxConnectNumOfDefinedDomains(virConnectPtr conn) } } -cleanup: + cleanup: vboxArrayRelease(&machines); return ret; } @@ -3817,7 +3817,7 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) /* Do the cleanup and take care you dont leak any memory */ vboxArrayRelease(&machines); -cleanup: + cleanup: return ret; } @@ -5299,7 +5299,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) return ret; -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); virDomainDefFree(def); @@ -5679,7 +5679,7 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, } } -cleanup: + cleanup: vboxIIDUnalloc(&iid); virDomainDefFree(def); virDomainDeviceDefFree(dev); @@ -5851,7 +5851,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) } } -cleanup: + cleanup: vboxIIDUnalloc(&iid); virDomainDefFree(def); virDomainDeviceDefFree(dev); @@ -5946,11 +5946,11 @@ vboxDomainSnapshotGetAll(virDomainPtr dom, vboxArrayRelease(&children); } -out: + out: *snapshots = list; return count; -error: + error: if (list) { for (next = 0; next < count; next++) VBOX_RELEASE(list[next]); @@ -6002,7 +6002,7 @@ vboxDomainSnapshotGet(vboxGlobalData *data, goto cleanup; } -cleanup: + cleanup: if (count > 0) { for (i = 0; i < count; i++) { if (snapshots[i] != snapshot) @@ -6118,7 +6118,7 @@ vboxDomainSnapshotCreateXML(virDomainPtr dom, ret = virGetDomainSnapshot(dom, def->name); -cleanup: + cleanup: VBOX_RELEASE(progress); VBOX_UTF16_FREE(description); VBOX_UTF16_FREE(name); @@ -6232,7 +6232,7 @@ vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, virUUIDFormat(dom->uuid, uuidstr); ret = virDomainSnapshotDefFormat(uuidstr, def, flags, 0); -cleanup: + cleanup: virDomainSnapshotDefFree(def); VBOX_RELEASE(parent); VBOX_RELEASE(snap); @@ -6282,7 +6282,7 @@ vboxDomainSnapshotNum(virDomainPtr dom, else ret = snapshotCount; -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; @@ -6367,7 +6367,7 @@ vboxDomainSnapshotListNames(virDomainPtr dom, else ret = nameslen; -cleanup: + cleanup: if (count > 0) { for (i = 0; i < count; i++) VBOX_RELEASE(snapshots[i]); @@ -6404,7 +6404,7 @@ vboxDomainSnapshotLookupByName(virDomainPtr dom, ret = virGetDomainSnapshot(dom, name); -cleanup: + cleanup: VBOX_RELEASE(snapshot); VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); @@ -6443,7 +6443,7 @@ vboxDomainHasCurrentSnapshot(virDomainPtr dom, else ret = 0; -cleanup: + cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; @@ -6505,7 +6505,7 @@ vboxDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, ret = virGetDomainSnapshot(dom, name); -cleanup: + cleanup: VBOX_UTF8_FREE(name); VBOX_UTF16_FREE(nameUtf16); VBOX_RELEASE(snap); @@ -6565,7 +6565,7 @@ vboxDomainSnapshotCurrent(virDomainPtr dom, ret = virGetDomainSnapshot(dom, name); -cleanup: + cleanup: VBOX_UTF8_FREE(name); VBOX_UTF16_FREE(nameUtf16); VBOX_RELEASE(snapshot); @@ -6627,7 +6627,7 @@ vboxDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, ret = STREQ(snapshot->name, name); -cleanup: + cleanup: VBOX_UTF8_FREE(name); VBOX_UTF16_FREE(nameUtf16); VBOX_RELEASE(snap); @@ -6664,7 +6664,7 @@ vboxDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, ret = 0; -cleanup: + cleanup: VBOX_RELEASE(snap); VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); @@ -6697,7 +6697,7 @@ vboxDomainSnapshotRestore(virDomainPtr dom, ret = 0; -cleanup: + cleanup: vboxIIDUnalloc(&iid); return ret; } @@ -6769,7 +6769,7 @@ vboxDomainSnapshotRestore(virDomainPtr dom, ret = 0; -cleanup: + cleanup: VBOX_RELEASE(progress); VBOX_RELEASE(console); VBOX_SESSION_CLOSE(); @@ -6846,7 +6846,7 @@ vboxDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } else ret = 0; -cleanup: + cleanup: VBOX_RELEASE(prevSnapshot); VBOX_RELEASE(newSnapshot); vboxIIDUnalloc(&domiid); @@ -6901,7 +6901,7 @@ vboxDomainSnapshotDeleteSingle(vboxGlobalData *data, ret = 0; -cleanup: + cleanup: VBOX_RELEASE(progress); vboxIIDUnalloc(&iid); return ret; @@ -6931,7 +6931,7 @@ vboxDomainSnapshotDeleteTree(vboxGlobalData *data, ret = vboxDomainSnapshotDeleteSingle(data, console, snapshot); -cleanup: + cleanup: vboxArrayRelease(&children); return ret; } @@ -7000,7 +7000,7 @@ vboxDomainSnapshotDelete(virDomainSnapshotPtr snapshot, else ret = vboxDomainSnapshotDeleteSingle(data, console, snap); -cleanup: + cleanup: VBOX_RELEASE(console); VBOX_RELEASE(snap); vboxIIDUnalloc(&domiid); @@ -7578,7 +7578,7 @@ static virDrvOpenStatus vboxNetworkOpen(virConnectPtr conn, /* conn->networkPrivateData = some network specific data */ return VIR_DRV_OPEN_SUCCESS; -cleanup: + cleanup: return VIR_DRV_OPEN_DECLINED; } @@ -8032,7 +8032,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) VBOX_UTF16_FREE(networkInterfaceNameUtf16); VBOX_RELEASE(host); -cleanup: + cleanup: virNetworkDefFree(def); return ret; } @@ -8128,7 +8128,7 @@ vboxNetworkUndefineDestroy(virNetworkPtr network, bool removeinterface) ret = 0; -cleanup: + cleanup: VIR_FREE(networkNameUtf8); return ret; } @@ -8201,7 +8201,7 @@ static int vboxNetworkCreate(virNetworkPtr network) ret = 0; -cleanup: + cleanup: VIR_FREE(networkNameUtf8); return ret; } @@ -8366,7 +8366,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network, ret = virNetworkDefFormat(def, 0); -cleanup: + cleanup: virNetworkDefFree(def); VIR_FREE(networkNameUtf8); return ret; @@ -8832,7 +8832,7 @@ static virStorageVolPtr vboxStorageVolCreateXML(virStoragePoolPtr pool, VBOX_UTF16_FREE(hddFormatUtf16); VBOX_UTF16_FREE(hddNameUtf16); -cleanup: + cleanup: virStorageVolDefFree(def); return ret; } @@ -9374,7 +9374,7 @@ vboxDomainScreenshot(virDomainPtr dom, _("unable to open stream")); VIR_FREE(ret); } -endjob: + endjob: VIR_FREE(screenData); VBOX_RELEASE(display); } @@ -9534,7 +9534,7 @@ vboxConnectListAllDomains(virConnectPtr conn, ret = count; -cleanup: + cleanup: if (doms) { for (i = 0; i < count; i++) { if (doms[i]) -- 1.8.3.2

--- src/access/viraccessdriverpolkit.c | 4 +- src/access/viraccessmanager.c | 2 +- src/bhyve/bhyve_command.c | 4 +- src/bhyve/bhyve_driver.c | 26 ++++----- src/bhyve/bhyve_process.c | 4 +- src/datatypes.c | 20 +++---- src/driver.c | 2 +- src/fdstream.c | 16 +++--- src/hyperv/hyperv_driver.c | 44 +++++++-------- src/hyperv/hyperv_util.c | 2 +- src/hyperv/hyperv_wmi.c | 4 +- src/interface/interface_backend_netcf.c | 28 ++++----- src/interface/interface_backend_udev.c | 26 ++++----- src/libvirt-lxc.c | 6 +- src/libvirt-qemu.c | 10 ++-- src/node_device/node_device_driver.c | 18 +++--- src/node_device/node_device_hal.c | 4 +- src/node_device/node_device_linux_sysfs.c | 2 +- src/node_device/node_device_udev.c | 46 +++++++-------- src/nodeinfo.c | 36 ++++++------ src/openvz/openvz_conf.c | 26 ++++----- src/openvz/openvz_driver.c | 74 ++++++++++++------------ src/openvz/openvz_util.c | 2 +- src/phyp/phyp_driver.c | 94 +++++++++++++++---------------- src/secret/secret_driver.c | 34 +++++------ src/security/security_apparmor.c | 26 ++++----- src/security/security_dac.c | 10 ++-- src/security/security_manager.c | 2 +- src/security/security_selinux.c | 32 +++++------ src/security/virt-aa-helper.c | 24 ++++---- src/uml/uml_conf.c | 4 +- src/uml/uml_driver.c | 74 ++++++++++++------------ src/vmware/vmware_conf.c | 14 ++--- src/vmware/vmware_driver.c | 38 ++++++------- src/vmx/vmx.c | 36 ++++++------ src/xenapi/xenapi_driver.c | 12 ++-- src/xenapi/xenapi_utils.c | 8 +-- src/xenxs/xen_sxpr.c | 22 ++++---- src/xenxs/xen_xm.c | 12 ++-- 39 files changed, 424 insertions(+), 424 deletions(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c index 70db860..8ffb828 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -125,7 +125,7 @@ virAccessDriverPolkitFormatProcess(const char *actionid) goto cleanup; #endif -cleanup: + cleanup: virObjectUnref(identity); return ret; } @@ -181,7 +181,7 @@ virAccessDriverPolkitCheck(virAccessManagerPtr manager ATTRIBUTE_UNUSED, goto cleanup; } -cleanup: + cleanup: virCommandFree(cmd); VIR_FREE(actionid); VIR_FREE(process); diff --git a/src/access/viraccessmanager.c b/src/access/viraccessmanager.c index c042ccf..bcf552b 100644 --- a/src/access/viraccessmanager.c +++ b/src/access/viraccessmanager.c @@ -170,7 +170,7 @@ virAccessManagerPtr virAccessManagerNewStack(const char **names) return manager; -error: + error: virObjectUnref(manager); return NULL; } diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index b9bc0a6..a15d345 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -99,7 +99,7 @@ virBhyveTapGetRealDeviceName(char *name) virReportSystemError(errno, "%s", _("Unable to iterate over TAP devices")); -cleanup: + cleanup: VIR_FREE(devpath); VIR_FORCE_CLOSE(fd); closedir(dirp); @@ -282,7 +282,7 @@ virBhyveProcessBuildBhyveCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, return cmd; -error: + error: virCommandFree(cmd); return NULL; } diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index a524d35..f54dff0 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -94,7 +94,7 @@ bhyveBuildCapabilities(void) return caps; -error: + error: virObjectUnref(caps); return NULL; } @@ -231,7 +231,7 @@ bhyveDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) info->nrVirtCpu = vm->def->vcpus; ret = 0; -cleanup: + cleanup: virObjectUnlock(vm); return ret; } @@ -256,7 +256,7 @@ bhyveDomainGetState(virDomainPtr domain, *state = virDomainObjGetState(vm, reason); ret = 0; -cleanup: + cleanup: virObjectUnlock(vm); return ret; } @@ -275,7 +275,7 @@ bhyveDomainIsActive(virDomainPtr domain) ret = virDomainObjIsActive(obj); -cleanup: + cleanup: virObjectUnlock(obj); return ret; } @@ -294,7 +294,7 @@ bhyveDomainIsPersistent(virDomainPtr domain) ret = obj->persistent; -cleanup: + cleanup: virObjectUnlock(obj); return ret; } @@ -313,7 +313,7 @@ bhyveDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) ret = virDomainDefFormat(vm->def, flags); -cleanup: + cleanup: virObjectUnlock(vm); return ret; } @@ -349,7 +349,7 @@ bhyveDomainDefineXML(virConnectPtr conn, const char *xml) if (virDomainSaveConfig(BHYVE_CONFIG_DIR, vm->def) < 0) goto cleanup; -cleanup: + cleanup: virDomainDefFree(def); virObjectUnlock(vm); @@ -389,7 +389,7 @@ bhyveDomainUndefine(virDomainPtr domain) ret = 0; -cleanup: + cleanup: virObjectUnlock(vm); return ret; } @@ -500,7 +500,7 @@ bhyveDomainLookupByUUID(virConnectPtr conn, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: virObjectUnlock(vm); return dom; } @@ -527,7 +527,7 @@ static virDomainPtr bhyveDomainLookupByName(virConnectPtr conn, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: virObjectUnlock(vm); return dom; } @@ -562,7 +562,7 @@ bhyveDomainCreateWithFlags(virDomainPtr dom, VIR_DOMAIN_RUNNING_BOOTED, start_flags); -cleanup: + cleanup: virObjectUnlock(vm); return ret; } @@ -594,7 +594,7 @@ bhyveDomainDestroy(virDomainPtr dom) ret = virBhyveProcessStop(privconn, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); -cleanup: + cleanup: virObjectUnlock(vm); return ret; } @@ -710,7 +710,7 @@ bhyveStateInitialize(bool priveleged ATTRIBUTE_UNUSED, return 0; -cleanup: + cleanup: bhyveStateCleanup(); return -1; } diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 423185a..b37855e 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -158,7 +158,7 @@ virBhyveProcessStart(virConnectPtr conn, ret = 0; -cleanup: + cleanup: if (ret < 0) { virCommandPtr destroy_cmd; if ((destroy_cmd = virBhyveProcessBuildDestroyCmd(driver, vm)) != NULL) { @@ -232,7 +232,7 @@ virBhyveProcessStop(bhyveConnPtr driver, vm->pid = -1; vm->def->id = -1; -cleanup: + cleanup: virCommandFree(cmd); return ret; } diff --git a/src/datatypes.c b/src/datatypes.c index cdc8c6c..87e3550 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -121,7 +121,7 @@ virGetConnect(void) return ret; -error: + error: virObjectUnref(ret); return NULL; } @@ -227,7 +227,7 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) return ret; -error: + error: virObjectUnref(ret); return NULL; } @@ -290,7 +290,7 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) return ret; -error: + error: virObjectUnref(ret); return NULL; } @@ -356,7 +356,7 @@ virGetInterface(virConnectPtr conn, const char *name, const char *mac) return ret; -error: + error: virObjectUnref(ret); return NULL; } @@ -425,7 +425,7 @@ virGetStoragePool(virConnectPtr conn, const char *name, return ret; -error: + error: virObjectUnref(ret); return NULL; } @@ -503,7 +503,7 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, return ret; -error: + error: virObjectUnref(ret); return NULL; } @@ -566,7 +566,7 @@ virGetNodeDevice(virConnectPtr conn, const char *name) ret->conn = virObjectRef(conn); return ret; -error: + error: virObjectUnref(ret); return NULL; } @@ -630,7 +630,7 @@ virGetSecret(virConnectPtr conn, const unsigned char *uuid, return ret; -error: + error: virObjectUnref(ret); return NULL; } @@ -740,7 +740,7 @@ virGetNWFilter(virConnectPtr conn, const char *name, return ret; -error: + error: virObjectUnref(ret); return NULL; } @@ -800,7 +800,7 @@ virGetDomainSnapshot(virDomainPtr domain, const char *name) return ret; -error: + error: virObjectUnref(ret); return NULL; } diff --git a/src/driver.c b/src/driver.c index fdba2dc..6b79b5e 100644 --- a/src/driver.c +++ b/src/driver.c @@ -103,7 +103,7 @@ virDriverLoadModule(const char *name) VIR_FREE(regfunc); return handle; -cleanup: + cleanup: VIR_FREE(modfile); VIR_FREE(regfunc); if (handle) diff --git a/src/fdstream.c b/src/fdstream.c index d0435c7..a244bb0 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -121,7 +121,7 @@ static int virFDStreamRemoveCallback(virStreamPtr stream) ret = 0; -cleanup: + cleanup: virMutexUnlock(&fdst->lock); return ret; } @@ -149,7 +149,7 @@ static int virFDStreamUpdateCallback(virStreamPtr stream, int events) ret = 0; -cleanup: + cleanup: virMutexUnlock(&fdst->lock); return ret; } @@ -246,7 +246,7 @@ virFDStreamAddCallback(virStreamPtr st, ret = 0; -cleanup: + cleanup: virMutexUnlock(&fdst->lock); return ret; } @@ -396,7 +396,7 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) nbytes = fdst->length - fdst->offset; } -retry: + retry: ret = write(fdst->fd, bytes, nbytes); if (ret < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) { @@ -446,7 +446,7 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes) nbytes = fdst->length - fdst->offset; } -retry: + retry: ret = read(fdst->fd, bytes, nbytes); if (ret < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) { @@ -565,7 +565,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, goto error; return 0; -error: + error: VIR_FORCE_CLOSE(fd); return -1; } @@ -678,7 +678,7 @@ virFDStreamOpenFileInternal(virStreamPtr st, return 0; -error: + error: virCommandFree(cmd); VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(childfd); @@ -752,7 +752,7 @@ int virFDStreamOpenPTY(virStreamPtr st, return 0; -cleanup: + cleanup: virFDStreamClose(st); return -1; } diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 7a80885..aed9307 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -196,7 +196,7 @@ hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags priv = NULL; result = VIR_DRV_OPEN_SUCCESS; - cleanup: + cleanup: hypervFreePrivate(&priv); VIR_FREE(username); VIR_FREE(password); @@ -252,7 +252,7 @@ hypervConnectGetHostname(virConnectPtr conn) ignore_value(VIR_STRDUP(hostname, computerSystem->data->DNSHostName)); - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return hostname; @@ -349,7 +349,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) result = 0; - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); hypervFreeObject(priv, (hypervObject *)processorList); @@ -394,7 +394,7 @@ hypervConnectListDomains(virConnectPtr conn, int *ids, int maxids) success = true; - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystemList); return success ? count : -1; @@ -430,7 +430,7 @@ hypervConnectNumOfDomains(virConnectPtr conn) success = true; - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystemList); return success ? count : -1; @@ -462,7 +462,7 @@ hypervDomainLookupByID(virConnectPtr conn, int id) hypervMsvmComputerSystemToDomain(conn, computerSystem, &domain); - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return domain; @@ -498,7 +498,7 @@ hypervDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) hypervMsvmComputerSystemToDomain(conn, computerSystem, &domain); - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return domain; @@ -531,7 +531,7 @@ hypervDomainLookupByName(virConnectPtr conn, const char *name) hypervMsvmComputerSystemToDomain(conn, computerSystem, &domain); - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return domain; @@ -560,7 +560,7 @@ hypervDomainSuspend(virDomainPtr domain) result = hypervInvokeMsvmComputerSystemRequestStateChange (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_PAUSED); - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return result; @@ -589,7 +589,7 @@ hypervDomainResume(virDomainPtr domain) result = hypervInvokeMsvmComputerSystemRequestStateChange (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_ENABLED); - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return result; @@ -621,7 +621,7 @@ hypervDomainDestroyFlags(virDomainPtr domain, unsigned int flags) result = hypervInvokeMsvmComputerSystemRequestStateChange (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_DISABLED); - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return result; @@ -743,7 +743,7 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) result = 0; - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); hypervFreeObject(priv, (hypervObject *)virtualSystemSettingData); hypervFreeObject(priv, (hypervObject *)processorSettingData); @@ -776,7 +776,7 @@ hypervDomainGetState(virDomainPtr domain, int *state, int *reason, result = 0; - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return result; @@ -909,7 +909,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) xml = virDomainDefFormat(def, flags); - cleanup: + cleanup: virDomainDefFree(def); hypervFreeObject(priv, (hypervObject *)computerSystem); hypervFreeObject(priv, (hypervObject *)virtualSystemSettingData); @@ -961,7 +961,7 @@ hypervConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxn success = true; - cleanup: + cleanup: if (!success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); @@ -1005,7 +1005,7 @@ hypervConnectNumOfDefinedDomains(virConnectPtr conn) success = true; - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystemList); return success ? count : -1; @@ -1035,7 +1035,7 @@ hypervDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) result = hypervInvokeMsvmComputerSystemRequestStateChange (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_ENABLED); - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return result; @@ -1109,7 +1109,7 @@ hypervDomainIsActive(virDomainPtr domain) result = hypervIsMsvmComputerSystemActive(computerSystem, NULL) ? 1 : 0; - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return result; @@ -1158,7 +1158,7 @@ hypervDomainManagedSave(virDomainPtr domain, unsigned int flags) result = hypervInvokeMsvmComputerSystemRequestStateChange (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_SUSPENDED); - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return result; @@ -1182,7 +1182,7 @@ hypervDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) result = computerSystem->data->EnabledState == MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SUSPENDED ? 1 : 0; - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return result; @@ -1213,7 +1213,7 @@ hypervDomainManagedSaveRemove(virDomainPtr domain, unsigned int flags) result = hypervInvokeMsvmComputerSystemRequestStateChange (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_DISABLED); - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); return result; @@ -1336,7 +1336,7 @@ hypervConnectListAllDomains(virConnectPtr conn, doms = NULL; ret = count; -cleanup: + cleanup: if (doms) { for (i = 0; i < count; ++i) { virDomainFree(doms[i]); diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index 3b8f491..ebf9eac 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -77,7 +77,7 @@ hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri) result = 0; - cleanup: + cleanup: if (result < 0) { hypervFreeParsedUri(parsedUri); } diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index bf472b6..6e6f629 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -236,7 +236,7 @@ hypervEnumAndPull(hypervPrivate *priv, virBufferPtr query, const char *root, result = 0; - cleanup: + cleanup: if (options != NULL) { wsmc_options_destroy(options); } @@ -517,7 +517,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, result = 0; - cleanup: + cleanup: if (options != NULL) { wsmc_options_destroy(options); } diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 666b5d4..4d55653 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -141,7 +141,7 @@ netcfStateReload(void) } ret = 0; -cleanup: + cleanup: virObjectUnlock(driverState); return ret; @@ -170,7 +170,7 @@ netcfGetMinimalDefForDevice(struct netcf_if *iface) return def; -cleanup: + cleanup: virInterfaceDefFree(def); return NULL; } @@ -261,7 +261,7 @@ netcfInterfaceObjIsActive(struct netcf_if *iface, *active = flags & NETCF_IFACE_ACTIVE; ret = 0; -cleanup: + cleanup: virObjectUnref(driverState); return ret; } @@ -377,7 +377,7 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn, ret = want; -cleanup: + cleanup: if (names && count > 0) for (i = 0; i < count; i++) VIR_FREE(names[i]); @@ -474,7 +474,7 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn, ret = want; -cleanup: + cleanup: if (allnames && count > 0) for (i = 0; i < count; i++) VIR_FREE(allnames[i]); @@ -683,7 +683,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, ret = niface_objs; -cleanup: + cleanup: ncf_if_free(iface); if (names && count > 0) @@ -737,7 +737,7 @@ static virInterfacePtr netcfInterfaceLookupByName(virConnectPtr conn, ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); -cleanup: + cleanup: ncf_if_free(iface); virInterfaceDefFree(def); virObjectUnlock(driver); @@ -786,7 +786,7 @@ static virInterfacePtr netcfInterfaceLookupByMACString(virConnectPtr conn, ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); -cleanup: + cleanup: ncf_if_free(iface); virInterfaceDefFree(def); virObjectUnlock(driver); @@ -842,7 +842,7 @@ static char *netcfInterfaceGetXMLDesc(virInterfacePtr ifinfo, goto cleanup; } -cleanup: + cleanup: ncf_if_free(iface); VIR_FREE(xmlstr); virInterfaceDefFree(ifacedef); @@ -892,7 +892,7 @@ static virInterfacePtr netcfInterfaceDefineXML(virConnectPtr conn, ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); -cleanup: + cleanup: ncf_if_free(iface); VIR_FREE(xmlstr); virInterfaceDefFree(ifacedef); @@ -933,7 +933,7 @@ static int netcfInterfaceUndefine(virInterfacePtr ifinfo) goto cleanup; } -cleanup: + cleanup: ncf_if_free(iface); virInterfaceDefFree(def); virObjectUnlock(driver); @@ -986,7 +986,7 @@ static int netcfInterfaceCreate(virInterfacePtr ifinfo, goto cleanup; } -cleanup: + cleanup: ncf_if_free(iface); virInterfaceDefFree(def); virObjectUnlock(driver); @@ -1039,7 +1039,7 @@ static int netcfInterfaceDestroy(virInterfacePtr ifinfo, goto cleanup; } -cleanup: + cleanup: ncf_if_free(iface); virInterfaceDefFree(def); virObjectUnlock(driver); @@ -1073,7 +1073,7 @@ static int netcfInterfaceIsActive(virInterfacePtr ifinfo) ret = active ? 1 : 0; -cleanup: + cleanup: ncf_if_free(iface); virInterfaceDefFree(def); virObjectUnlock(driver); diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 37f42bb..4fb8eab 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -85,7 +85,7 @@ udevGetMinimalDefForDevice(struct udev_device *dev) return def; -cleanup: + cleanup: virInterfaceDefFree(def); return NULL; } @@ -154,7 +154,7 @@ udevInterfaceOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; -cleanup: + cleanup: VIR_FREE(driverState); return VIR_DRV_OPEN_ERROR; @@ -220,7 +220,7 @@ udevNumOfInterfacesByStatus(virConnectPtr conn, virUdevStatus status, virInterfaceDefFree(def); } -cleanup: + cleanup: if (enumerate) udev_enumerate_unref(enumerate); udev_unref(udev); @@ -288,7 +288,7 @@ udevListInterfacesByStatus(virConnectPtr conn, return count; -error: + error: if (enumerate) udev_enumerate_unref(enumerate); udev_unref(udev); @@ -462,7 +462,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, return count; -cleanup: + cleanup: if (enumerate) udev_enumerate_unref(enumerate); udev_unref(udev); @@ -505,7 +505,7 @@ udevInterfaceLookupByName(virConnectPtr conn, const char *name) ret = virGetInterface(conn, def->name, def->mac); udev_device_unref(dev); -cleanup: + cleanup: udev_unref(udev); virInterfaceDefFree(def); @@ -568,7 +568,7 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) ret = virGetInterface(conn, def->name, def->mac); udev_device_unref(dev); -cleanup: + cleanup: if (enumerate) udev_enumerate_unref(enumerate); udev_unref(udev); @@ -842,7 +842,7 @@ udevGetIfaceDefBond(struct udev *udev, return 0; -error: + error: for (i = 0; slave_count != -1 && i < slave_count; i++) { VIR_FREE(slave_list[i]); } @@ -949,7 +949,7 @@ udevGetIfaceDefBridge(struct udev *udev, return 0; -error: + error: for (i = 0; member_count != -1 && i < member_count; i++) { VIR_FREE(member_list[i]); } @@ -986,7 +986,7 @@ udevGetIfaceDefVlan(struct udev *udev ATTRIBUTE_UNUSED, return 0; -error: + error: VIR_FREE(ifacedef->data.vlan.tag); VIR_FREE(ifacedef->data.vlan.devname); @@ -1094,7 +1094,7 @@ udevGetIfaceDef(struct udev *udev, const char *name) return ifacedef; -error: + error: udev_device_unref(dev); virInterfaceDefFree(ifacedef); @@ -1128,7 +1128,7 @@ udevInterfaceGetXMLDesc(virInterfacePtr ifinfo, virInterfaceDefFree(ifacedef); -cleanup: + cleanup: /* decrement our udev ptr */ udev_unref(udev); @@ -1164,7 +1164,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) udev_device_unref(dev); -cleanup: + cleanup: udev_unref(udev); virInterfaceDefFree(def); diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index f31b556..58892df 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -89,7 +89,7 @@ virDomainLxcOpenNamespace(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -156,7 +156,7 @@ virDomainLxcEnterNamespace(virDomainPtr domain, return 0; -error: + error: virDispatchError(domain->conn); return -1; } @@ -266,7 +266,7 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr model, return 0; -error: + error: virDispatchError(NULL); return -1; } diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index 37afdfe..fed08fc 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -92,7 +92,7 @@ virDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -159,7 +159,7 @@ virDomainQemuAttach(virConnectPtr conn, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -213,7 +213,7 @@ virDomainQemuAgentCommand(virDomainPtr domain, virReportUnsupportedError(); -error: + error: virDispatchError(conn); return NULL; } @@ -299,7 +299,7 @@ virConnectDomainQemuMonitorEventRegister(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } @@ -337,7 +337,7 @@ virConnectDomainQemuMonitorEventDeregister(virConnectPtr conn, } virReportUnsupportedError(); -error: + error: virDispatchError(conn); return -1; } diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 638f074..1f3a083 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -97,7 +97,7 @@ static int update_driver_name(virNodeDeviceObjPtr dev) goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(driver_link); VIR_FREE(devpath); return ret; @@ -232,7 +232,7 @@ nodeDeviceLookupByName(virConnectPtr conn, const char *name) ret = virGetNodeDevice(conn, name); -cleanup: + cleanup: if (obj) virNodeDeviceObjUnlock(obj); return ret; @@ -284,7 +284,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, virNodeDeviceObjUnlock(obj); } -out: + out: nodeDeviceUnlock(driver); return dev; } @@ -319,7 +319,7 @@ nodeDeviceGetXMLDesc(virNodeDevicePtr dev, ret = virNodeDeviceDefFormat(obj->def); -cleanup: + cleanup: if (obj) virNodeDeviceObjUnlock(obj); return ret; @@ -355,7 +355,7 @@ nodeDeviceGetParent(virNodeDevicePtr dev) "%s", _("no parent for this device")); } -cleanup: + cleanup: if (obj) virNodeDeviceObjUnlock(obj); return ret; @@ -389,7 +389,7 @@ nodeDeviceNumOfCaps(virNodeDevicePtr dev) ++ncaps; ret = ncaps; -cleanup: + cleanup: if (obj) virNodeDeviceObjUnlock(obj); return ret; @@ -425,7 +425,7 @@ nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) } ret = ncaps; -cleanup: + cleanup: if (obj) virNodeDeviceObjUnlock(obj); if (ret == -1) { @@ -555,7 +555,7 @@ nodeDeviceCreateXML(virConnectPtr conn, virReportError(VIR_ERR_NO_NODE_DEVICE, NULL); } -cleanup: + cleanup: nodeDeviceUnlock(driver); virNodeDeviceDefFree(def); VIR_FREE(wwnn); @@ -617,7 +617,7 @@ nodeDeviceDestroy(virNodeDevicePtr dev) } ret = 0; -out: + out: if (obj) virNodeDeviceObjUnlock(obj); VIR_FREE(parent_name); diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 1ca315b..5dbc3eb 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -259,7 +259,7 @@ gather_scsi_host_cap(LibHalContext *ctx, const char *udi, goto out; } -out: + out: return retval; } @@ -527,7 +527,7 @@ dev_create(const char *udi) failure: VIR_DEBUG("FAILED TO ADD dev %s", name); -cleanup: + cleanup: VIR_FREE(privData); virNodeDeviceDefFree(def); nodeDeviceUnlock(driverState); diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 9233be5..6d9726f 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -115,7 +115,7 @@ detect_scsi_host_caps(union _virNodeDevCapData *d) } ret = 0; -cleanup: + cleanup: if (ret < 0) { /* Clear the two flags in case of producing confusing XML output */ d->scsi_host.flags &= ~(VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST | diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index ddd54e0..cf7803e 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -140,7 +140,7 @@ static int udevGetDeviceProperty(struct udev_device *udev_device, property_key, *property_value, udev_device_get_sysname(udev_device)); -out: + out: return ret; } @@ -227,7 +227,7 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device, attr_name, *attr_value, udev_device_get_sysname(udev_device)); -out: + out: return ret; } @@ -414,7 +414,7 @@ static int udevTranslatePCIIds(unsigned int vendor, ret = 0; -out: + out: return ret; } @@ -524,7 +524,7 @@ static int udevProcessPCI(struct udev_device *device, ret = 0; -out: + out: return ret; } @@ -581,7 +581,7 @@ static int udevProcessUSBDevice(struct udev_device *device, ret = 0; -out: + out: return ret; } @@ -626,7 +626,7 @@ static int udevProcessUSBInterface(struct udev_device *device, ret = 0; -out: + out: return ret; } @@ -669,7 +669,7 @@ static int udevProcessNetworkInterface(struct udev_device *device, ret = 0; -out: + out: return ret; } @@ -704,7 +704,7 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED, ret = 0; -out: + out: return ret; } @@ -727,7 +727,7 @@ static int udevProcessSCSITarget(struct udev_device *device ATTRIBUTE_UNUSED, ret = 0; -out: + out: return ret; } @@ -845,7 +845,7 @@ static int udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, ret = 0; -out: + out: if (ret != 0) { VIR_ERROR(_("Failed to process SCSI device with sysfs path '%s'"), def->sysfs_path); @@ -876,7 +876,7 @@ static int udevProcessDisk(struct udev_device *device, data->storage.size = data->storage.num_blocks * data->storage.logical_block_size; -out: + out: return ret; } @@ -924,7 +924,7 @@ static int udevProcessRemoveableMedia(struct udev_device *device, def->caps->data.storage.logical_block_size; } -out: + out: return ret; } @@ -948,7 +948,7 @@ static int udevProcessCDROM(struct udev_device *device, has_media = tmp_int; ret = udevProcessRemoveableMedia(device, def, has_media); -out: + out: return ret; } @@ -996,7 +996,7 @@ static int udevProcessSD(struct udev_device *device, data->storage.size = data->storage.num_blocks * data->storage.logical_block_size; -out: + out: return ret; } @@ -1137,7 +1137,7 @@ static int udevProcessStorage(struct udev_device *device, goto out; } -out: + out: VIR_DEBUG("Storage ret=%d", ret); return ret; } @@ -1337,7 +1337,7 @@ static int udevSetParent(struct udev_device *device, ret = 0; -out: + out: return ret; } @@ -1388,7 +1388,7 @@ static int udevAddOneDevice(struct udev_device *device) ret = 0; -out: + out: if (ret != 0) { VIR_DEBUG("Discarding device %d %p %s", ret, def, def ? NULLSTR(def->sysfs_path) : ""); @@ -1444,7 +1444,7 @@ static int udevEnumerateDevices(struct udev *udev) udevProcessDeviceListEntry(udev, list_entry); } -out: + out: udev_enumerate_unref(udev_enumerate); return ret; } @@ -1534,7 +1534,7 @@ static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, goto out; } -out: + out: udev_device_unref(device); nodeDeviceUnlock(driverState); return; @@ -1608,7 +1608,7 @@ udevGetDMIData(union _virNodeDevCapData *data) goto out; } -out: + out: VIR_FREE(tmp); if (device != NULL) { udev_device_unref(device); @@ -1647,7 +1647,7 @@ static int udevSetupSystemDev(void) ret = 0; -out: + out: if (ret == -1) { virNodeDeviceDefFree(def); } @@ -1758,10 +1758,10 @@ static int nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, goto out_unlock; } -out_unlock: + out_unlock: nodeDeviceUnlock(driverState); -out: + out: if (ret == -1) { nodeStateCleanup(); } diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 5a6e4fa..53ba716 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -196,7 +196,7 @@ freebsdNodeGetCPUStats(int cpuNum, ret = 0; -cleanup: + cleanup: VIR_FREE(cpu_times); return ret; @@ -329,7 +329,7 @@ virNodeGetCpuValue(const char *dir, unsigned int cpu, const char *file, goto cleanup; } -cleanup: + cleanup: VIR_FORCE_FCLOSE(pathfp); VIR_FREE(path); @@ -378,7 +378,7 @@ virNodeCountThreadSiblings(const char *dir, unsigned int cpu) i++; } -cleanup: + cleanup: VIR_FORCE_FCLOSE(pathfp); VIR_FREE(path); @@ -553,7 +553,7 @@ virNodeParseNode(const char *node, ret = processors; -cleanup: + cleanup: /* don't shadow a more serious error */ if (cpudir && closedir(cpudir) < 0 && ret >= 0) { virReportSystemError(errno, _("problem closing %s"), node); @@ -711,7 +711,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, if (nodeinfo->cpus && nodeinfo->nodes) goto done; -fallback: + fallback: VIR_FREE(sysfs_cpudir); if (virAsprintf(&sysfs_cpudir, "%s/cpu", sysfs_dir) < 0) @@ -727,7 +727,7 @@ fallback: nodeinfo->cores = cores; nodeinfo->threads = threads; -done: + done: /* There should always be at least one cpu, socket, node, and thread. */ if (nodeinfo->cpus == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no CPUs found")); @@ -763,7 +763,7 @@ done: ret = 0; -cleanup: + cleanup: /* don't shadow a more serious error */ if (nodedir && closedir(nodedir) < 0 && ret >= 0) { virReportSystemError(errno, _("problem closing %s"), sysfs_nodedir); @@ -861,7 +861,7 @@ linuxNodeGetCPUStats(FILE *procstat, _("Invalid cpuNum in %s"), __FUNCTION__); -cleanup: + cleanup: return ret; } @@ -967,7 +967,7 @@ linuxNodeGetMemoryStats(FILE *meminfo, ret = 0; -cleanup: + cleanup: return ret; } @@ -995,7 +995,7 @@ linuxParseCPUmax(const char *path) } while (*tmp++ != '\n'); ret++; -cleanup: + cleanup: VIR_FREE(str); return ret; } @@ -1020,7 +1020,7 @@ linuxParseCPUmap(int max_cpuid, const char *path) VIR_FREE(str); return map; -error: + error: VIR_FREE(str); virBitmapFree(map); return NULL; @@ -1044,7 +1044,7 @@ virNodeGetSiblingsList(const char *dir, int cpu_id) if (virBitmapParse(buf, 0, &ret, virNumaGetMaxCPUs()) < 0) goto cleanup; -cleanup: + cleanup: VIR_FREE(buf); VIR_FREE(path); return ret; @@ -1077,7 +1077,7 @@ int nodeGetInfo(virNodeInfoPtr nodeinfo) /* Convert to KB. */ nodeinfo->memory = physmem_total() / 1024; -cleanup: + cleanup: VIR_FORCE_FCLOSE(cpuinfo); return ret; } @@ -1319,7 +1319,7 @@ nodeSetMemoryParameterValue(virTypedParameterPtr param) } ret = 0; -cleanup: + cleanup: VIR_FREE(path); VIR_FREE(strval); return ret; @@ -1442,7 +1442,7 @@ nodeGetMemoryParameterValue(const char *field, } ret = 0; -cleanup: + cleanup: VIR_FREE(path); VIR_FREE(buf); return ret; @@ -1617,7 +1617,7 @@ nodeGetCPUMap(unsigned char **cpumap, *online = virBitmapCountBits(cpus); ret = maxpresent; -cleanup: + cleanup: if (ret < 0 && cpumap) VIR_FREE(*cpumap); virBitmapFree(cpus); @@ -1819,7 +1819,7 @@ nodeCapsInitNUMA(virCapsPtr caps) ret = 0; -cleanup: + cleanup: if (topology_failed || ret < 0) virCapabilitiesClearHostNUMACellCPUTopology(cpus, ncpus); @@ -1867,7 +1867,7 @@ nodeGetCellsFreeMemory(unsigned long long *freeMems, } ret = numCells; -cleanup: + cleanup: return ret; } diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 20c9a6f..85dd100 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -105,7 +105,7 @@ openvzExtractVersionInfo(const char *cmdstr, int *retversion) ret = 0; -cleanup: + cleanup: virCommandFree(cmd); VIR_FREE(help); @@ -160,7 +160,7 @@ openvzParseBarrierLimit(const char* value, } } ret = 0; -error: + error: VIR_FREE(str); return ret; } @@ -197,7 +197,7 @@ virCapsPtr openvzCapsInit(void) return caps; -no_memory: + no_memory: virObjectUnref(caps); return NULL; } @@ -336,7 +336,7 @@ openvzReadNetworkConf(virDomainDefPtr def, return 0; -error: + error: VIR_FREE(temp); virDomainNetDefFree(net); return -1; @@ -454,9 +454,9 @@ openvzReadFSConf(virDomainDefPtr def, VIR_FREE(temp); return 0; -no_memory: + no_memory: virReportOOMError(); -error: + error: VIR_FREE(temp); virDomainFSDefFree(fs); return -1; @@ -526,7 +526,7 @@ openvzReadMemConf(virDomainDefPtr def, int veid) } ret = 0; -error: + error: VIR_FREE(temp); return ret; } @@ -729,7 +729,7 @@ openvzWriteConfigParam(const char * conf_file, const char *param, const char *va return 0; -error: + error: VIR_FREE(line); VIR_FORCE_FCLOSE(fp); VIR_FORCE_CLOSE(temp_fd); @@ -862,7 +862,7 @@ openvz_copyfile(char* from_path, char* to_path) return 0; -error: + error: VIR_FREE(line); VIR_FORCE_FCLOSE(fp); VIR_FORCE_CLOSE(copy_fd); @@ -901,7 +901,7 @@ openvzCopyDefaultConfig(int vpsid) goto cleanup; ret = 0; -cleanup: + cleanup: VIR_FREE(confdir); VIR_FREE(default_conf_file); VIR_FREE(configfile_value); @@ -945,7 +945,7 @@ openvzLocateConfDir(void) i++; } -cleanup: + cleanup: return ret; } @@ -1016,7 +1016,7 @@ openvzGetVPSUUID(int vpsid, char *uuidstr, size_t len) } } retval = 0; -cleanup: + cleanup: VIR_FREE(line); VIR_FORCE_FCLOSE(fp); VIR_FREE(conf_file); @@ -1059,7 +1059,7 @@ openvzSetDefinedUUID(int vpsid, unsigned char *uuid) } ret = 0; -cleanup: + cleanup: VIR_FORCE_FCLOSE(fp); VIR_FREE(conf_file); return ret; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 526ddbd..87df2a7 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -206,7 +206,7 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef) ret = 0; -cleanup: + cleanup: VIR_FREE(confdir); virCommandFree(cmd); @@ -251,7 +251,7 @@ openvzSetDiskQuota(virDomainDefPtr vmdef, } ret = 0; -cleanup: + cleanup: virCommandFree(cmd); return ret; @@ -287,12 +287,12 @@ openvzDomainGetHostname(virDomainPtr dom, unsigned int flags) goto error; } -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return hostname; -error: + error: VIR_FREE(hostname); goto cleanup; } @@ -318,7 +318,7 @@ static virDomainPtr openvzDomainLookupByID(virConnectPtr conn, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -357,7 +357,7 @@ static char *openvzDomainGetOSType(virDomainPtr dom) ignore_value(VIR_STRDUP(ret, vm->def->os.type)); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -384,7 +384,7 @@ static virDomainPtr openvzDomainLookupByUUID(virConnectPtr conn, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -410,7 +410,7 @@ static virDomainPtr openvzDomainLookupByName(virConnectPtr conn, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -453,7 +453,7 @@ static int openvzDomainGetInfo(virDomainPtr dom, info->nrVirtCpu = vm->def->vcpus; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -484,7 +484,7 @@ openvzDomainGetState(virDomainPtr dom, ret = openvzGetVEStatus(vm, state, reason); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -506,7 +506,7 @@ static int openvzDomainIsActive(virDomainPtr dom) } ret = virDomainObjIsActive(obj); -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -528,7 +528,7 @@ static int openvzDomainIsPersistent(virDomainPtr dom) } ret = obj->persistent; -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -558,7 +558,7 @@ static char *openvzDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { ret = virDomainDefFormat(vm->def, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -617,7 +617,7 @@ static int openvzDomainSuspend(virDomainPtr dom) ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -656,7 +656,7 @@ static int openvzDomainResume(virDomainPtr dom) ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -702,7 +702,7 @@ openvzDomainShutdownFlags(virDomainPtr dom, dom->id = -1; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -763,7 +763,7 @@ static int openvzDomainReboot(virDomainPtr dom, virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -954,7 +954,7 @@ openvzDomainSetNetworkConfig(virConnectPtr conn, return 0; -exit: + exit: virBufferFreeAndReset(&buf); return -1; } @@ -1035,7 +1035,7 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml) if (dom) dom->id = -1; -cleanup: + cleanup: virDomainDefFree(vmdef); if (vm) virObjectUnlock(vm); @@ -1123,7 +1123,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: virDomainDefFree(vmdef); if (vm) virObjectUnlock(vm); @@ -1172,7 +1172,7 @@ openvzDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1221,7 +1221,7 @@ openvzDomainUndefineFlags(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); openvzDriverUnlock(driver); @@ -1259,7 +1259,7 @@ openvzDomainSetAutostart(virDomainPtr dom, int autostart) } ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1294,7 +1294,7 @@ openvzDomainGetAutostart(virDomainPtr dom, int *autostart) *autostart = 1; ret = 0; -cleanup: + cleanup: VIR_FREE(value); if (vm) @@ -1392,7 +1392,7 @@ static int openvzDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1479,7 +1479,7 @@ static virDrvOpenStatus openvzConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; -cleanup: + cleanup: openvzFreeDriver(driver); return VIR_DRV_OPEN_ERROR; }; @@ -1565,7 +1565,7 @@ static int openvzConnectListDomains(virConnectPtr conn ATTRIBUTE_UNUSED, } rc = got; -cleanup: + cleanup: VIR_FORCE_CLOSE(outfd); virCommandFree(cmd); return rc; @@ -1623,7 +1623,7 @@ static int openvzConnectListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED, } rc = got; -out: + out: VIR_FORCE_CLOSE(outfd); virCommandFree(cmd); if (rc < 0) { @@ -1644,7 +1644,7 @@ static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid) int err = 0; /* read statistic from /proc/vz/vestat. -sample: + sample: Version: 2.2 VEID user nice system uptime idle other.. 33 78 0 1330 59454597 142650441835148 other.. @@ -1715,7 +1715,7 @@ openvzDomainSetMemoryInternal(virDomainObjPtr vm, return 0; -cleanup: + cleanup: return -1; } @@ -1753,7 +1753,7 @@ openvzDomainGetBarrierLimit(virDomainPtr domain, } ret = 0; -cleanup: + cleanup: VIR_FREE(output); virCommandFree(cmd); return ret; @@ -1785,7 +1785,7 @@ openvzDomainSetBarrierLimit(virDomainPtr domain, goto cleanup; ret = 0; -cleanup: + cleanup: virCommandFree(cmd); return ret; } @@ -1857,7 +1857,7 @@ openvzDomainGetMemoryParameters(virDomainPtr domain, *nparams = OPENVZ_NB_MEM_PARAM; result = 0; -cleanup: + cleanup: return result; } @@ -1915,7 +1915,7 @@ openvzDomainSetMemoryParameters(virDomainPtr domain, } } result = 0; -cleanup: + cleanup: return result; } @@ -1956,7 +1956,7 @@ openvzGetVEStatus(virDomainObjPtr vm, int *status, int *reason) ret = 0; -cleanup: + cleanup: virCommandFree(cmd); VIR_FREE(outbuf); return ret; @@ -2005,7 +2005,7 @@ openvzDomainInterfaceStats(virDomainPtr dom, virReportError(VIR_ERR_INVALID_ARG, _("invalid path, '%s' is not a known interface"), path); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2109,7 +2109,7 @@ openvzDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml, ret = 0; -cleanup: + cleanup: openvzDriverUnlock(driver); virDomainDeviceDefFree(dev); if (vm) diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c index 3113751..4214335 100644 --- a/src/openvz/openvz_util.c +++ b/src/openvz/openvz_util.c @@ -79,7 +79,7 @@ openvzVEGetStringParam(virDomainPtr domain, const char* param) if (len && output[len - 1] == '\n') output[len - 1] = '\0'; -cleanup: + cleanup: virCommandFree(cmd); return output; } diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 47a317e..d0b0166 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -193,7 +193,7 @@ phypExec(LIBSSH2_SESSION *session, const char *cmd, int *exit_status, } return virBufferContentAndReset(&tex_ret); -err: + err: (*exit_status) = SSH_CMD_ERR; virBufferFreeAndReset(&tex_ret); VIR_FREE(buffer); @@ -317,7 +317,7 @@ phypCapsInit(void) return caps; -no_memory: + no_memory: virObjectUnref(caps); return NULL; } @@ -415,7 +415,7 @@ phypConnectListDomainsGeneric(virConnectPtr conn, int *ids, int nids, line++; /* skip \n */ } -cleanup: + cleanup: VIR_FREE(ret); return got; } @@ -454,7 +454,7 @@ phypUUIDTable_WriteFile(virConnectPtr conn) } return 0; -err: + err: VIR_FORCE_CLOSE(fd); return -1; } @@ -530,7 +530,7 @@ phypUUIDTable_Push(virConnectPtr conn) ret = 0; -cleanup: + cleanup: if (channel) { libssh2_channel_send_eof(channel); libssh2_channel_wait_eof(channel); @@ -564,7 +564,7 @@ phypUUIDTable_RemLpar(virConnectPtr conn, int id) return 0; -err: + err: return -1; } @@ -592,7 +592,7 @@ phypUUIDTable_AddLpar(virConnectPtr conn, unsigned char *uuid, int id) return 0; -err: + err: VIR_FREE(item); return -1; } @@ -639,7 +639,7 @@ phypUUIDTable_ReadFile(virConnectPtr conn) VIR_FORCE_CLOSE(fd); return 0; -err: + err: VIR_FORCE_CLOSE(fd); return -1; } @@ -731,7 +731,7 @@ phypUUIDTable_Pull(virConnectPtr conn) ret = 0; -cleanup: + cleanup: if (channel) { libssh2_channel_send_eof(channel); libssh2_channel_wait_eof(channel); @@ -808,7 +808,7 @@ phypUUIDTable_Init(virConnectPtr conn) ret = 0; -cleanup: + cleanup: if (ret < 0 && table_created) { for (i = 0; i < uuid_table->nlpars; i++) { VIR_FREE(uuid_table->lpars[i]); @@ -964,7 +964,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, freeaddrinfo(ai); goto err; -connected: + connected: (*internal_socket) = sock; @@ -997,7 +997,7 @@ connected: NULL)) == LIBSSH2_ERROR_EAGAIN); -keyboard_interactive: + keyboard_interactive: if (rc == LIBSSH2_ERROR_SOCKET_NONE || rc == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED || rc == LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED) { @@ -1035,10 +1035,10 @@ keyboard_interactive: goto err; } -disconnect: + disconnect: libssh2_session_disconnect(session, "Disconnecting..."); libssh2_session_free(session); -err: + err: VIR_FORCE_CLOSE(sock); VIR_FREE(userhome); VIR_FREE(pubkey); @@ -1047,7 +1047,7 @@ err: VIR_FREE(password); return NULL; -exit: + exit: VIR_FREE(userhome); VIR_FREE(pubkey); VIR_FREE(pvtkey); @@ -1152,7 +1152,7 @@ phypConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; -failure: + failure: VIR_FREE(managed_system); if (phyp_driver != NULL) { @@ -1457,7 +1457,7 @@ phypGetBackingDevice(virConnectPtr conn, const char *managed_system, if (char_ptr) *char_ptr = '\0'; -cleanup: + cleanup: VIR_FREE(ret); return backing_device; @@ -1602,7 +1602,7 @@ phypCreateServerSCSIAdapter(virConnectPtr conn) result = 0; -cleanup: + cleanup: VIR_FREE(profile); VIR_FREE(vios_name); VIR_FREE(ret); @@ -1785,7 +1785,7 @@ phypDomainAttachDevice(virDomainPtr domain, const char *xml) result = 0; -cleanup: + cleanup: VIR_FREE(ret); virDomainDeviceDefFree(dev); virDomainDefFree(def); @@ -1915,7 +1915,7 @@ phypBuildVolume(virConnectPtr conn, const char *lvname, const char *spname, key = phypStorageVolGetKey(conn, lvname); -cleanup: + cleanup: VIR_FREE(ret); return key; @@ -2027,7 +2027,7 @@ phypStorageVolCreateXML(virStoragePoolPtr pool, return vol; -err: + err: VIR_FREE(key); virStorageVolDefFree(voldef); virStoragePoolDefFree(spdef); @@ -2103,7 +2103,7 @@ phypStorageVolLookupByPath(virConnectPtr conn, const char *volname) vol = virGetStorageVol(conn, ret, volname, key, NULL, NULL); -cleanup: + cleanup: VIR_FREE(ret); VIR_FREE(key); @@ -2145,7 +2145,7 @@ phypGetStoragePoolUUID(virConnectPtr conn, unsigned char *uuid, result = 0; -cleanup: + cleanup: VIR_FREE(ret); return result; @@ -2225,7 +2225,7 @@ phypStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) VIR_FREE(voldef.key); -cleanup: + cleanup: virObjectUnref(sp); return xml; } @@ -2278,7 +2278,7 @@ phypStorageVolGetPath(virStorageVolPtr vol) if (virAsprintf(&path, "/%s/%s/%s", pv, ret, vol->name) < 0) goto cleanup; -cleanup: + cleanup: VIR_FREE(ret); VIR_FREE(path); @@ -2339,7 +2339,7 @@ phypStoragePoolListVolumes(virStoragePoolPtr pool, char **const volumes, success = true; -cleanup: + cleanup: if (!success) { for (i = 0; i < got; i++) VIR_FREE(volumes[i]); @@ -2409,7 +2409,7 @@ phypStoragePoolDestroy(virStoragePoolPtr pool) result = 0; -cleanup: + cleanup: VIR_FREE(ret); return result; @@ -2455,7 +2455,7 @@ phypBuildStoragePool(virConnectPtr conn, virStoragePoolDefPtr def) result = 0; -cleanup: + cleanup: VIR_FREE(ret); return result; @@ -2538,7 +2538,7 @@ phypConnectListStoragePools(virConnectPtr conn, char **const pools, int npools) success = true; -cleanup: + cleanup: if (!success) { for (i = 0; i < got; i++) VIR_FREE(pools[i]); @@ -2593,7 +2593,7 @@ phypStoragePoolLookupByUUID(virConnectPtr conn, } } -err: + err: VIR_FREE(local_uuid); VIR_FREE(pools); return NULL; @@ -2634,7 +2634,7 @@ phypStoragePoolCreateXML(virConnectPtr conn, return sp; -err: + err: virStoragePoolDefFree(def); virObjectUnref(sp); return NULL; @@ -2681,7 +2681,7 @@ phypStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) return virStoragePoolDefFormat(&def); -err: + err: return NULL; } @@ -2744,7 +2744,7 @@ phypInterfaceDestroy(virInterfacePtr iface, rv = 0; -cleanup: + cleanup: VIR_FREE(ret); return rv; } @@ -2854,7 +2854,7 @@ phypInterfaceDefineXML(virConnectPtr conn, const char *xml, result = virGetInterface(conn, name, mac); -cleanup: + cleanup: VIR_FREE(ret); virInterfaceDefFree(def); return result; @@ -2918,7 +2918,7 @@ phypInterfaceLookupByName(virConnectPtr conn, const char *name) result = virGetInterface(conn, name, ret); -cleanup: + cleanup: VIR_FREE(ret); return result; } @@ -2993,7 +2993,7 @@ phypConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) } } -cleanup: + cleanup: if (!success) { for (i = 0; i < got; i++) VIR_FREE(names[i]); @@ -3054,7 +3054,7 @@ phypGetLparState(virConnectPtr conn, unsigned int lpar_id) else if (STREQ(ret, "Shutting Down")) state = VIR_DOMAIN_SHUTDOWN; -cleanup: + cleanup: VIR_FREE(ret); return state; } @@ -3091,7 +3091,7 @@ phypDiskType(virConnectPtr conn, char *backing_device) else if (STREQ(ret, "FBPOOL")) disk_type = VIR_DOMAIN_DISK_TYPE_FILE; -cleanup: + cleanup: VIR_FREE(ret); return disk_type; } @@ -3160,7 +3160,7 @@ phypConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames success = true; -cleanup: + cleanup: if (!success) { for (i = 0; i < got; i++) VIR_FREE(names[i]); @@ -3218,7 +3218,7 @@ phypDomainLookupByID(virConnectPtr conn, int lpar_id) if (dom) dom->id = lpar_id; -cleanup: + cleanup: VIR_FREE(lpar_name); return dom; @@ -3273,7 +3273,7 @@ phypDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) return virDomainDefFormat(&def, flags); -err: + err: return NULL; } @@ -3302,7 +3302,7 @@ phypDomainResume(virDomainPtr dom) result = 0; -cleanup: + cleanup: VIR_FREE(ret); return result; @@ -3337,7 +3337,7 @@ phypDomainReboot(virDomainPtr dom, unsigned int flags) result = 0; - cleanup: + cleanup: VIR_FREE(ret); return result; @@ -3368,7 +3368,7 @@ phypDomainShutdown(virDomainPtr dom) result = 0; -cleanup: + cleanup: VIR_FREE(ret); return result; @@ -3443,7 +3443,7 @@ phypDomainDestroyFlags(virDomainPtr dom, dom->id = -1; result = 0; -cleanup: + cleanup: VIR_FREE(ret); return result; @@ -3517,7 +3517,7 @@ phypBuildLpar(virConnectPtr conn, virDomainDefPtr def) result = 0; -cleanup: + cleanup: VIR_FREE(ret); return result; @@ -3572,7 +3572,7 @@ phypDomainCreateXML(virConnectPtr conn, return dom; -err: + err: virDomainDefFree(def); virObjectUnref(dom); return NULL; diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 4123e6e..a7dfdf0 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -207,7 +207,7 @@ replaceFile(const char *filename, void *data, size_t size) VIR_FREE(tmp_path); ret = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); if (tmp_path != NULL) { unlink(tmp_path); @@ -276,7 +276,7 @@ secretSaveDef(virSecretDriverStatePtr driver, ret = 0; -cleanup: + cleanup: VIR_FREE(xml); VIR_FREE(filename); return ret; @@ -310,7 +310,7 @@ secretSaveValue(virSecretDriverStatePtr driver, ret = 0; -cleanup: + cleanup: VIR_FREE(base64); VIR_FREE(filename); return ret; @@ -338,7 +338,7 @@ secretDeleteSaved(virSecretDriverStatePtr driver, (void)unlink(value_filename); -cleanup: + cleanup: VIR_FREE(value_filename); VIR_FREE(xml_filename); return ret; @@ -416,7 +416,7 @@ secretLoadValue(virSecretDriverStatePtr driver, ret = 0; -cleanup: + cleanup: if (value != NULL) { memset(value, 0, value_size); VIR_FREE(value); @@ -460,7 +460,7 @@ secretLoad(virSecretDriverStatePtr driver, ret = secret; secret = NULL; -cleanup: + cleanup: secretFree(secret); virSecretDefFree(def); VIR_FREE(xml_filename); @@ -515,7 +515,7 @@ loadSecrets(virSecretDriverStatePtr driver, ret = 0; -cleanup: + cleanup: if (dir != NULL) closedir(dir); return ret; @@ -598,7 +598,7 @@ secretConnectListSecrets(virConnectPtr conn, char **uuids, int maxuuids) secretDriverUnlock(driver); return i; -cleanup: + cleanup: secretDriverUnlock(driver); for (i = 0; i < maxuuids; i++) @@ -738,7 +738,7 @@ secretLookupByUUID(virConnectPtr conn, const unsigned char *uuid) secret->def->usage_type, secretUsageIDForDef(secret->def)); -cleanup: + cleanup: secretDriverUnlock(driver); return ret; } @@ -768,7 +768,7 @@ secretLookupByUsage(virConnectPtr conn, int usageType, const char *usageID) secret->def->usage_type, secretUsageIDForDef(secret->def)); -cleanup: + cleanup: secretDriverUnlock(driver); return ret; } @@ -869,7 +869,7 @@ secretDefineXML(virConnectPtr conn, const char *xml, secretUsageIDForDef(secret->def)); goto cleanup; -restore_backup: + restore_backup: if (backup) { /* Error - restore previous state and free new attributes */ secret->def = backup; @@ -882,7 +882,7 @@ restore_backup: secretFree(secret); } -cleanup: + cleanup: virSecretDefFree(new_attrs); secretDriverUnlock(driver); @@ -914,7 +914,7 @@ secretGetXMLDesc(virSecretPtr obj, unsigned int flags) ret = virSecretDefFormat(secret->def); -cleanup: + cleanup: secretDriverUnlock(driver); return ret; @@ -969,13 +969,13 @@ secretSetValue(virSecretPtr obj, const unsigned char *value, ret = 0; goto cleanup; -restore_backup: + restore_backup: /* Error - restore previous state and free new value */ secret->value = old_value; secret->value_size = old_value_size; memset(new_value, 0, value_size); -cleanup: + cleanup: secretDriverUnlock(driver); VIR_FREE(new_value); @@ -1027,7 +1027,7 @@ secretGetValue(virSecretPtr obj, size_t *value_size, unsigned int flags, memcpy(ret, secret->value, secret->value_size); *value_size = secret->value_size; -cleanup: + cleanup: secretDriverUnlock(driver); return ret; @@ -1071,7 +1071,7 @@ secretUndefine(virSecretPtr obj) ret = 0; -cleanup: + cleanup: secretDriverUnlock(driver); return ret; diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 6dca476..e969a69 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -106,7 +106,7 @@ profile_status(const char *str, const int check_enforcing) } VIR_FREE(content); - cleanup: + cleanup: VIR_FREE(tmp); VIR_FREE(etmp); @@ -153,7 +153,7 @@ profile_status_file(const char *str) else rc = 1; - failed: + failed: VIR_FREE(tmp); VIR_FREE(profile); VIR_FREE(content); @@ -199,7 +199,7 @@ load_profile(virSecurityManagerPtr mgr, virCommandSetInputBuffer(cmd, xml); rc = virCommandRun(cmd, NULL); -cleanup: + cleanup: VIR_FREE(xml); virCommandFree(cmd); @@ -259,7 +259,7 @@ use_apparmor(void) rc = profile_status(libvirt_daemon, 1); -cleanup: + cleanup: VIR_FREE(libvirt_daemon); return rc; } @@ -299,7 +299,7 @@ reload_profile(virSecurityManagerPtr mgr, } rc = 0; - cleanup: + cleanup: VIR_FREE(profile_name); return rc; @@ -369,7 +369,7 @@ AppArmorSecurityManagerProbe(const char *virtDriver ATTRIBUTE_UNUSED) } rc = SECURITY_DRIVER_ENABLE; - cleanup: + cleanup: VIR_FREE(template); return rc; @@ -461,12 +461,12 @@ AppArmorGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, rc = 0; goto cleanup; - err: + err: VIR_FREE(secdef->label); VIR_FREE(secdef->imagelabel); VIR_FREE(secdef->model); - cleanup: + cleanup: VIR_FREE(profile_name); return rc; @@ -521,7 +521,7 @@ AppArmorGetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } rc = 0; - cleanup: + cleanup: VIR_FREE(profile_name); return rc; @@ -608,7 +608,7 @@ AppArmorSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } rc = 0; - cleanup: + cleanup: VIR_FREE(profile_name); return rc; @@ -654,7 +654,7 @@ AppArmorSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virCommandSetAppArmorProfile(cmd, profile_name); rc = 0; - cleanup: + cleanup: VIR_FREE(profile_name); VIR_FREE(cmd_str); return rc; @@ -741,7 +741,7 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, } rc = 0; - cleanup: + cleanup: VIR_FREE(profile_name); return rc; @@ -871,7 +871,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, break; } -done: + done: VIR_FREE(ptr); return ret; } diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 0bd36b7..b418ada 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -317,7 +317,7 @@ virSecurityDACRestoreSecurityFileLabel(const char *path) /* XXX record previous ownership */ rc = virSecurityDACSetOwnership(newpath, 0, 0); -err: + err: VIR_FREE(newpath); return rc; } @@ -559,7 +559,7 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, break; } -done: + done: return ret; } @@ -677,7 +677,7 @@ virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, break; } -done: + done: return ret; } @@ -724,7 +724,7 @@ virSecurityDACSetChardevLabel(virSecurityManagerPtr mgr, break; } -done: + done: VIR_FREE(in); VIR_FREE(out); return ret; @@ -763,7 +763,7 @@ virSecurityDACRestoreChardevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, break; } -done: + done: VIR_FREE(in); VIR_FREE(out); return ret; diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 795807a..a308dfc 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -534,7 +534,7 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, ret = 0; -cleanup: + cleanup: virObjectUnlock(mgr); if (generated) virSecurityLabelDefFree(seclabel); diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index b5aec64..f9d1122 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -276,7 +276,7 @@ virSecuritySELinuxMCSGetProcessRange(char **sens, ret = 0; -cleanup: + cleanup: if (ret < 0) VIR_FREE(*sens); freecon(ourSecContext); @@ -316,7 +316,7 @@ virSecuritySELinuxContextAddRange(security_context_t src, ignore_value(VIR_STRDUP(ret, str)); -cleanup: + cleanup: if (srccon) context_free(srccon); if (dstcon) context_free(dstcon); return ret; @@ -387,7 +387,7 @@ virSecuritySELinuxGenNewContext(const char *basecontext, if (VIR_STRDUP(ret, str) < 0) goto cleanup; VIR_DEBUG("Generated context '%s'", ret); -cleanup: + cleanup: freecon(ourSecContext); context_free(ourContext); context_free(context); @@ -454,7 +454,7 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr) virConfFree(selinux_conf); return 0; -error: + error: # if HAVE_SELINUX_LABEL_H selabel_close(data->label_handle); data->label_handle = NULL; @@ -542,7 +542,7 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr) return 0; -error: + error: #if HAVE_SELINUX_LABEL_H selabel_close(data->label_handle); data->label_handle = NULL; @@ -702,7 +702,7 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, rc = 0; -cleanup: + cleanup: if (rc != 0) { if (seclabel->type == VIR_DOMAIN_SECLABEL_DYNAMIC) VIR_FREE(seclabel->label); @@ -775,7 +775,7 @@ virSecuritySELinuxReserveSecurityLabel(virSecurityManagerPtr mgr, return 0; -error: + error: context_free(ctx); return -1; } @@ -1042,7 +1042,7 @@ virSecuritySELinuxRestoreSecurityFileLabel(virSecurityManagerPtr mgr, rc = virSecuritySELinuxSetFilecon(newpath, fcon); } -err: + err: freecon(fcon); VIR_FREE(newpath); return rc; @@ -1382,7 +1382,7 @@ virSecuritySELinuxSetSecurityHostdevSubsysLabel(virDomainDefPtr def, break; } -done: + done: return ret; } @@ -1575,7 +1575,7 @@ virSecuritySELinuxRestoreSecurityHostdevSubsysLabel(virSecurityManagerPtr mgr, break; } -done: + done: return ret; } @@ -1720,7 +1720,7 @@ virSecuritySELinuxSetSecurityChardevLabel(virDomainDefPtr def, break; } -done: + done: VIR_FREE(in); VIR_FREE(out); return ret; @@ -1784,7 +1784,7 @@ virSecuritySELinuxRestoreSecurityChardevLabel(virSecurityManagerPtr mgr, break; } -done: + done: VIR_FREE(in); VIR_FREE(out); return ret; @@ -2122,7 +2122,7 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBU } rc = 0; -done: + done: if (security_getenforce() != 1) rc = 0; @@ -2165,7 +2165,7 @@ virSecuritySELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU rc = 0; -done: + done: if (security_getenforce() != 1) rc = 0; @@ -2389,7 +2389,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr, rc = virSecuritySELinuxFSetFilecon(fd, str); } -cleanup: + cleanup: freecon(fcon); VIR_FREE(str); return rc; @@ -2427,7 +2427,7 @@ virSecuritySELinuxGenImageLabel(virSecurityManagerPtr mgr, } } -cleanup: + cleanup: context_free(ctx); VIR_FREE(mcs); return label; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index ddfcb0a..ed8b4f2 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -246,7 +246,7 @@ parserCommand(const char *profile_name, const char cmd) result = 0; -cleanup: + cleanup: VIR_FREE(profile); return result; @@ -315,7 +315,7 @@ update_include_file(const char *include_file, const char *included_files, } rc = 0; - cleanup: + cleanup: VIR_FREE(pcontent); VIR_FREE(existing); @@ -448,15 +448,15 @@ create_profile(const char *profile, const char *profile_name, } rc = 0; - clean_all: + clean_all: VIR_FREE(pcontent); - clean_replace: + clean_replace: VIR_FREE(replace_name); VIR_FREE(replace_files); VIR_FREE(replace_driver); - clean_tcontent: + clean_tcontent: VIR_FREE(tcontent); - end: + end: VIR_FREE(template); return rc; } @@ -656,7 +656,7 @@ verify_xpath_context(xmlXPathContextPtr ctxt) rc = 0; - error: + error: return rc; } @@ -704,7 +704,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr) rc = 0; - cleanup: + cleanup: xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); @@ -766,7 +766,7 @@ get_definition(vahControl * ctl, const char *xmlStr) rc = 0; - exit: + exit: return rc; } @@ -822,7 +822,7 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi virBufferAsprintf(buf, " \"%s/\" r,\n", tmp); } - cleanup: + cleanup: VIR_FREE(tmp); return rc; @@ -875,7 +875,7 @@ vah_add_file_chardev(virBufferPtr buf, rc = 0; } - cleanup: + cleanup: return rc; } @@ -1109,7 +1109,7 @@ get_files(vahControl * ctl) rc = 0; ctl->files = virBufferContentAndReset(&buf); - cleanup: + cleanup: VIR_FREE(uuid); return rc; } diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index bf19ee7..464d56d 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -145,7 +145,7 @@ umlConnectTapDevice(virConnectPtr conn, VIR_FORCE_CLOSE(tapfd); return 0; -error: + error: VIR_FORCE_CLOSE(tapfd); return -1; } @@ -273,7 +273,7 @@ umlBuildCommandLineNet(virConnectPtr conn, return virBufferContentAndReset(&buf); -error: + error: virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 1ab79fc..69f6c11 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -242,7 +242,7 @@ umlIdentifyOneChrPTY(struct uml_driver *driver, int retries = 0; if (virAsprintf(&cmd, "config %s%d", dev, def->target.port) < 0) return -1; -requery: + requery: if (umlMonitorCommand(driver, dom, cmd, &res) < 0) return -1; @@ -309,7 +309,7 @@ umlInotifyEvent(int watch, if (watch != driver->inotifyWatch) goto cleanup; -reread: + reread: got = read(fd, buf, sizeof(buf)); if (got == -1) { if (errno == EINTR) @@ -414,7 +414,7 @@ reread: } } -cleanup: + cleanup: umlDriverUnlock(driver); } @@ -576,10 +576,10 @@ umlStateInitialize(bool privileged, virNWFilterRegisterCallbackDriver(&umlCallbackDriver); return 0; -out_of_memory: + out_of_memory: VIR_ERROR(_("umlStartup: out of memory")); -error: + error: VIR_FREE(userdir); VIR_FREE(base); umlDriverUnlock(uml_driver); @@ -809,7 +809,7 @@ static int umlReadPidFile(struct uml_driver *driver, driver->monitorDir, vm->def->name) < 0) return -1; -reopen: + reopen: if (!(file = fopen(pidfile, "r"))) { if (errno == ENOENT && retries++ < 50) { @@ -873,7 +873,7 @@ static int umlOpenMonitor(struct uml_driver *driver, return -1; VIR_DEBUG("Dest address for monitor is '%s'", addr.sun_path); -restat: + restat: if (stat(addr.sun_path, &sb) < 0) { if (errno == ENOENT && retries++ < 50) { @@ -1005,7 +1005,7 @@ static int umlMonitorCommand(const struct uml_driver *driver, return ret; -error: + error: VIR_FREE(retdata); return -1; } @@ -1126,7 +1126,7 @@ static int umlStartVMDaemon(virConnectPtr conn, goto cleanup; ret = virDomainObjSetDefTransient(driver->caps, driver->xmlopt, vm, false); -cleanup: + cleanup: VIR_FORCE_CLOSE(logfd); virCommandFree(cmd); @@ -1371,7 +1371,7 @@ static virDomainPtr umlDomainLookupByID(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -1399,7 +1399,7 @@ static virDomainPtr umlDomainLookupByUUID(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -1427,7 +1427,7 @@ static virDomainPtr umlDomainLookupByName(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -1453,7 +1453,7 @@ static int umlDomainIsActive(virDomainPtr dom) ret = virDomainObjIsActive(obj); -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -1479,7 +1479,7 @@ static int umlDomainIsPersistent(virDomainPtr dom) ret = obj->persistent; -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -1504,7 +1504,7 @@ static int umlDomainIsUpdated(virDomainPtr dom) ret = obj->updated; -cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -1534,7 +1534,7 @@ static int umlConnectGetVersion(virConnectPtr conn, unsigned long *version) *version = driver->umlVersion; ret = 0; -cleanup: + cleanup: umlDriverUnlock(driver); return ret; } @@ -1623,7 +1623,7 @@ static virDomainPtr umlDomainCreateXML(virConnectPtr conn, const char *xml, dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; -cleanup: + cleanup: virDomainDefFree(def); if (vm) virObjectUnlock(vm); @@ -1666,7 +1666,7 @@ static int umlDomainShutdownFlags(virDomainPtr dom, ret = 0; #endif -cleanup: + cleanup: VIR_FREE(info); if (vm) virObjectUnlock(vm); @@ -1713,7 +1713,7 @@ umlDomainDestroyFlags(virDomainPtr dom, } ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) @@ -1749,7 +1749,7 @@ static char *umlDomainGetOSType(virDomainPtr dom) { if (VIR_STRDUP(type, vm->def->os.type) < 0) goto cleanup; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return type; @@ -1781,7 +1781,7 @@ umlDomainGetMaxMemory(virDomainPtr dom) ret = vm->def->mem.max_balloon; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1818,7 +1818,7 @@ static int umlDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) vm->def->mem.max_balloon = newmax; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1861,7 +1861,7 @@ static int umlDomainSetMemory(virDomainPtr dom, unsigned long newmem) vm->def->mem.cur_balloon = newmem; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1904,7 +1904,7 @@ static int umlDomainGetInfo(virDomainPtr dom, info->nrVirtCpu = vm->def->vcpus; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1939,7 +1939,7 @@ umlDomainGetState(virDomainPtr dom, *state = virDomainObjGetState(vm, reason); ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1972,7 +1972,7 @@ static char *umlDomainGetXMLDesc(virDomainPtr dom, vm->newDef : vm->def, flags); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -2042,7 +2042,7 @@ static int umlDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_BOOTED); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); if (event) @@ -2091,7 +2091,7 @@ static virDomainPtr umlDomainDefineXML(virConnectPtr conn, const char *xml) dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; -cleanup: + cleanup: virDomainDefFree(def); if (vm) virObjectUnlock(vm); @@ -2137,7 +2137,7 @@ static int umlDomainUndefineFlags(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); umlDriverUnlock(driver); @@ -2189,7 +2189,7 @@ static int umlDomainAttachUmlDisk(struct uml_driver *driver, return 0; -error: + error: VIR_FREE(reply); VIR_FREE(cmd); @@ -2248,7 +2248,7 @@ static int umlDomainAttachDevice(virDomainPtr dom, const char *xml) goto cleanup; } -cleanup: + cleanup: virDomainDeviceDefFree(dev); if (vm) @@ -2313,7 +2313,7 @@ static int umlDomainDetachUmlDisk(struct uml_driver *driver, VIR_FREE(reply); -cleanup: + cleanup: VIR_FREE(cmd); return ret; @@ -2364,7 +2364,7 @@ static int umlDomainDetachDevice(virDomainPtr dom, const char *xml) "%s", _("This type of device cannot be hot unplugged")); } -cleanup: + cleanup: virDomainDeviceDefFree(dev); if (vm) virObjectUnlock(vm); @@ -2412,7 +2412,7 @@ static int umlDomainGetAutostart(virDomainPtr dom, *autostart = vm->autostart; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); umlDriverUnlock(driver); @@ -2480,7 +2480,7 @@ static int umlDomainSetAutostart(virDomainPtr dom, } ret = 0; -cleanup: + cleanup: VIR_FREE(configFile); VIR_FREE(autostartLink); if (vm) @@ -2552,7 +2552,7 @@ umlDomainBlockPeek(virDomainPtr dom, ret = 0; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); if (vm) virObjectUnlock(vm); @@ -2626,7 +2626,7 @@ umlDomainOpenConsole(virDomainPtr dom, goto cleanup; ret = 0; -cleanup: + cleanup: if (vm) virObjectUnlock(vm); umlDriverUnlock(driver); diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 2de24a7..118c7c3 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -116,13 +116,13 @@ vmwareCapsInit(void) goto error; } -cleanup: + cleanup: virCPUDefFree(cpu); cpuDataFree(data); return caps; -error: + error: virObjectUnref(caps); goto cleanup; } @@ -194,7 +194,7 @@ vmwareLoadDomains(struct vmware_driver *driver) ret = 0; -cleanup: + cleanup: virCommandFree(cmd); VIR_FREE(outbuf); virDomainDefFree(vmdef); @@ -303,7 +303,7 @@ vmwareExtractVersion(struct vmware_driver *driver) ret = 0; -cleanup: + cleanup: virCommandFree(cmd); VIR_FREE(outbuf); VIR_FREE(bin); @@ -361,7 +361,7 @@ vmwareParsePath(const char *path, char **directory, char **filename) return 0; -error: + error: return -1; } @@ -443,7 +443,7 @@ vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath) ret = 0; - cleanup: + cleanup: VIR_FREE(directoryName); VIR_FREE(fileName); return ret; @@ -525,7 +525,7 @@ vmwareExtractPid(const char * vmxPath) goto cleanup; } -cleanup: + cleanup: VIR_FREE(vmxDir); VIR_FREE(logFilePath); VIR_FORCE_FCLOSE(logFile); diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 0e7a37f..6edc0bc 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -185,7 +185,7 @@ vmwareConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; - cleanup: + cleanup: vmwareFreeDriver(driver); return VIR_DRV_OPEN_ERROR; }; @@ -271,7 +271,7 @@ vmwareUpdateVMStatus(struct vmware_driver *driver, virDomainObjPtr vm) ret = 0; -cleanup: + cleanup: virCommandFree(cmd); VIR_FREE(outbuf); VIR_FREE(vmxAbsolutePath); @@ -395,7 +395,7 @@ vmwareDomainDefineXML(virConnectPtr conn, const char *xml) if (dom) dom->id = -1; - cleanup: + cleanup: virDomainDefFree(vmdef); VIR_FREE(vmx); VIR_FREE(directoryName); @@ -445,7 +445,7 @@ vmwareDomainShutdownFlags(virDomainPtr dom, } ret = 0; - cleanup: + cleanup: if (vm) virObjectUnlock(vm); vmwareDriverUnlock(driver); @@ -514,7 +514,7 @@ vmwareDomainSuspend(virDomainPtr dom) virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); ret = 0; - cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -563,7 +563,7 @@ vmwareDomainResume(virDomainPtr dom) virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED); ret = 0; - cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -611,7 +611,7 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags) ret = 0; - cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -681,7 +681,7 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *xml, if (dom) dom->id = vm->def->id; -cleanup: + cleanup: virDomainDefFree(vmdef); VIR_FREE(vmx); VIR_FREE(vmxPath); @@ -722,7 +722,7 @@ vmwareDomainCreateWithFlags(virDomainPtr dom, ret = vmwareStartVM(driver, vm); -cleanup: + cleanup: if (vm) virObjectUnlock(vm); vmwareDriverUnlock(driver); @@ -775,7 +775,7 @@ vmwareDomainUndefineFlags(virDomainPtr dom, ret = 0; - cleanup: + cleanup: if (vm) virObjectUnlock(vm); vmwareDriverUnlock(driver); @@ -808,7 +808,7 @@ vmwareDomainLookupByID(virConnectPtr conn, int id) if (dom) dom->id = vm->def->id; - cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -832,7 +832,7 @@ vmwareDomainGetOSType(virDomainPtr dom) ignore_value(VIR_STRDUP(ret, vm->def->os.type)); - cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -859,7 +859,7 @@ vmwareDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (dom) dom->id = vm->def->id; - cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -885,7 +885,7 @@ vmwareDomainLookupByName(virConnectPtr conn, const char *name) if (dom) dom->id = vm->def->id; - cleanup: + cleanup: if (vm) virObjectUnlock(vm); return dom; @@ -907,7 +907,7 @@ vmwareDomainIsActive(virDomainPtr dom) } ret = virDomainObjIsActive(obj); - cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -930,7 +930,7 @@ vmwareDomainIsPersistent(virDomainPtr dom) } ret = obj->persistent; - cleanup: + cleanup: if (obj) virObjectUnlock(obj); return ret; @@ -958,7 +958,7 @@ vmwareDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) ret = virDomainDefFormat(vm->def, flags); - cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1094,7 +1094,7 @@ vmwareDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->nrVirtCpu = vm->def->vcpus; ret = 0; - cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; @@ -1128,7 +1128,7 @@ vmwareDomainGetState(virDomainPtr dom, *state = virDomainObjGetState(vm, reason); ret = 0; - cleanup: + cleanup: if (vm) virObjectUnlock(vm); return ret; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 9b5162b..272d873 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -39,7 +39,7 @@ VIR_LOG_INIT("vmx.vmx"); /* -mapping: + mapping: domain-xml <=> vmx @@ -637,7 +637,7 @@ virVMXConvertToUTF8(const char *encoding, const char *string) result = (char *)utf8->content; utf8->content = NULL; - cleanup: + cleanup: xmlCharEncCloseFunc(handler); xmlBufferFree(input); xmlBufferFree(utf8); @@ -1209,7 +1209,7 @@ virVMXGatherSCSIControllers(virVMXContext *ctx, virDomainDefPtr def, result = 0; - cleanup: + cleanup: VIR_FREE(autodetectedModels); return result; @@ -1778,7 +1778,7 @@ virVMXParseConfig(virVMXContext *ctx, success = true; - cleanup: + cleanup: if (! success) { virDomainDefFree(def); def = NULL; @@ -1855,7 +1855,7 @@ virVMXParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def) return 0; - failure: + failure: VIR_FREE(listenAddr); virDomainGraphicsDefFree(*def); *def = NULL; @@ -1929,7 +1929,7 @@ virVMXParseSCSIController(virConfPtr conf, int controller, bool *present, result = 0; - cleanup: + cleanup: VIR_FREE(virtualDev_string); return result; @@ -2313,7 +2313,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con result = 0; - cleanup: + cleanup: if (result < 0) { virDomainDiskDefFree(*def); *def = NULL; @@ -2327,7 +2327,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con return result; - ignore: + ignore: virDomainDiskDefFree(*def); *def = NULL; @@ -2416,7 +2416,7 @@ int virVMXParseFileSystem(virConfPtr conf, int number, virDomainFSDefPtr *def) result = 0; - cleanup: + cleanup: if (result < 0) { virDomainFSDefFree(*def); *def = NULL; @@ -2427,7 +2427,7 @@ int virVMXParseFileSystem(virConfPtr conf, int number, virDomainFSDefPtr *def) return result; - ignore: + ignore: virDomainFSDefFree(*def); *def = NULL; @@ -2641,7 +2641,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) result = 0; - cleanup: + cleanup: if (result < 0) { virDomainNetDefFree(*def); *def = NULL; @@ -2657,7 +2657,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) return result; - ignore: + ignore: virDomainNetDefFree(*def); *def = NULL; @@ -2838,7 +2838,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, result = 0; - cleanup: + cleanup: if (result < 0) { virDomainChrDefFree(*def); *def = NULL; @@ -2851,7 +2851,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, return result; - ignore: + ignore: virDomainChrDefFree(*def); *def = NULL; @@ -2955,7 +2955,7 @@ virVMXParseParallel(virVMXContext *ctx, virConfPtr conf, int port, result = 0; - cleanup: + cleanup: if (result < 0) { virDomainChrDefFree(*def); *def = NULL; @@ -2966,7 +2966,7 @@ virVMXParseParallel(virVMXContext *ctx, virConfPtr conf, int port, return result; - ignore: + ignore: virDomainChrDefFree(*def); *def = NULL; @@ -3003,7 +3003,7 @@ virVMXParseSVGA(virConfPtr conf, virDomainVideoDefPtr *def) result = 0; - cleanup: + cleanup: if (result < 0) { virDomainVideoDefFree(*def); *def = NULL; @@ -3350,7 +3350,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe vmx = virBufferContentAndReset(&buffer); - cleanup: + cleanup: if (vmx == NULL) { virBufferFreeAndReset(&buffer); } diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 6d3288d..908448b 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -94,7 +94,7 @@ getCapsObject(void) return caps; - error_cleanup: + error_cleanup: virObjectUnref(caps); return NULL; } @@ -208,7 +208,7 @@ xenapiConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, NULL); - error: + error: VIR_FREE(username); VIR_FREE(password); @@ -441,7 +441,7 @@ xenapiConnectGetCapabilities(virConnectPtr conn) goto cleanup; return xml; } - cleanup: + cleanup: xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, _("Capabilities not available")); return NULL; @@ -955,7 +955,7 @@ xenapiDomainGetOSType(virDomainPtr dom) } else xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); - cleanup: + cleanup: if (vms) xen_vm_set_free(vms); return ostype; @@ -1115,7 +1115,7 @@ xenapiDomainGetState(virDomainPtr dom, ret = 0; -cleanup: + cleanup: if (vms) xen_vm_set_free(vms); return ret; @@ -1545,7 +1545,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) virDomainDefFree(defPtr); return xml; - error: + error: xen_vm_set_free(vms); virDomainDefFree(defPtr); return NULL; diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 5a5025a..c9a62d9 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -114,11 +114,11 @@ xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify) } } - cleanup: + cleanup: return result; - failure: + failure: result = -1; goto cleanup; @@ -357,7 +357,7 @@ allocStringMap(xen_string_string_map **strings, char *key, char *val) VIR_STRDUP((*strings)->contents[sz-1].val, val) < 0) goto error; return 0; - error: + error: xen_string_string_map_free(*strings); return -1; } @@ -559,7 +559,7 @@ createVMRecordFromXml(virConnectPtr conn, virDomainDefPtr def, } return 0; - error: + error: xen_vm_record_free(*record); return -1; } diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index e03e254..1165b98 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -167,7 +167,7 @@ xenParseSxprOS(const struct sexpr *node, return 0; -error: + error: return -1; } @@ -312,7 +312,7 @@ xenParseSxprChar(const char *value, return def; -error: + error: virDomainChrDefFree(def); return NULL; } @@ -516,7 +516,7 @@ xenParseSxprDisks(virDomainDefPtr def, return 0; -error: + error: virDomainDiskDefFree(disk); return -1; } @@ -611,7 +611,7 @@ xenParseSxprNets(virDomainDefPtr def, return 0; -cleanup: + cleanup: virDomainNetDefFree(net); return -1; } @@ -696,7 +696,7 @@ xenParseSxprSound(virDomainDefPtr def, return 0; -error: + error: return -1; } @@ -748,7 +748,7 @@ xenParseSxprUSB(virDomainDefPtr def, } return 0; -error: + error: return -1; } @@ -841,7 +841,7 @@ xenParseSxprGraphicsOld(virDomainDefPtr def, return 0; -error: + error: virDomainGraphicsDefFree(graphics); return -1; } @@ -943,7 +943,7 @@ xenParseSxprGraphicsNew(virDomainDefPtr def, return 0; -error: + error: virDomainGraphicsDefFree(graphics); return -1; } @@ -1062,7 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def, return 0; -error: + error: virDomainHostdevDefFree(dev); return -1; } @@ -1457,7 +1457,7 @@ xenParseSxpr(const struct sexpr *root, return def; -error: + error: VIR_FREE(tty); virDomainDefFree(def); return NULL; @@ -2560,7 +2560,7 @@ xenFormatSxpr(virConnectPtr conn, VIR_DEBUG("Formatted sexpr: \n%s", bufout); return bufout; -error: + error: virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index d83772c..9e4050d 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -1138,7 +1138,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, VIR_FREE(script); return def; -cleanup: + cleanup: virDomainGraphicsDefFree(graphics); virDomainNetDefFree(net); virDomainDiskDefFree(disk); @@ -1269,7 +1269,7 @@ xenFormatXMDisk(virConfValuePtr list, return 0; -cleanup: + cleanup: virBufferFreeAndReset(&buf); return -1; } @@ -1308,7 +1308,7 @@ static int xenFormatXMSerial(virConfValuePtr list, return 0; -cleanup: + cleanup: virBufferFreeAndReset(&buf); return -1; } @@ -1414,7 +1414,7 @@ static int xenFormatXMNet(virConnectPtr conn, return 0; -cleanup: + cleanup: virBufferFreeAndReset(&buf); return -1; } @@ -1483,7 +1483,7 @@ xenFormatXMPCI(virConfPtr conf, return 0; -error: + error: virConfFreeValue(pciVal); return -1; } @@ -2016,7 +2016,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, return conf; -cleanup: + cleanup: virConfFreeValue(diskVal); virConfFreeValue(netVal); VIR_FREE(cpus); -- 1.8.3.2

--- tools/virsh-console.c | 4 +- tools/virsh-domain-monitor.c | 34 +++--- tools/virsh-domain.c | 196 +++++++++++++++++------------------ tools/virsh-edit.c | 6 +- tools/virsh-host.c | 14 +-- tools/virsh-interface.c | 8 +- tools/virsh-network.c | 14 +-- tools/virsh-nodedev.c | 14 +-- tools/virsh-nwfilter.c | 8 +- tools/virsh-pool.c | 14 +-- tools/virsh-secret.c | 18 ++-- tools/virsh-snapshot.c | 34 +++--- tools/virsh-volume.c | 24 ++--- tools/virsh.c | 12 +-- tools/virt-login-shell.c | 6 +- tools/wireshark/src/packet-libvirt.c | 2 +- 16 files changed, 204 insertions(+), 204 deletions(-) diff --git a/tools/virsh-console.c b/tools/virsh-console.c index 34a0578..9838a56 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -389,7 +389,7 @@ vshRunConsole(vshControl *ctl, ret = 0; -cleanup: + cleanup: virConsoleFree(con); /* Restore original signal handlers */ @@ -399,7 +399,7 @@ cleanup: sigaction(SIGHUP, &old_sighup, NULL); sigaction(SIGPIPE, &old_sigpipe, NULL); -resettty: + resettty: /* Put STDIN back into the (sane?) state we found it in before starting */ vshTTYRestore(ctl); diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index f474422..b0d79b9 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -105,7 +105,7 @@ vshGetDomainDescription(vshControl *ctl, virDomainPtr dom, bool title, if (!desc) desc = vshStrdup(ctl, ""); -cleanup: + cleanup: VIR_FREE(domxml); xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); @@ -370,7 +370,7 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) } ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -425,7 +425,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -547,7 +547,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(disks); virDomainFree(dom); VIR_FREE(xml); @@ -648,7 +648,7 @@ cmdDomiflist(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(interfaces); virDomainFree(dom); VIR_FREE(xml); @@ -760,7 +760,7 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(desc); VIR_FREE(state); VIR_FREE(interfaces); @@ -819,7 +819,7 @@ cmdDomControl(vshControl *ctl, const vshCmd *cmd) vshDomainControlStateToString(info.state)); } -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -1008,7 +1008,7 @@ cmdDomblkstat(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(params); virDomainFree(dom); return ret; @@ -1087,7 +1087,7 @@ cmdDomIfstat(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -1151,7 +1151,7 @@ cmdDomBlkError(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(disks); virDomainFree(dom); return ret; @@ -1350,7 +1350,7 @@ cmdDomstate(vshControl *ctl, const vshCmd *cmd) vshDomainStateToString(state)); } -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -1474,7 +1474,7 @@ vshDomainListCollect(vshControl *ctl, unsigned int flags) goto cleanup; -fallback: + fallback: /* fall back to old method (0.9.12 and older) */ vshResetLibvirtError(); @@ -1534,7 +1534,7 @@ fallback: /* truncate domains that weren't found */ deleted = (nids + nnames) - list->ndomains; -filter: + filter: /* filter list the list if the list was acquired by fallback means */ for (i = 0; i < list->ndomains; i++) { dom = list->domains[i]; @@ -1610,14 +1610,14 @@ filter: /* the domain matched all filters, it may stay */ continue; -remove_entry: + remove_entry: /* the domain has to be removed as it failed one of the filters */ virDomainFree(list->domains[i]); list->domains[i] = NULL; deleted++; } -finished: + finished: /* sort the list */ if (list->domains && list->ndomains) qsort(list->domains, list->ndomains, sizeof(*list->domains), @@ -1629,7 +1629,7 @@ finished: success = true; -cleanup: + cleanup: for (i = 0; nnames != -1 && i < nnames; i++) VIR_FREE(names[i]); @@ -1838,7 +1838,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd) } ret = true; -cleanup: + cleanup: vshDomainListFree(list); return ret; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f2856a5..d9aa4fa 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -243,7 +243,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s", _("Device attached successfully\n")); ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -939,7 +939,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) functionReturn = true; } -cleanup: + cleanup: virDomainFree(dom); virBufferFreeAndReset(&buf); return functionReturn; @@ -1205,19 +1205,19 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virTypedParamsFree(params, nparams); if (dom) virDomainFree(dom); return ret; -save_error: + save_error: vshSaveLibvirtError(); -error: + error: vshError(ctl, "%s", _("Unable to change block I/O throttle")); goto cleanup; -interror: + interror: vshError(ctl, "%s", _("Unable to parse integer parameter")); goto cleanup; } @@ -1417,14 +1417,14 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) ret = true; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virDomainFree(dom); return ret; -save_error: + save_error: vshSaveLibvirtError(); -error: + error: vshError(ctl, "%s", _("Unable to change blkio parameters")); goto cleanup; } @@ -1507,7 +1507,7 @@ blockJobImpl(vshControl *ctl, const vshCmd *cmd, ret = virDomainBlockRebase(dom, path, base, bandwidth, flags); } -cleanup: + cleanup: if (pdom && ret == 0) *pdom = dom; else if (dom) @@ -1712,7 +1712,7 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "\n%s", quit ? _("Commit aborted") : _("Commit complete")); ret = true; -cleanup: + cleanup: if (dom) virDomainFree(dom); if (blocking) @@ -1907,7 +1907,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) _("Now in mirroring phase")); ret = true; -cleanup: + cleanup: if (dom) virDomainFree(dom); if (blocking) @@ -2163,7 +2163,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "\n%s", quit ? _("Pull aborted") : _("Pull complete")); ret = true; -cleanup: + cleanup: if (dom) virDomainFree(dom); if (blocking) @@ -2332,7 +2332,7 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) ret = cmdRunConsole(ctl, dom, name, flags); -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -2473,7 +2473,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("interface (%s: %s) not found"), element, iface); goto cleanup; -hit: + hit: /* find and modify/add link state node */ /* try to find <link> element */ cur = obj->nodesetval->nodeTab[i]->children; @@ -2516,7 +2516,7 @@ hit: ret = true; } -cleanup: + cleanup: xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); @@ -2700,14 +2700,14 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virDomainFree(dom); return ret; -save_error: + save_error: vshSaveLibvirtError(); -error: + error: vshError(ctl, "%s", _("Unable to set interface parameters")); goto cleanup; } @@ -2835,7 +2835,7 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -2886,7 +2886,7 @@ cmdDomPMWakeup(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -3217,7 +3217,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) rc = virDomainUndefine(dom); -out: + out: if (rc == 0) { vshPrint(ctl, _("Domain %s has been undefined\n"), name); ret = true; @@ -3254,7 +3254,7 @@ out: } } -cleanup: + cleanup: VIR_FREE(source); VIR_FREE(target); VIR_FREE(pool); @@ -3277,7 +3277,7 @@ cleanup: virDomainFree(dom); return ret; -error: + error: vshReportError(ctl); goto cleanup; } @@ -3374,7 +3374,7 @@ cmdStartGetFDs(vshControl *ctl, *nfdsret = nfds; return 0; -error: + error: virStringFreeList(fdlist); VIR_FREE(fds); return -1; @@ -3447,7 +3447,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) goto cleanup; } -started: + started: vshPrint(ctl, _("Domain %s started\n"), virDomainGetName(dom)); #ifndef WIN32 @@ -3457,7 +3457,7 @@ started: ret = true; -cleanup: + cleanup: virDomainFree(dom); VIR_FREE(fds); return ret; @@ -3561,9 +3561,9 @@ doSave(void *opaque) ret = '0'; -out: + out: pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); -out_sig: + out_sig: if (dom) virDomainFree(dom); VIR_FREE(xml); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); @@ -3680,7 +3680,7 @@ vshWatchJob(vshControl *ctl, functionReturn = true; -cleanup: + cleanup: sigaction(SIGINT, &old_sig_action, NULL); vshTTYRestore(ctl); return functionReturn; @@ -3727,7 +3727,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) if (ret) vshPrint(ctl, _("\nDomain %s saved to %s\n"), name, to); -cleanup: + cleanup: if (dom) virDomainFree(dom); return ret; @@ -3780,7 +3780,7 @@ cmdSaveImageDumpxml(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s", xml); ret = true; -cleanup: + cleanup: VIR_FREE(xml); return ret; } @@ -3851,7 +3851,7 @@ cmdSaveImageDefine(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("State file %s updated.\n"), file); ret = true; -cleanup: + cleanup: VIR_FREE(xml); return ret; } @@ -3925,7 +3925,7 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("State file %s edited.\n"), file); ret = true; -cleanup: + cleanup: return ret; } @@ -4003,9 +4003,9 @@ doManagedsave(void *opaque) } ret = '0'; -out: + out: pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); -out_sig: + out_sig: if (dom) virDomainFree(dom); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); @@ -4049,7 +4049,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) if (ret) vshPrint(ctl, _("\nDomain %s state saved by libvirt\n"), name); -cleanup: + cleanup: virDomainFree(dom); VIR_FORCE_CLOSE(p[0]); VIR_FORCE_CLOSE(p[1]); @@ -4110,7 +4110,7 @@ cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -4252,7 +4252,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, *update_params = params; params = NULL; -cleanup: + cleanup: VIR_FREE(set_field); virTypedParamsFree(params, nparams); return ret; @@ -4437,7 +4437,7 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("Domain restored from %s\n"), from); ret = true; -cleanup: + cleanup: VIR_FREE(xml); return ret; } @@ -4571,9 +4571,9 @@ doDump(void *opaque) } ret = '0'; -out: + out: pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); -out_sig: + out_sig: if (dom) virDomainFree(dom); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); @@ -4620,7 +4620,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (ret) vshPrint(ctl, _("\nDomain %s dumped to %s\n"), name, to); -cleanup: + cleanup: virDomainFree(dom); VIR_FORCE_CLOSE(p[0]); VIR_FORCE_CLOSE(p[1]); @@ -4760,7 +4760,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("Screenshot saved to %s, with type of %s"), file, mime); ret = true; -cleanup: + cleanup: if (!ret && created) unlink(file); if (generated) @@ -4895,7 +4895,7 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) } ret = true; -cleanup: + cleanup: if (dom) virDomainFree(dom); virStringFreeList(modes); @@ -4976,7 +4976,7 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) } ret = true; -cleanup: + cleanup: if (dom) virDomainFree(dom); virStringFreeList(modes); @@ -5238,12 +5238,12 @@ cmdDomjobinfo(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); virTypedParamsFree(params, nparams); return ret; -save_error: + save_error: vshSaveLibvirtError(); goto cleanup; } @@ -5413,7 +5413,7 @@ vshCPUCountCollect(vshControl *ctl, } ret = count; -cleanup: + cleanup: VIR_FREE(def); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); @@ -5492,7 +5492,7 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -5773,9 +5773,9 @@ vshParseCPUList(vshControl *ctl, const char *cpulist, return cpumap; -error: + error: vshError(ctl, "%s", _("cpulist: Invalid format.")); -cleanup: + cleanup: VIR_FREE(cpumap); return NULL; } @@ -5887,7 +5887,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) } ret = true; -cleanup: + cleanup: VIR_FREE(cpumap); virDomainFree(dom); return ret; @@ -6006,7 +6006,7 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) goto cleanup; ret = true; -cleanup: + cleanup: VIR_FREE(cpumap); virDomainFree(dom); return ret; @@ -6124,7 +6124,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -6214,7 +6214,7 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(buffer); VIR_FREE(snippet); xmlXPathFreeContext(ctxt); @@ -6313,7 +6313,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) ret = true; } -cleanup: + cleanup: xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); VIR_FREE(result); @@ -6327,7 +6327,7 @@ cleanup: return ret; -no_memory: + no_memory: vshError(ctl, "%s", _("Out of memory")); ret = false; goto cleanup; @@ -6477,7 +6477,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) goto cleanup; } -do_show_total: + do_show_total: /* get supported num of parameter for total statistics */ if ((nparams = virDomainGetCPUStats(dom, NULL, 0, -1, 1, flags)) < 0) goto failed_stats; @@ -6513,12 +6513,12 @@ do_show_total: ret = true; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virDomainFree(dom); return ret; -failed_stats: + failed_stats: vshError(ctl, _("Failed to retrieve CPU statistics for domain '%s'"), virDomainGetName(dom)); goto cleanup; @@ -6611,7 +6611,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) virDomainFree(dom); ret = true; -cleanup: + cleanup: VIR_FREE(buffer); VIR_FREE(fds); return ret; @@ -6886,7 +6886,7 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) } ret = true; -cleanup: + cleanup: VIR_FREE(desc_edited); VIR_FREE(desc); if (tmp) { @@ -7047,7 +7047,7 @@ cmdMetadata(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -7188,7 +7188,7 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd) if (!(virDomainSendKey(dom, codeset, holdtime, keycodes, count, 0) < 0)) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -7264,7 +7264,7 @@ static int getSignalNumber(vshControl *ctl, const char *signame) goto cleanup; signum = -1; -cleanup: + cleanup: VIR_FREE(tmp); return signum; } @@ -7303,7 +7303,7 @@ cmdSendProcessSignal(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -7691,14 +7691,14 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virDomainFree(dom); return ret; -save_error: + save_error: vshSaveLibvirtError(); -error: + error: vshError(ctl, "%s", _("Unable to change memory parameters")); goto cleanup; } @@ -7841,14 +7841,14 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) ret = true; -cleanup: + cleanup: virTypedParamsFree(params, nparams); virDomainFree(dom); return ret; -save_error: + save_error: vshSaveLibvirtError(); -error: + error: vshError(ctl, "%s", _("Unable to change numa parameters")); goto cleanup; } @@ -7942,7 +7942,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(result); VIR_FREE(monitor_cmd); virJSONValueFree(pretty); @@ -8083,7 +8083,7 @@ cmdQemuMonitorEvent(vshControl *ctl, const vshCmd *cmd) if (data.count) ret = true; -cleanup: + cleanup: vshEventCleanup(ctl); if (eventId >= 0 && virConnectDomainQemuMonitorEventDeregister(ctl->conn, eventId) < 0) @@ -8141,7 +8141,7 @@ cmdQemuAttach(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("Failed to attach to pid %u"), pid_value); } -cleanup: + cleanup: return ret; } @@ -8265,7 +8265,7 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(result); VIR_FREE(guest_agent_cmd); if (dom) @@ -8407,7 +8407,7 @@ cmdLxcEnterNamespace(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(seclabel); VIR_FREE(secmodel); if (dom) @@ -8982,16 +8982,16 @@ doMigrate(void *opaque) virConnectClose(dconn); } -out: + out: pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); -out_sig: + out_sig: virTypedParamsFree(params, nparams); if (dom) virDomainFree(dom); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); return; -save_error: + save_error: vshSaveLibvirtError(); goto out; } @@ -9051,7 +9051,7 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) virThreadJoin(&workerThread); -cleanup: + cleanup: virDomainFree(dom); VIR_FORCE_CLOSE(p[0]); VIR_FORCE_CLOSE(p[1]); @@ -9106,7 +9106,7 @@ cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd) ret = true; -done: + done: virDomainFree(dom); return ret; } @@ -9168,7 +9168,7 @@ cmdMigrateCompCache(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("Compression cache: %.3lf %s"), value, unit); ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } @@ -9221,7 +9221,7 @@ cmdMigrateSetMaxSpeed(vshControl *ctl, const vshCmd *cmd) ret = true; -done: + done: virDomainFree(dom); return ret; } @@ -9265,7 +9265,7 @@ cmdMigrateGetMaxSpeed(vshControl *ctl, const vshCmd *cmd) ret = true; -done: + done: virDomainFree(dom); return ret; } @@ -9445,7 +9445,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) break; } -cleanup: + cleanup: VIR_FREE(doc); VIR_FREE(xpath); VIR_FREE(passwd); @@ -9631,7 +9631,7 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s\n", hostname); ret = true; -error: + error: VIR_FREE(hostname); virDomainFree(dom); return ret; @@ -9747,7 +9747,7 @@ vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) ret = true; -cleanup: + cleanup: virBitmapFree(bitmap); return ret; } @@ -9848,7 +9848,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s", _("Device detached successfully\n")); funcRet = true; -cleanup: + cleanup: VIR_FREE(buffer); virDomainFree(dom); return funcRet; @@ -9950,7 +9950,7 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s", _("Device updated successfully\n")); ret = true; -cleanup: + cleanup: VIR_FREE(buffer); virDomainFree(dom); return ret; @@ -10104,7 +10104,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) goto cleanup; } -hit: + hit: if (!(detach_xml = virXMLNodeToString(xml, matchNode))) { vshSaveLibvirtError(); goto cleanup; @@ -10122,7 +10122,7 @@ hit: functionReturn = true; } -cleanup: + cleanup: VIR_FREE(doc); VIR_FREE(detach_xml); virDomainFree(dom); @@ -10220,7 +10220,7 @@ vshFindDisk(const char *doc, vshError(NULL, _("No disk found whose source path or target is %s"), path); -cleanup: + cleanup: xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); @@ -10319,7 +10319,7 @@ vshPrepareDiskXML(xmlNodePtr disk_node, goto cleanup; } -cleanup: + cleanup: VIR_FREE(device_type); VIR_FREE(disk_type); return ret; @@ -11162,7 +11162,7 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) if (count) ret = true; -cleanup: + cleanup: vshEventCleanup(ctl); if (data) { for (i = 0; i < (all ? VIR_DOMAIN_EVENT_ID_LAST : 1); i++) { @@ -11323,7 +11323,7 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("succeeded to complete action %s on media\n"), action); ret = true; -cleanup: + cleanup: VIR_FREE(doc); xmlFreeNode(disk_node); VIR_FREE(disk_xml); @@ -11386,7 +11386,7 @@ cmdDomFSTrim(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virDomainFree(dom); return ret; } diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c index bb79853..5d35c55 100644 --- a/tools/virsh-edit.c +++ b/tools/virsh-edit.c @@ -80,7 +80,7 @@ do { if (!tmp) goto edit_cleanup; -reedit: + reedit: /* Start the editor. */ if (vshEditFile(ctl, tmp) == -1) goto edit_cleanup; @@ -96,7 +96,7 @@ reedit: EDIT_NOT_CHANGED; } -redefine: + redefine: msg = NULL; /* Now re-read the object XML. Did someone else change it while @@ -144,7 +144,7 @@ redefine: edit_success = true; -edit_cleanup: + edit_cleanup: VIR_FREE(doc); VIR_FREE(doc_edited); VIR_FREE(doc_reread); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 6a04f9d..cac6086 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -182,7 +182,7 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); VIR_FREE(nodes); @@ -302,7 +302,7 @@ cmdNodeCpuMap(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) ret = true; - cleanup: + cleanup: VIR_FREE(cpumap); return ret; } @@ -446,7 +446,7 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(params); return ret; } @@ -511,7 +511,7 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) ret = true; - cleanup: + cleanup: VIR_FREE(params); return ret; } @@ -928,13 +928,13 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: virTypedParamsFree(params, nparams); return ret; -save_error: + save_error: vshSaveLibvirtError(); -error: + error: vshError(ctl, "%s", _("Unable to change memory parameters")); goto cleanup; } diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 147583c..d4ec854 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -138,7 +138,7 @@ cmdInterfaceEdit(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: if (iface) virInterfaceFree(iface); if (iface_edited) @@ -217,7 +217,7 @@ vshInterfaceListCollect(vshControl *ctl, goto cleanup; -fallback: + fallback: /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); @@ -287,7 +287,7 @@ fallback: /* truncate interfaces that weren't found */ deleted = nAllIfaces - list->nifaces; -finished: + finished: /* sort the list */ if (list->ifaces && list->nifaces) qsort(list->ifaces, list->nifaces, @@ -299,7 +299,7 @@ finished: success = true; -cleanup: + cleanup: for (i = 0; nActiveIfaces != -1 && i < nActiveIfaces; i++) VIR_FREE(activeNames[i]); diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 22d21e7..078a3cf 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -480,7 +480,7 @@ vshNetworkListCollect(vshControl *ctl, goto cleanup; -fallback: + fallback: /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); @@ -550,7 +550,7 @@ fallback: /* truncate networks that weren't found */ deleted = nAllNets - list->nnets; -filter: + filter: /* filter list the list if the list was acquired by fallback means */ for (i = 0; i < list->nnets; i++) { net = list->nets[i]; @@ -581,14 +581,14 @@ filter: /* the pool matched all filters, it may stay */ continue; -remove_entry: + remove_entry: /* the pool has to be removed as it failed one of the filters */ virNetworkFree(list->nets[i]); list->nets[i] = NULL; deleted++; } -finished: + finished: /* sort the list */ if (list->nets && list->nnets) qsort(list->nets, list->nnets, @@ -600,7 +600,7 @@ finished: success = true; -cleanup: + cleanup: for (i = 0; i < nAllNets; i++) VIR_FREE(names[i]); VIR_FREE(names); @@ -1007,7 +1007,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("Updated network %s %s"), virNetworkGetName(network), affected); ret = true; -cleanup: + cleanup: vshReportError(ctl); virNetworkFree(network); VIR_FREE(xmlFromFile); @@ -1274,7 +1274,7 @@ cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd) if (data.count) ret = true; -cleanup: + cleanup: vshEventCleanup(ctl); if (eventId >= 0 && virConnectNetworkEventDeregisterAny(ctl->conn, eventId) < 0) diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index ebfac94..a35387a 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -160,7 +160,7 @@ cmdNodeDeviceDestroy(vshControl *ctl, const vshCmd *cmd) } ret = true; -cleanup: + cleanup: virStringFreeList(arr); virNodeDeviceFree(dev); return ret; @@ -249,7 +249,7 @@ vshNodeDeviceListCollect(vshControl *ctl, goto cleanup; -fallback: + fallback: /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); @@ -329,14 +329,14 @@ fallback: /* the device matched all filters, it may stay */ continue; -remove_entry: + remove_entry: /* the device has to be removed as it failed one of the filters */ virNodeDeviceFree(list->devices[i]); list->devices[i] = NULL; deleted++; } -finished: + finished: /* sort the list */ if (list->devices && list->ndevices) qsort(list->devices, list->ndevices, @@ -348,7 +348,7 @@ finished: success = true; -cleanup: + cleanup: for (i = 0; ndevices != -1 && i < ndevices; i++) VIR_FREE(names[i]); VIR_FREE(names); @@ -500,7 +500,7 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, "%s\n", virNodeDeviceGetName(list->devices[i])); } -cleanup: + cleanup: virStringFreeList(caps); vshNodeDeviceListFree(list); return ret; @@ -568,7 +568,7 @@ cmdNodeDeviceDumpXML(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s\n", xml); ret = true; -cleanup: + cleanup: virStringFreeList(arr); VIR_FREE(xml); virNodeDeviceFree(device); diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 6f2c88c..6e6e21b 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -284,7 +284,7 @@ vshNWFilterListCollect(vshControl *ctl, goto cleanup; -fallback: + fallback: /* fall back to old method (0.9.13 and older) */ vshResetLibvirtError(); @@ -318,7 +318,7 @@ fallback: /* truncate network filters that weren't found */ deleted = nfilters - list->nfilters; -finished: + finished: /* sort the list */ if (list->filters && list->nfilters) qsort(list->filters, list->nfilters, @@ -330,7 +330,7 @@ finished: success = true; -cleanup: + cleanup: for (i = 0; nfilters != -1 && i < nfilters; i++) VIR_FREE(names[i]); VIR_FREE(names); @@ -438,7 +438,7 @@ cmdNWFilterEdit(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: if (nwfilter) virNWFilterFree(nwfilter); if (nwfilter_edited) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 700fdbe..0d35cf5 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -290,7 +290,7 @@ vshBuildPoolXML(vshControl *ctl, *retname = name; return true; -cleanup: + cleanup: virBufferFreeAndReset(&buf); return false; } @@ -755,7 +755,7 @@ vshStoragePoolListCollect(vshControl *ctl, goto cleanup; -fallback: + fallback: /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); @@ -832,7 +832,7 @@ fallback: /* truncate pools that weren't found */ deleted = nAllPools - list->npools; -filter: + filter: /* filter list the list if the list was acquired by fallback means */ for (i = 0; i < list->npools; i++) { pool = list->pools[i]; @@ -864,14 +864,14 @@ filter: /* the pool matched all filters, it may stay */ continue; -remove_entry: + remove_entry: /* the pool has to be removed as it failed one of the filters */ virStoragePoolFree(list->pools[i]); list->pools[i] = NULL; deleted++; } -finished: + finished: /* sort the list */ if (list->pools && list->npools) qsort(list->pools, list->npools, @@ -883,7 +883,7 @@ finished: success = true; -cleanup: + cleanup: for (i = 0; i < nAllPools; i++) VIR_FREE(names[i]); @@ -1305,7 +1305,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* Cleanup and return */ ret = true; -cleanup: + cleanup: VIR_FREE(outputStr); if (list && list->npools) { for (i = 0; i < list->npools; i++) { diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index b5acfda..10d5db3 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -117,7 +117,7 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("Secret %s created\n"), uuid); ret = true; -cleanup: + cleanup: VIR_FREE(buffer); if (res) virSecretFree(res); @@ -164,7 +164,7 @@ cmdSecretDumpXML(vshControl *ctl, const vshCmd *cmd) VIR_FREE(xml); ret = true; -cleanup: + cleanup: virSecretFree(secret); return ret; } @@ -232,7 +232,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s", _("Secret value set\n")); ret = true; -cleanup: + cleanup: virSecretFree(secret); return ret; } @@ -289,7 +289,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd) VIR_FREE(base64); ret = true; -cleanup: + cleanup: virSecretFree(secret); return ret; } @@ -334,7 +334,7 @@ cmdSecretUndefine(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("Secret %s deleted\n"), uuid); ret = true; -cleanup: + cleanup: virSecretFree(secret); return ret; } @@ -410,7 +410,7 @@ vshSecretListCollect(vshControl *ctl, goto cleanup; -fallback: + fallback: /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); @@ -449,7 +449,7 @@ fallback: /* truncate secrets that weren't found */ deleted = nsecrets - list->nsecrets; -finished: + finished: /* sort the list */ if (list->secrets && list->nsecrets) qsort(list->secrets, list->nsecrets, @@ -461,7 +461,7 @@ finished: success = true; -cleanup: + cleanup: if (nsecrets > 0) { for (i = 0; i < nsecrets; i++) VIR_FREE(uuids[i]); @@ -559,7 +559,7 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) ret = true; -cleanup: + cleanup: vshSecretListFree(list); return ret; } diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 6beb25a..3ecb3de 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -99,7 +99,7 @@ vshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, ret = true; -cleanup: + cleanup: xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); if (snapshot) @@ -214,7 +214,7 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd) ret = vshSnapshotCreate(ctl, dom, buffer, flags, from); -cleanup: + cleanup: VIR_FREE(buffer); if (dom) virDomainFree(dom); @@ -258,7 +258,7 @@ vshParseSnapshotMemspec(vshControl *ctl, virBufferPtr buf, const char *str) virBufferEscapeString(buf, " file='%s'", file); virBufferAddLit(buf, "/>\n"); ret = 0; -cleanup: + cleanup: if (ret < 0) vshError(ctl, _("unable to parse memspec: %s"), str); virStringFreeList(array); @@ -309,7 +309,7 @@ vshParseSnapshotDiskspec(vshControl *ctl, virBufferPtr buf, const char *str) virBufferAddLit(buf, "/>\n"); } ret = 0; -cleanup: + cleanup: if (ret < 0) vshError(ctl, _("unable to parse diskspec: %s"), str); virStringFreeList(array); @@ -464,7 +464,7 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) ret = vshSnapshotCreate(ctl, dom, buffer, flags, NULL); -cleanup: + cleanup: virBufferFreeAndReset(&buf); VIR_FREE(buffer); virDomainFree(dom); @@ -620,7 +620,7 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: if (!ret && name) vshError(ctl, _("Failed to update %s"), name); if (edited) @@ -739,7 +739,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: if (!ret) vshReportError(ctl); VIR_FREE(xml); @@ -795,7 +795,7 @@ vshGetSnapshotParent(vshControl *ctl, virDomainSnapshotPtr snapshot, *parent_name = virXPathString("string(/domainsnapshot/parent/name)", ctxt); ret = 0; -cleanup: + cleanup: if (ret < 0) { vshReportError(ctl); vshError(ctl, "%s", _("unable to determine if snapshot has parent")); @@ -859,7 +859,7 @@ vshSnapshotFilter(vshControl *ctl, virDomainSnapshotPtr snapshot, ret = !!(flags & VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE); } -cleanup: + cleanup: VIR_FREE(state); xmlXPathFreeContext(ctxt); xmlFreeDoc(xmldoc); @@ -1030,7 +1030,7 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(state); xmlXPathFreeContext(ctxt); xmlFreeDoc(xmldoc); @@ -1375,7 +1375,7 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, } } -success: + success: if (filter_fallback) { /* Older API didn't filter on status or location, but the * information is available in domain XML. */ @@ -1406,7 +1406,7 @@ success: ret = snaplist; snaplist = NULL; -cleanup: + cleanup: vshSnapshotListFree(snaplist); if (names && count > 0) for (i = 0; i < count; i++) @@ -1673,7 +1673,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: /* this frees up memory from the last iteration of the loop */ vshSnapshotListFree(snaplist); VIR_FREE(parent_snap); @@ -1747,7 +1747,7 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s", xml); ret = true; -cleanup: + cleanup: VIR_FREE(xml); if (snapshot) virDomainSnapshotFree(snapshot); @@ -1814,7 +1814,7 @@ cmdSnapshotParent(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(parent); if (snapshot) virDomainSnapshotFree(snapshot); @@ -1908,7 +1908,7 @@ cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: if (snapshot) virDomainSnapshotFree(snapshot); if (dom) @@ -1998,7 +1998,7 @@ cmdSnapshotDelete(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: if (snapshot) virDomainSnapshotFree(snapshot); if (dom) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 9bca421..55bf6f0 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -379,7 +379,7 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("Failed to create vol from %s"), from); } -cleanup: + cleanup: VIR_FREE(buffer); virStoragePoolFree(pool); return ret; @@ -463,7 +463,7 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) } ret = true; -cleanup: + cleanup: VIR_FREE(buffer); if (pool) virStoragePoolFree(pool); @@ -496,7 +496,7 @@ vshMakeCloneXML(const char *origxml, const char *newname) xmlNodeSetContent(obj->nodesetval->nodeTab[0], (const xmlChar *)newname); xmlDocDumpMemory(doc, &newxml, &size); -cleanup: + cleanup: xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); @@ -587,7 +587,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FREE(origxml); xmlFree(newxml); if (origvol) @@ -708,7 +708,7 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: if (vol) virStorageVolFree(vol); if (st) @@ -822,7 +822,7 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd) ret = true; -cleanup: + cleanup: VIR_FORCE_CLOSE(fd); if (!ret && created) unlink(file); @@ -952,7 +952,7 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("Vol %s wiped\n"), name); ret = true; -out: + out: virStorageVolFree(vol); return ret; } @@ -1131,7 +1131,7 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) ret = false; } -cleanup: + cleanup: virStorageVolFree(vol); return ret; } @@ -1251,7 +1251,7 @@ vshStorageVolListCollect(vshControl *ctl, vshError(ctl, "%s", _("Failed to list volumes")); goto cleanup; -fallback: + fallback: /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); @@ -1286,7 +1286,7 @@ fallback: /* truncate the list for not found vols */ deleted = nvols - list->nvols; -finished: + finished: /* sort the list */ if (list->vols && list->nvols) qsort(list->vols, list->nvols, sizeof(*list->vols), vshStorageVolSorter); @@ -1296,7 +1296,7 @@ finished: success = true; -cleanup: + cleanup: if (nvols > 0) for (i = 0; i < nvols; i++) VIR_FREE(names[i]); @@ -1529,7 +1529,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* Cleanup and return */ ret = true; -cleanup: + cleanup: /* Safely free the memory allocated in this function */ if (list && list->nvols) { diff --git a/tools/virsh.c b/tools/virsh.c index 02835d9..f2e4c4a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -291,7 +291,7 @@ vshReportError(vshControl *ctl) vshError(ctl, "%s", last_error->message); -out: + out: vshResetLibvirtError(); } @@ -686,7 +686,7 @@ vshTreePrintInternal(vshControl *ctl, if (!root) virBufferTrim(indent, NULL, 2); ret = 0; -cleanup: + cleanup: return ret; } @@ -799,7 +799,7 @@ vshEditFile(vshControl *ctl, const char *filename) } ret = 0; -cleanup: + cleanup: virCommandFree(cmd); return ret; } @@ -1162,7 +1162,7 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, vshError(ctl, _("command '%s' doesn't support option --%s"), cmd->name, name); } -cleanup: + cleanup: VIR_FREE(alias); return ret; } @@ -1995,7 +1995,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) data_only = true; continue; } else { -get_data: + get_data: /* Special case 'help' to ignore spurious data */ if (!(opt = vshCmddefGetData(cmd, &opts_need_arg, &opts_seen)) && @@ -2814,7 +2814,7 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format, VIR_FREE(str); return; -error: + error: vshCloseLogFile(ctl); vshError(ctl, "%s", _("failed to write the log file")); virBufferFreeAndReset(&buf); diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c index abe7eeb..be15a32 100644 --- a/tools/virt-login-shell.c +++ b/tools/virt-login-shell.c @@ -94,7 +94,7 @@ static int virLoginShellAllowedUser(virConfPtr conf, virReportSystemError(EPERM, _("%s not matched against 'allowed_users' in %s"), name, conf_file); -cleanup: + cleanup: VIR_FREE(gname); return ret; } @@ -130,7 +130,7 @@ static char **virLoginShellGetShellArgv(virConfPtr conf) } } return shargv; -error: + error: virStringFreeList(shargv); return NULL; } @@ -338,7 +338,7 @@ main(int argc, char **argv) /* At this point, the parent is now waiting for the child to exit, * but as that may take a long time, we release resources now. */ -cleanup: + cleanup: if (nfdlist > 0) for (i = 0; i < nfdlist; i++) VIR_FORCE_CLOSE(fdlist[i]); diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c index d64ecce..07098bf 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -344,7 +344,7 @@ dissect_libvirt_payload(tvbuff_t *tvb, proto_tree *tree, } return; -unknown: + unknown: dbg("Cannot determine payload: Prog=%u, Proc=%u, Type=%u, Status=%u", prog, proc, type, status); proto_tree_add_item(tree, hf_libvirt_unknown, tvb, VIR_HEADER_LEN, -1, ENC_NA); } -- 1.8.3.2

On Tue, Mar 25, 2014 at 08:04:08AM +0100, Ján Tomko wrote: Couldn't we at least prohibit 2 and 3 spaces as well? I mean doing: prohibit='^( ?)?[_a-zA-Z0-9]+:$$' ACK with that amended. Martin