All of print function use vshPrintExtra in cmdDomIfAddr, this will
make domifaddr no output in quiet mode, after this patch, quiet mode
output will be:
# virsh -q domifaddr test3 --source agent
lo 00:00:00:00:00:00 ipv4 127.0.0.1/8
- - ipv6 ::1/128
ens8 52:54:00:1a:cb:3f ipv6 fe80::5054:ff:fe1a:cb3f/64
virbr0 52:54:00:db:51:e7 ipv4 192.168.122.1/24
virbr0-nic 52:54:00:db:51:e7 N/A N/A
Signed-off-by: Luyao Huang <lhuang(a)redhat.com>
---
tools/virsh-domain-monitor.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 6951db2..9686531 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -2278,9 +2278,9 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd)
/* When the interface has no IP address */
if (!iface->naddrs) {
- vshPrintExtra(ctl, " %-10s %-17s %-12s %s\n",
- iface->name,
- iface->hwaddr ? iface->hwaddr : "N/A",
"N/A", "N/A");
+ vshPrint(ctl, " %-10s %-17s %-12s %s\n",
+ iface->name,
+ iface->hwaddr ? iface->hwaddr : "N/A",
"N/A", "N/A");
continue;
}
@@ -2313,12 +2313,12 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd)
/* Don't repeat interface name */
if (full || !j)
- vshPrintExtra(ctl, " %-10s %-17s %s\n",
- iface->name,
- iface->hwaddr ? iface->hwaddr : "",
ip_addr_str);
+ vshPrint(ctl, " %-10s %-17s %s\n",
+ iface->name,
+ iface->hwaddr ? iface->hwaddr : "",
ip_addr_str);
else
- vshPrintExtra(ctl, " %-10s %-17s %s\n",
- "-", "-", ip_addr_str);
+ vshPrint(ctl, " %-10s %-17s %s\n",
+ "-", "-", ip_addr_str);
virBufferFreeAndReset(&buf);
VIR_FREE(ip_addr_str);
--
1.8.3.1
Show replies by date
On 03.04.2015 11:41, Luyao Huang wrote:
All of print function use vshPrintExtra in cmdDomIfAddr, this will
make domifaddr no output in quiet mode, after this patch, quiet mode
output will be:
# virsh -q domifaddr test3 --source agent
lo 00:00:00:00:00:00 ipv4 127.0.0.1/8
- - ipv6 ::1/128
ens8 52:54:00:1a:cb:3f ipv6 fe80::5054:ff:fe1a:cb3f/64
virbr0 52:54:00:db:51:e7 ipv4 192.168.122.1/24
virbr0-nic 52:54:00:db:51:e7 N/A N/A
Signed-off-by: Luyao Huang <lhuang(a)redhat.com>
---
tools/virsh-domain-monitor.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
I've reworded the commit message, ACKed and pushed.
Michal