提交 4d1852c4 编写于 作者: P Peter Krempa

virsh: domain: Use global constant for XML file size limit

Few places still used hardcoded limit for maximum XML size for commands
that accept XML files. The hardcoded limits ranged from 8k to 1M. Use
VSH_MAX_XML_FILE to express this limit in a unified way. This will bump
the limit for the commands that used hardcoded string lengths to 10M.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1152427
上级 59de544f
...@@ -1984,7 +1984,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) ...@@ -1984,7 +1984,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd)
} }
if (xml) { if (xml) {
if (virFileReadAll(xml, 8192, &xmlstr) < 0) { if (virFileReadAll(xml, VSH_MAX_XML_FILE, &xmlstr) < 0) {
vshReportError(ctl); vshReportError(ctl);
goto cleanup; goto cleanup;
} }
...@@ -3889,7 +3889,7 @@ doSave(void *opaque) ...@@ -3889,7 +3889,7 @@ doSave(void *opaque)
goto out; goto out;
if (xmlfile && if (xmlfile &&
virFileReadAll(xmlfile, 8192, &xml) < 0) { virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0) {
vshReportError(ctl); vshReportError(ctl);
goto out; goto out;
} }
...@@ -4182,7 +4182,7 @@ cmdSaveImageDefine(vshControl *ctl, const vshCmd *cmd) ...@@ -4182,7 +4182,7 @@ cmdSaveImageDefine(vshControl *ctl, const vshCmd *cmd)
if (vshCommandOptStringReq(ctl, cmd, "xml", &xmlfile) < 0) if (vshCommandOptStringReq(ctl, cmd, "xml", &xmlfile) < 0)
return false; return false;
if (virFileReadAll(xmlfile, 8192, &xml) < 0) if (virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0)
goto cleanup; goto cleanup;
if (virDomainSaveImageDefineXML(ctl->conn, file, xml, flags) < 0) { if (virDomainSaveImageDefineXML(ctl->conn, file, xml, flags) < 0) {
...@@ -4765,7 +4765,7 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) ...@@ -4765,7 +4765,7 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd)
return false; return false;
if (xmlfile && if (xmlfile &&
virFileReadAll(xmlfile, 8192, &xml) < 0) virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0)
goto cleanup; goto cleanup;
if (((flags || xml) if (((flags || xml)
...@@ -8945,7 +8945,7 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) ...@@ -8945,7 +8945,7 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd)
vshCommandOptStringReq(ctl, cmd, "config", &configFile) < 0) vshCommandOptStringReq(ctl, cmd, "config", &configFile) < 0)
return false; return false;
if (virFileReadAll(configFile, 1024*1024, &configData) < 0) if (virFileReadAll(configFile, VSH_MAX_XML_FILE, &configData) < 0)
return false; return false;
xmlData = virConnectDomainXMLFromNative(ctl->conn, format, configData, flags); xmlData = virConnectDomainXMLFromNative(ctl->conn, format, configData, flags);
...@@ -9001,7 +9001,7 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) ...@@ -9001,7 +9001,7 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd)
vshCommandOptStringReq(ctl, cmd, "xml", &xmlFile) < 0) vshCommandOptStringReq(ctl, cmd, "xml", &xmlFile) < 0)
return false; return false;
if (virFileReadAll(xmlFile, 1024*1024, &xmlData) < 0) if (virFileReadAll(xmlFile, VSH_MAX_XML_FILE, &xmlData) < 0)
return false; return false;
configData = virConnectDomainXMLToNative(ctl->conn, format, xmlData, flags); configData = virConnectDomainXMLToNative(ctl->conn, format, xmlData, flags);
...@@ -9318,7 +9318,7 @@ doMigrate(void *opaque) ...@@ -9318,7 +9318,7 @@ doMigrate(void *opaque)
if (opt) { if (opt) {
char *xml; char *xml;
if (virFileReadAll(opt, 1024 * 1024, &xml) < 0) { if (virFileReadAll(opt, VSH_MAX_XML_FILE, &xml) < 0) {
vshError(ctl, _("cannot read file '%s'"), opt); vshError(ctl, _("cannot read file '%s'"), opt);
goto save_error; goto save_error;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册