提交 12bd207e 编写于 作者: H Hao Liu 提交者: Michal Privoznik

Fix invalid log, misused option types and a typo

This patch fixes the following issues.

1)  When an invalid wwn is introduced, libvirt reports
    "Malformed wwn: %s". The template won't be replaced.

2)  "target" option for dompmsuspend and "xml" option for
    save-image-define are required options and should use
    VSH_OT_DATA instead of VSH_OT_STRING as an option type.

3)  A typo.
Signed-off-by: NHao Liu <hliu@redhat.com>
上级 f9f0f545
......@@ -1549,8 +1549,8 @@ virValidateWWN(const char *wwn)
}
if (i != 16 || p[i]) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Malformed wwn: %s"));
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Malformed wwn: %s"), wwn);
return false;
}
......
......@@ -3228,7 +3228,7 @@ static const vshCmdOptDef opts_dom_pm_suspend[] = {
.help = N_("duration in seconds")
},
{.name = "target",
.type = VSH_OT_STRING,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("mem(Suspend-to-RAM), "
"disk(Suspend-to-Disk), "
......@@ -4268,7 +4268,7 @@ static const vshCmdOptDef opts_save_image_define[] = {
.help = N_("saved state file to modify")
},
{.name = "xml",
.type = VSH_OT_STRING,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("filename containing updated XML for the target")
},
......
......@@ -497,7 +497,7 @@ cmdAllocpages(vshControl *ctl, const vshCmd *cmd)
pageSizes[0] = VIR_DIV_UP(tmp, 1024);
if (vshCommandOptULongLong(cmd, "pagecount", &pageCounts[0]) < 0) {
vshError(ctl, "%s", _("pagecount hat to be a number"));
vshError(ctl, "%s", _("pagecount has to be a number"));
return false;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册