From b3aaff56dbc73ba15197b31d0cdadb31a2f29a69 Mon Sep 17 00:00:00 2001 From: Chen Hanxiao Date: Mon, 16 Oct 2017 14:53:22 +0800 Subject: [PATCH] virsh: domifaddr: clarify description of --full option Option --full will always display the name and MAC address of the the interface. Both virsh help and virsh man page didn't mention that. Signed-off-by: Chen Hanxiao --- tools/virsh-domain-monitor.c | 2 +- tools/virsh.pod | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 4c50155e10..35d04b22af 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2153,7 +2153,7 @@ static const vshCmdOptDef opts_domifaddr[] = { {.name = "full", .type = VSH_OT_BOOL, .flags = VSH_OFLAG_NONE, - .help = N_("display full fields")}, + .help = N_("always display names and MACs of interfaces")}, {.name = "source", .type = VSH_OT_STRING, .flags = VSH_OFLAG_NONE, diff --git a/tools/virsh.pod b/tools/virsh.pod index 024d027699..1847df268f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -766,10 +766,14 @@ addresses, or limited output just for one interface if I is specified. Note that I can be driver dependent, it can be the name within guest OS or the name you would see in domain XML. Moreover, the whole command may require a guest agent to be configured for the queried domain under -some drivers, notably qemu. If I<--full> is specified, the interface name is -always displayed when the interface has multiple addresses or alias, otherwise -it only displays the interface name for the first address, and "-" for the -others. The I<--source> argument specifies what data source to use for the +some hypervisors, notably QEMU. + +If I<--full> is specified, the interface name and MAC address is always +displayed when the interface has multiple IP addresses or aliases; otherwise, +only the interface name and MAC address is displayed for the first name and +MAC address with "-" for the others using the same name and MAC address. + +The I<--source> argument specifies what data source to use for the addresses, currently one of 'lease' to read DHCP leases, or 'agent' to query the guest OS via an agent. If unspecified, 'lease' is the default. -- 2.39.5