virDomainInterfaceStats: Accept MAC addresses properly

https://bugzilla.redhat.com/show_bug.cgi?id=1497396

In 0d3d020ba6c4f I've added capability to accept MAC addresses
for the API too. However, the implementation was faulty. It needs
to lookup the corresponding interface in the domain definition
and pass the ifname instead of MAC address.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 08b0f03177ea4490d4c501b559c6bbb95aeeb7d0..2230343b03de45fab8eedcf650c28575015e820b 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -4982,7 +4982,7 @@ libxlDomainInterfaceStats(virDomainPtr dom,
     if (!(net = virDomainNetFind(vm->def, device)))
         goto endjob;
 
-    if (virNetDevTapInterfaceStats(device, stats,
+    if (virNetDevTapInterfaceStats(net->ifname, stats,
                                    !virDomainNetTypeSharesHostView(net)) < 0)
         goto endjob;
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 6cf499367963e343317d5ab709b800d467475fba..b3f6f064f3524de0b110a7e6eb0535caa0a68114 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2875,7 +2875,7 @@ lxcDomainInterfaceStats(virDomainPtr dom,
     if (!(net = virDomainNetFind(vm->def, device)))
         goto endjob;
 
-    if (virNetDevTapInterfaceStats(device, stats,
+    if (virNetDevTapInterfaceStats(net->ifname, stats,
                                    !virDomainNetTypeSharesHostView(net)) < 0)
         goto endjob;
 

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index ffd64da04b8745a59acfadfa127f9905b7037035..9bd73d85c49fa57a40069281ff53774772647cb9 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -2009,7 +2009,7 @@ openvzDomainInterfaceStats(virDomainPtr dom,
     if (!(net = virDomainNetFind(vm->def, device)))
         goto cleanup;
 
-    if (virNetDevTapInterfaceStats(device, stats,
+    if (virNetDevTapInterfaceStats(net->ifname, stats,
                                    !virDomainNetTypeSharesHostView(net)) < 0)
         goto cleanup;
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7b79c09505d020c64caa07654e1e88ead801b69a..260184ce8728099bd85376292ae3263a4803a7dc 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11044,10 +11044,10 @@ qemuDomainInterfaceStats(virDomainPtr dom,
         goto cleanup;
 
     if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
-        if (virNetDevOpenvswitchInterfaceStats(device, stats) < 0)
+        if (virNetDevOpenvswitchInterfaceStats(net->ifname, stats) < 0)
             goto cleanup;
     } else {
-        if (virNetDevTapInterfaceStats(device, stats,
+        if (virNetDevTapInterfaceStats(net->ifname, stats,
                                        !virDomainNetTypeSharesHostView(net)) < 0)
             goto cleanup;
     }