virstat: fix signature of virstat helper

In preparation to the code move to virnetdevtap.c, this change:

* renames virNetInterfaceStats to virNetDevTapInterfaceStats
* changes 'path' to 'ifname', to use the same vocable as other
  method in virnetdevtap.c.
* Add the attributes checker

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 500419c177feff2f74a86fabfff41ebe476c4a19..46051a1048afcbccdbd7db42a125c1e52ae7dfdb 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2397,7 +2397,7 @@ virSocketAddrSetIPv6AddrNetOrder;
 virSocketAddrSetPort;
 
 # util/virstats.h
-virNetInterfaceStats;
+virNetDevTapInterfaceStats;
 
 # util/virstorageencryption.h
 virStorageEncryptionFormat;

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 3efa91eee8e314677e609b662138cef26826619c..e0cb14740a0622811231f38cafecc8e2a3ee5e81 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -4985,7 +4985,7 @@ libxlDomainInterfaceStats(virDomainPtr dom,
     }
 
     if (ret == 0)
-        ret = virNetInterfaceStats(path, stats);
+        ret = virNetDevTapInterfaceStats(path, stats);
     else
         virReportError(VIR_ERR_INVALID_ARG,
                        _("'%s' is not a known interface"), path);

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index a6776a1933c86b0262d16292c83d55ab042efe0c..64ff83dd307d5e6dd27d60fd6d505cf26e84e735 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2896,7 +2896,7 @@ lxcDomainInterfaceStats(virDomainPtr dom,
     }
 
     if (ret == 0)
-        ret = virNetInterfaceStats(path, stats);
+        ret = virNetDevTapInterfaceStats(path, stats);
     else
         virReportError(VIR_ERR_INVALID_ARG,
                        _("Invalid path, '%s' is not a known interface"), path);

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 1dfb1ccf49fcaef3971fd04c809e9a9861630e21..cdf39275b50af8792178b7f8c7a3b6c775f0ff9c 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -2027,7 +2027,7 @@ openvzDomainInterfaceStats(virDomainPtr dom,
     }
 
     if (ret == 0)
-        ret = virNetInterfaceStats(path, stats);
+        ret = virNetDevTapInterfaceStats(path, stats);
     else
         virReportError(VIR_ERR_INVALID_ARG,
                        _("invalid path, '%s' is not a known interface"), path);

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d86d301a9164d15bb39e99893a3e1ef002e54981..54841a074daee2be0b748010c04673a33a1035b9 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11009,7 +11009,7 @@ qemuDomainInterfaceStats(virDomainPtr dom,
         if (virNetDevOpenvswitchInterfaceStats(path, stats) < 0)
             goto cleanup;
     } else {
-        if (virNetInterfaceStats(path, stats) < 0)
+        if (virNetDevTapInterfaceStats(path, stats) < 0)
             goto cleanup;
     }
 
@@ -19204,7 +19204,7 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
                 continue;
             }
         } else {
-            if (virNetInterfaceStats(dom->def->nets[i]->ifname, &tmp) < 0) {
+            if (virNetDevTapInterfaceStats(dom->def->nets[i]->ifname, &tmp) < 0) {
                 virResetLastError();
                 continue;
             }

diff --git a/src/util/virstats.c b/src/util/virstats.c
index c4725edbd7b1dd341d9451af50ecf643f8ed82b5..eadb3c97881d33e46fe7b2376d7ca2a6de506987 100644 (file)
--- a/src/util/virstats.c
+++ b/src/util/virstats.c
@@ -50,10 +50,10 @@
  */
 #ifdef __linux__
 int
-virNetInterfaceStats(const char *path,
-                     virDomainInterfaceStatsPtr stats)
+virNetDevTapInterfaceStats(const char *ifname,
+                           virDomainInterfaceStatsPtr stats)
 {
-    int path_len;
+    int ifname_len;
     FILE *fp;
     char line[256], *colon;
 
@@ -64,7 +64,7 @@ virNetInterfaceStats(const char *path,
         return -1;
     }
 
-    path_len = strlen(path);
+    ifname_len = strlen(ifname);
 
     while (fgets(line, sizeof(line), fp)) {
         long long dummy;
@@ -84,15 +84,15 @@ virNetInterfaceStats(const char *path,
         colon = strchr(line, ':');
         if (!colon) continue;
         *colon = '\0';
-        if (colon-path_len >= line &&
-            STREQ(colon-path_len, path)) {
+        if (colon - ifname_len >= line &&
+            STREQ(colon - ifname_len, ifname)) {
             /* IMPORTANT NOTE!
              * /proc/net/dev vif<domid>.nn sees the network from the point
              * of view of dom0 / hypervisor.  So bytes TRANSMITTED by dom0
              * are bytes RECEIVED by the domain.  That's why the TX/RX fields
              * appear to be swapped here.
              */
-            if (sscanf(colon+1,
+            if (sscanf(colon + 1,
                        "%lld %lld %lld %lld %lld %lld %lld %lld %lld %lld %lld %lld %lld %lld %lld %lld",
                        &tx_bytes, &tx_packets, &tx_errs, &tx_drop,
                        &dummy, &dummy, &dummy, &dummy,
@@ -121,8 +121,8 @@ virNetInterfaceStats(const char *path,
 }
 #elif defined(HAVE_GETIFADDRS) && defined(AF_LINK)
 int
-virNetInterfaceStats(const char *path,
-                     virDomainInterfaceStatsPtr stats)
+virNetDevTapInterfaceStats(const char *ifname,
+                           virDomainInterfaceStatsPtr stats)
 {
     struct ifaddrs *ifap, *ifa;
     struct if_data *ifd;
@@ -138,7 +138,7 @@ virNetInterfaceStats(const char *path,
         if (ifa->ifa_addr->sa_family != AF_LINK)
             continue;
 
-        if (STREQ(ifa->ifa_name, path)) {
+        if (STREQ(ifa->ifa_name, ifname)) {
             ifd = (struct if_data *)ifa->ifa_data;
             stats->tx_bytes = ifd->ifi_ibytes;
             stats->tx_packets = ifd->ifi_ipackets;
@@ -167,8 +167,8 @@ virNetInterfaceStats(const char *path,
 }
 #else
 int
-virNetInterfaceStats(const char *path ATTRIBUTE_UNUSED,
-                     virDomainInterfaceStatsPtr stats ATTRIBUTE_UNUSED)
+virNetDevTapInterfaceStats(const char *ifname ATTRIBUTE_UNUSED,
+                           virDomainInterfaceStatsPtr stats ATTRIBUTE_UNUSED)
 {
     virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                    _("interface stats not implemented on this platform"));

diff --git a/src/util/virstats.h b/src/util/virstats.h
index 69f4cf1402a0519920a3cfc732b6b71bf37e2130..5b771976bd3866fba8c30fd2def9c302828e9197 100644 (file)
--- a/src/util/virstats.h
+++ b/src/util/virstats.h
@@ -25,7 +25,8 @@
 
 # include "internal.h"
 
-int virNetInterfaceStats(const char *path,
-                         virDomainInterfaceStatsPtr stats);
+int virNetDevTapInterfaceStats(const char *ifname,
+                               virDomainInterfaceStatsPtr stats)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
 
 #endif /* __STATS_LINUX_H__ */

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 0177f83a0d5f9b055be5c5ce5b9040a4c39be427..efe5a8f977a38de145e40e8e3da39952e40a963d 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -1466,7 +1466,7 @@ xenHypervisorDomainInterfaceStats(virDomainDefPtr def,
         return -1;
     }
 
-    return virNetInterfaceStats(path, stats);
+    return virNetDevTapInterfaceStats(path, stats);
 #else
     virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                    _("/proc/net/dev: Interface not found"));