From d86531daf2747acba21556ab0aa6a3d6861b600e Mon Sep 17 00:00:00 2001 From: Lin Ma Date: Tue, 8 May 2018 22:20:33 +0800 Subject: [PATCH] virsh: Apply macro for current VSH_OT_STRING "domain" options These VSH_OT_STRING "domain" options support domain name completion now. Signed-off-by: Lin Ma --- tools/virsh-domain.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ace5c02871..30da953446 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9592,10 +9592,8 @@ static const vshCmdInfo info_qemu_monitor_event[] = { }; static const vshCmdOptDef opts_qemu_monitor_event[] = { - {.name = "domain", - .type = VSH_OT_STRING, - .help = N_("filter by domain name, id or uuid") - }, + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uuid"), + 0), {.name = "event", .type = VSH_OT_STRING, .help = N_("filter by event name") @@ -10148,11 +10146,7 @@ static const vshCmdOptDef opts_domxmltonative[] = { .flags = VSH_OFLAG_REQ, .help = N_("target config data type format") }, - {.name = "domain", - .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, - .help = N_("domain name, id or uuid") - }, + VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(0), {.name = "xml", .type = VSH_OT_STRING, .help = N_("xml data file to export from") @@ -13339,10 +13333,8 @@ static const vshCmdInfo info_event[] = { }; static const vshCmdOptDef opts_event[] = { - {.name = "domain", - .type = VSH_OT_STRING, - .help = N_("filter by domain name, id, or uuid") - }, + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uuid"), + 0), {.name = "event", .type = VSH_OT_STRING, .help = N_("which event type to wait for")