[libvirt] [PATCHv2 09/11] qemu: bulk stats: implement interface group

[Francesco Romani]

This patch implements the VIR_DOMAIN_STATS_INTERFACE
group of statistics.

Signed-off-by: Francesco Romani <fromani at redhat.com>
---
 include/libvirt/libvirt.h.in |  1 +
 src/libvirt.c                | 13 +++++++
 src/qemu/qemu_driver.c       | 85 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+)

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 46f4067..33588d6 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -2514,6 +2514,7 @@ typedef enum {
     VIR_DOMAIN_STATS_CPU_TOTAL = (1 << 1), /* return domain CPU info */
     VIR_DOMAIN_STATS_BALLOON = (1 << 2), /* return domain balloon info */
     VIR_DOMAIN_STATS_VCPU = (1 << 3), /* return domain virtual CPU info */
+    VIR_DOMAIN_STATS_INTERFACE = (1 << 4), /* return domain interfaces info */
 } virDomainStatsTypes;
 
 typedef enum {
diff --git a/src/libvirt.c b/src/libvirt.c
index a5942bc..099404b 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -21566,6 +21566,19 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
  * "vcpu.<num>.time" - virtual cpu time spent by virtual CPU <num>
  * "vcpu.<num>.cpu" - physical CPU pinned to virtual CPU <num>
  *
+ * VIR_DOMAIN_STATS_INTERFACE: Return network interface statistics.
+ * The typed parameter keys are in this format:
+ * "net.count" - number of network interfaces on this domain.
+ * "net.<num>.name" - name of the interface <num>.
+ * "net.<num>.rx.bytes" - bytes received.
+ * "net.<num>.rx.pkts" - packets received.
+ * "net.<num>.rx.errs" - receive errors.
+ * "net.<num>.rx.drop" - receive packets dropped.
+ * "net.<num>.tx.bytes" - bytes transmitted.
+ * "net.<num>.tx.pkts" - packets transmitted.
+ * "net.<num>.tx.errs" - transmission errors.
+ * "net.<num>.tx.drop" - transmit packets dropped.
+ *
  * Using 0 for @stats returns all stats groups supported by the given
  * hypervisor.
  *
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 72ec284..069a15d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17461,6 +17461,90 @@ qemuDomainGetStatsVcpu(virConnectPtr conn ATTRIBUTE_UNUSED,
     return ret;
 }
 
+#define QEMU_ADD_COUNT_PARAM(RECORD, MAXPARAMS, TYPE, COUNT) \
+do { \
+    char param_name[NAME_MAX]; \
+    snprintf(param_name, NAME_MAX, "%s.count", TYPE); \
+    if (virTypedParamsAddUInt(&RECORD->params, \
+                              &RECORD->nparams, \
+                              MAXPARAMS, \
+                              param_name, \
+                              COUNT) < 0) \
+        return -1; \
+} while (0)
+
+#define QEMU_ADD_NAME_PARAM(RECORD, MAXPARAMS, TYPE, NUM, NAME) \
+do { \
+    char param_name[NAME_MAX]; \
+    snprintf(param_name, NAME_MAX, "%s.%lu.name", TYPE, NUM); \
+    if (virTypedParamsAddString(&RECORD->params, \
+                                &RECORD->nparams, \
+                                MAXPARAMS, \
+                                param_name, \
+                                NAME) < 0) \
+        return -1; \
+} while (0)
+
+#define QEMU_ADD_NET_PARAM(RECORD, MAXPARAMS, NUM, NAME, VALUE) \
+do { \
+    char param_name[NAME_MAX]; \
+    snprintf(param_name, NAME_MAX, "net.%lu.%s", NUM, NAME); \
+    if (virTypedParamsAddLLong(&RECORD->params, \
+                               &RECORD->nparams, \
+                               MAXPARAMS, \
+                               param_name, \
+                               VALUE) < 0) \
+        return -1; \
+} while (0)
+
+static int
+qemuDomainGetStatsInterface(virConnectPtr conn ATTRIBUTE_UNUSED,
+                            virDomainObjPtr dom,
+                            virDomainStatsRecordPtr record,
+                            int *maxparams,
+                            unsigned int privflags ATTRIBUTE_UNUSED)
+{
+    size_t i;
+    struct _virDomainInterfaceStats tmp;
+
+    /* Check the path is one of the domain's network interfaces. */
+    for (i = 0; i < dom->def->nnets; i++) {
+        memset(&tmp, 0, sizeof(tmp));
+
+        if (virNetInterfaceStats(dom->def->nets[i]->ifname, &tmp) < 0)
+            continue;
+
+        QEMU_ADD_COUNT_PARAM(record, maxparams, "net", dom->def->nnets);
+
+        QEMU_ADD_NAME_PARAM(record, maxparams,
+                            "net", i, dom->def->nets[i]->ifname);
+
+        QEMU_ADD_NET_PARAM(record, maxparams, i,
+                           "rx.bytes", tmp.rx_bytes);
+        QEMU_ADD_NET_PARAM(record, maxparams, i,
+                           "rx.pkts", tmp.rx_packets);
+        QEMU_ADD_NET_PARAM(record, maxparams, i,
+                           "rx.errs", tmp.rx_errs);
+        QEMU_ADD_NET_PARAM(record, maxparams, i,
+                           "rx.drop", tmp.rx_drop);
+        QEMU_ADD_NET_PARAM(record, maxparams, i,
+                           "tx.bytes", tmp.tx_bytes);
+        QEMU_ADD_NET_PARAM(record, maxparams, i,
+                           "tx.pkts", tmp.tx_packets);
+        QEMU_ADD_NET_PARAM(record, maxparams, i,
+                           "tx.errs", tmp.tx_errs);
+        QEMU_ADD_NET_PARAM(record, maxparams, i,
+                           "tx.drop", tmp.tx_drop);
+    }
+
+    return 0;
+}
+
+#undef QEMU_ADD_NET_PARAM
+
+#undef QEMU_ADD_NAME_PARAM
+
+#undef QEMU_ADD_COUNT_PARAM
 
 typedef int
 (*qemuDomainGetStatsFunc)(virConnectPtr conn,
@@ -17479,6 +17563,7 @@ static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = {
     { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL },
     { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON },
     { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU },
+    { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE },
     { NULL, 0 }
 };
 
-- 
1.9.3