[libvirt] [PATCH] 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: Hao Liu <hliu(a)redhat.com>
---
src/util/virutil.c | 4 ++--
tools/virsh-domain.c | 4 ++--
tools/virsh-host.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 1116fda..c178515 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -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;
}
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 13a904f..8e743f1 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -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")
},
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 4a3ff28..28b160d 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -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;
}
--
1.8.3.1