[libvirt] [PATCH] virsh: Fix --help problem for domxml-to-native DOMAIN COMMAND
Resolves a bug in domxml-to-native command option, so that the following command displays the help information correctly: 'virsh domxml-to-native --help'. Signed-off-by: Daniel Liu <srwx4096@gmail.com> Signed-off-by: Julio Faracco <jcfaracco@gmail.com> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5311a57c2..55f4e14a4 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9857,12 +9857,12 @@ static const vshCmdOptDef opts_domxmltonative[] = { .help = N_("target config data type format") }, {.name = "domain", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .flags = VSH_OFLAG_REQ_OPT, .help = N_("domain name, id or uuid") }, {.name = "xml", - .type = VSH_OT_DATA, + .type = VSH_OT_ARGV, .help = N_("xml data file to export from") }, {.name = NULL} -- 2.13.1
WFM. Tested all possible scenarios. 1. domxml-to-native qemu-argv /tmp/mydomain.xml (Expect: success; Result: success) OK 2. domxml-to-native qemu-argv --xml /tmp/mydomain.xml (Expect: success; Result: success) OK 3. domxml-to-native qemu-argv mydomain (Expect: failure; Result: failure) OK 4. domxml-to-native qemu-argv --domain mydomain (Expect: success; Result: success) OK 5. domxml-to-native qemu-argv --domain mydomain --xml /tmp/mydomain.xml (Expect: failure; Result: failure) OK 6. Remove all <format> from all commands above (Expect: failure; Result: failure) OK 7. domxml-to-native --help (Expect: success; Result: success) OK 8. help domxml-to-native (Expect: success; Result: success) OK 2017-06-27 12:54 GMT-03:00 Daniel Liu <srwx4096@gmail.com>:
Resolves a bug in domxml-to-native command option, so that the following command displays the help information correctly: 'virsh domxml-to-native --help'.
Signed-off-by: Daniel Liu <srwx4096@gmail.com> Signed-off-by: Julio Faracco <jcfaracco@gmail.com> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5311a57c2..55f4e14a4 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9857,12 +9857,12 @@ static const vshCmdOptDef opts_domxmltonative[] = { .help = N_("target config data type format") }, {.name = "domain", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .flags = VSH_OFLAG_REQ_OPT, .help = N_("domain name, id or uuid") }, {.name = "xml", - .type = VSH_OT_DATA, + .type = VSH_OT_ARGV, .help = N_("xml data file to export from") }, {.name = NULL} -- 2.13.1
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On 06/27/2017 11:54 AM, Daniel Liu wrote:
Resolves a bug in domxml-to-native command option, so that the following command displays the help information correctly: 'virsh domxml-to-native --help'.
Signed-off-by: Daniel Liu <srwx4096@gmail.com> Signed-off-by: Julio Faracco <jcfaracco@gmail.com> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: John Ferlan <jferlan@redhat.com> (and pushed). Tks - John (FWIW: I was out of the office yesterday, hence the lack of response)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5311a57c2..55f4e14a4 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9857,12 +9857,12 @@ static const vshCmdOptDef opts_domxmltonative[] = { .help = N_("target config data type format") }, {.name = "domain", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .flags = VSH_OFLAG_REQ_OPT, .help = N_("domain name, id or uuid") }, {.name = "xml", - .type = VSH_OT_DATA, + .type = VSH_OT_ARGV, .help = N_("xml data file to export from") }, {.name = NULL}
participants (3)
-
Daniel Liu -
John Ferlan -
Julio Faracco