提交 351f7a2f 编写于 作者: P Peter Krempa

virsh-snapshot: Refactor cmdSnapshotDumpXML

This patch simplifies error paths and switches to use
vshCommandOptStringReq for argument retrieval in cmdSnapshotDumpXML
上级 e9dc0739
...@@ -1775,31 +1775,26 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) ...@@ -1775,31 +1775,26 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd)
if (vshCommandOptBool(cmd, "security-info")) if (vshCommandOptBool(cmd, "security-info"))
flags |= VIR_DOMAIN_XML_SECURE; flags |= VIR_DOMAIN_XML_SECURE;
dom = vshCommandOptDomain(ctl, cmd, NULL); if (vshCommandOptStringReq(ctl, cmd, "snapshotname", &name) < 0)
if (dom == NULL) return false;
goto cleanup;
if (vshCommandOptString(cmd, "snapshotname", &name) <= 0) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
goto cleanup; return false;
snapshot = virDomainSnapshotLookupByName(dom, name, 0); if (!(snapshot = virDomainSnapshotLookupByName(dom, name, 0)))
if (snapshot == NULL)
goto cleanup; goto cleanup;
xml = virDomainSnapshotGetXMLDesc(snapshot, flags); if (!(xml = virDomainSnapshotGetXMLDesc(snapshot, flags)))
if (!xml)
goto cleanup; goto cleanup;
vshPrint(ctl, "%s", xml); vshPrint(ctl, "%s", xml);
ret = true; ret = true;
cleanup: cleanup:
VIR_FREE(xml); VIR_FREE(xml);
if (snapshot) if (snapshot)
virDomainSnapshotFree(snapshot); virDomainSnapshotFree(snapshot);
if (dom) virDomainFree(dom);
virDomainFree(dom);
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册