External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 12:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid log, misused option types and a typo

Browse Source 
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: Hao Liu <hliu@redhat.com>
This commit is contained in:
Hao Liu 2014-11-11 10:12:20 +08:00 committed by Michal Privoznik
parent f9f0f54524
commit 12bd207e21
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/virutil.c
View File

@ -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;
}

4
tools/virsh-domain.c
View File

@ -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")
},

2
tools/virsh-host.c
View File

@ -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;
}