|
 |
99cbc7 |
From 6d4f6fa057a8c8801530c97c4f78fa477ece6f4a Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <6d4f6fa057a8c8801530c97c4f78fa477ece6f4a@dist-git>
|
|
|
99cbc7 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
Date: Thu, 4 Apr 2019 11:50:35 +0200
|
|
|
99cbc7 |
Subject: [PATCH] virsh: Require explicit --domain for domxml-to-native
|
|
|
99cbc7 |
|
|
|
99cbc7 |
The domxml-to-native virsh command accepts either --xml or --domain
|
|
|
99cbc7 |
option followed by a file or domain name respectively. The --domain
|
|
|
99cbc7 |
option is documented as required, which means an argument with no option
|
|
|
99cbc7 |
is treated as --xml. Commit v4.3.0-127-gd86531daf2 broke this by making
|
|
|
99cbc7 |
--domain optional and thus an argument with no option was treated as
|
|
|
99cbc7 |
--domain.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
https://bugzilla.redhat.com/show_bug.cgi?id=1633077
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit b7ccd0757de73344a4b973ede946dad40de846c7)
|
|
|
99cbc7 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
Message-Id: <5531d22f2eb774ff080d333975557f6aa03e4b9d.1554371431.git.jdenemar@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
tools/virsh-domain.c | 6 +++---
|
|
|
99cbc7 |
tools/virsh.h | 8 +++++---
|
|
|
99cbc7 |
2 files changed, 8 insertions(+), 6 deletions(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
|
|
|
99cbc7 |
index 6aa79f11b9..db4834dd1f 100644
|
|
|
99cbc7 |
--- a/tools/virsh-domain.c
|
|
|
99cbc7 |
+++ b/tools/virsh-domain.c
|
|
|
99cbc7 |
@@ -9387,7 +9387,7 @@ static const vshCmdInfo info_qemu_monitor_event[] = {
|
|
|
99cbc7 |
|
|
|
99cbc7 |
static const vshCmdOptDef opts_qemu_monitor_event[] = {
|
|
|
99cbc7 |
VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uuid"),
|
|
|
99cbc7 |
- 0),
|
|
|
99cbc7 |
+ 0, 0),
|
|
|
99cbc7 |
{.name = "event",
|
|
|
99cbc7 |
.type = VSH_OT_STRING,
|
|
|
99cbc7 |
.help = N_("filter by event name")
|
|
|
99cbc7 |
@@ -9940,7 +9940,7 @@ static const vshCmdOptDef opts_domxmltonative[] = {
|
|
|
99cbc7 |
.flags = VSH_OFLAG_REQ,
|
|
|
99cbc7 |
.help = N_("target config data type format")
|
|
|
99cbc7 |
},
|
|
|
99cbc7 |
- VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(0),
|
|
|
99cbc7 |
+ VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(VSH_OFLAG_REQ_OPT, 0),
|
|
|
99cbc7 |
{.name = "xml",
|
|
|
99cbc7 |
.type = VSH_OT_STRING,
|
|
|
99cbc7 |
.help = N_("xml data file to export from")
|
|
|
99cbc7 |
@@ -13189,7 +13189,7 @@ static const vshCmdInfo info_event[] = {
|
|
|
99cbc7 |
|
|
|
99cbc7 |
static const vshCmdOptDef opts_event[] = {
|
|
|
99cbc7 |
VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uuid"),
|
|
|
99cbc7 |
- 0),
|
|
|
99cbc7 |
+ 0, 0),
|
|
|
99cbc7 |
{.name = "event",
|
|
|
99cbc7 |
.type = VSH_OT_STRING,
|
|
|
99cbc7 |
.completer = virshDomainEventNameCompleter,
|
|
|
99cbc7 |
diff --git a/tools/virsh.h b/tools/virsh.h
|
|
|
99cbc7 |
index e164aabcee..b0a3cdbb97 100644
|
|
|
99cbc7 |
--- a/tools/virsh.h
|
|
|
99cbc7 |
+++ b/tools/virsh.h
|
|
|
99cbc7 |
@@ -110,16 +110,18 @@
|
|
|
99cbc7 |
.help = _helpstr \
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
|
|
|
99cbc7 |
-# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING(_helpstr, cflags) \
|
|
|
99cbc7 |
+# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING(_helpstr, oflags, cflags) \
|
|
|
99cbc7 |
{.name = "domain", \
|
|
|
99cbc7 |
.type = VSH_OT_STRING, \
|
|
|
99cbc7 |
+ .flags = oflags, \
|
|
|
99cbc7 |
.help = _helpstr, \
|
|
|
99cbc7 |
.completer = virshDomainNameCompleter, \
|
|
|
99cbc7 |
.completer_flags = cflags, \
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
|
|
|
99cbc7 |
-# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \
|
|
|
99cbc7 |
- VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags)
|
|
|
99cbc7 |
+# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(oflags, cflags) \
|
|
|
99cbc7 |
+ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), \
|
|
|
99cbc7 |
+ oflags, cflags)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
# define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(_helpstr, cflags) \
|
|
|
99cbc7 |
{.name = "domain", \
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.21.0
|
|
|
99cbc7 |
|