The macro is used in one place only and the command definition will be altered. Inline it.
Signed-off-by: Peter Krempa <pkre...@redhat.com> --- tools/virsh-host.c | 7 +++++-- tools/virsh.h | 7 ++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index ffb993de79..712db39d35 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1635,8 +1635,11 @@ static const vshCmdInfo info_hypervisor_cpu_baseline = { }; static const vshCmdOptDef opts_hypervisor_cpu_baseline[] = { - VIRSH_COMMON_OPT_FILE_FULL(N_("file containing XML CPU descriptions"), - false), + {.name = "file", + .type = VSH_OT_STRING, + .completer = virshCompletePathLocalExisting, + .help = N_("file containing XML CPU descriptions"), + }, {.name = "virttype", .type = VSH_OT_STRING, .completer = virshDomainVirtTypeCompleter, diff --git a/tools/virsh.h b/tools/virsh.h index ff0cf80911..90ffc4bf18 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -98,13 +98,10 @@ /* Use this only for files which are existing and used locally by virsh */ #define VIRSH_COMMON_OPT_FILE(_helpstr) \ - VIRSH_COMMON_OPT_FILE_FULL(_helpstr, true) - -#define VIRSH_COMMON_OPT_FILE_FULL(_helpstr, required_) \ {.name = "file", \ .type = VSH_OT_STRING, \ - .required = required_, \ - .positional = required_, \ + .required = true, \ + .positional = true, \ .completer = virshCompletePathLocalExisting, \ .help = _helpstr \ } -- 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-le...@lists.libvirt.org