hyperv: Reindent hypervInvokeMethod() body

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Matt Coleman <matt@datto.com>
This commit is contained in:
Michal Privoznik 2020-10-15 15:03:47 +02:00
parent f978e2e6ef
commit 0dbfb9c5a6

View File

@ -791,14 +791,14 @@ hypervInvokeMethod(hypervPrivate *priv,
if (hypervCreateInvokeXmlDoc(params, &paramsDocRoot) < 0) { if (hypervCreateInvokeXmlDoc(params, &paramsDocRoot) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not create XML document")); _("Could not create XML document"));
goto cleanup; goto cleanup;
} }
methodNode = xml_parser_get_root(paramsDocRoot); methodNode = xml_parser_get_root(paramsDocRoot);
if (!methodNode) { if (!methodNode) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not get root of XML document")); _("Could not get root of XML document"));
goto cleanup; goto cleanup;
} }
@ -807,25 +807,25 @@ hypervInvokeMethod(hypervPrivate *priv,
p = &(params->params[i]); p = &(params->params[i]);
switch (p->type) { switch (p->type) {
case HYPERV_SIMPLE_PARAM: case HYPERV_SIMPLE_PARAM:
if (hypervSerializeSimpleParam(p, params->resourceUri, if (hypervSerializeSimpleParam(p, params->resourceUri,
&methodNode) < 0) &methodNode) < 0)
goto cleanup;
break;
case HYPERV_EPR_PARAM:
if (hypervSerializeEprParam(p, priv, params->resourceUri,
&methodNode) < 0)
goto cleanup;
break;
case HYPERV_EMBEDDED_PARAM:
if (hypervSerializeEmbeddedParam(p, params->resourceUri,
&methodNode) < 0)
goto cleanup;
break;
default:
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unknown parameter type"));
goto cleanup; goto cleanup;
break;
case HYPERV_EPR_PARAM:
if (hypervSerializeEprParam(p, priv, params->resourceUri,
&methodNode) < 0)
goto cleanup;
break;
case HYPERV_EMBEDDED_PARAM:
if (hypervSerializeEmbeddedParam(p, params->resourceUri,
&methodNode) < 0)
goto cleanup;
break;
default:
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unknown parameter type"));
goto cleanup;
} }
} }
@ -840,7 +840,7 @@ hypervInvokeMethod(hypervPrivate *priv,
/* do the invoke */ /* do the invoke */
response = wsmc_action_invoke(priv->client, params->resourceUri, options, response = wsmc_action_invoke(priv->client, params->resourceUri, options,
params->method, paramsDocRoot); params->method, paramsDocRoot);
/* check return code of invocation */ /* check return code of invocation */
returnValue_xpath = g_strdup_printf("/s:Envelope/s:Body/p:%s_OUTPUT/p:ReturnValue", returnValue_xpath = g_strdup_printf("/s:Envelope/s:Body/p:%s_OUTPUT/p:ReturnValue",
@ -888,43 +888,43 @@ hypervInvokeMethod(hypervPrivate *priv,
virBufferEscapeSQL(&query, "where InstanceID = \"%s\"", instanceID); virBufferEscapeSQL(&query, "where InstanceID = \"%s\"", instanceID);
if (hypervGetWmiClassList(priv, Msvm_ConcreteJob_WmiInfo, &query, if (hypervGetWmiClassList(priv, Msvm_ConcreteJob_WmiInfo, &query,
(hypervObject **)&job) < 0 || job == NULL) (hypervObject **)&job) < 0 || job == NULL)
goto cleanup; goto cleanup;
jobState = job->data.common->JobState; jobState = job->data.common->JobState;
switch (jobState) { switch (jobState) {
case MSVM_CONCRETEJOB_JOBSTATE_NEW: case MSVM_CONCRETEJOB_JOBSTATE_NEW:
case MSVM_CONCRETEJOB_JOBSTATE_STARTING: case MSVM_CONCRETEJOB_JOBSTATE_STARTING:
case MSVM_CONCRETEJOB_JOBSTATE_RUNNING: case MSVM_CONCRETEJOB_JOBSTATE_RUNNING:
case MSVM_CONCRETEJOB_JOBSTATE_SHUTTING_DOWN: case MSVM_CONCRETEJOB_JOBSTATE_SHUTTING_DOWN:
hypervFreeObject(priv, (hypervObject *)job); hypervFreeObject(priv, (hypervObject *)job);
job = NULL; job = NULL;
g_usleep(100 * 1000); /* sleep 100 ms */ g_usleep(100 * 1000); /* sleep 100 ms */
timeout -= 100; timeout -= 100;
continue; continue;
case MSVM_CONCRETEJOB_JOBSTATE_COMPLETED: case MSVM_CONCRETEJOB_JOBSTATE_COMPLETED:
completed = true; completed = true;
break; break;
case MSVM_CONCRETEJOB_JOBSTATE_TERMINATED: case MSVM_CONCRETEJOB_JOBSTATE_TERMINATED:
case MSVM_CONCRETEJOB_JOBSTATE_KILLED: case MSVM_CONCRETEJOB_JOBSTATE_KILLED:
case MSVM_CONCRETEJOB_JOBSTATE_EXCEPTION: case MSVM_CONCRETEJOB_JOBSTATE_EXCEPTION:
case MSVM_CONCRETEJOB_JOBSTATE_SERVICE: case MSVM_CONCRETEJOB_JOBSTATE_SERVICE:
goto cleanup; goto cleanup;
default: default:
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unknown invocation state")); _("Unknown invocation state"));
goto cleanup; goto cleanup;
} }
} }
if (!completed && timeout < 0) { if (!completed && timeout < 0) {
virReportError(VIR_ERR_OPERATION_TIMEOUT, virReportError(VIR_ERR_OPERATION_TIMEOUT,
_("Timeout waiting for %s invocation"), params->method); _("Timeout waiting for %s invocation"), params->method);
goto cleanup; goto cleanup;
} }
} else if (returnCode != CIM_RETURNCODE_COMPLETED_WITH_NO_ERROR) { } else if (returnCode != CIM_RETURNCODE_COMPLETED_WITH_NO_ERROR) {
virReportError(VIR_ERR_INTERNAL_ERROR, _("Invocation of %s returned an error: %s (%d)"), virReportError(VIR_ERR_INTERNAL_ERROR, _("Invocation of %s returned an error: %s (%d)"),
params->method, hypervReturnCodeToString(returnCode), params->method, hypervReturnCodeToString(returnCode),
returnCode); returnCode);
goto cleanup; goto cleanup;
} }