From: Guido Günther <agx@sigxcpu.org>
Date: Fri, 10 Sep 2010 13:57:35 +0000 (+0200)
Subject: Fix block statistics with newer versions of Xen
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8a70113a9949fd482151f2962dd760364525a996;p=libvirt.git

Fix block statistics with newer versions of Xen

Apparently the xen block device statistics moved from
"/sys/devices/xen-backend/vbd-%d-%d/statistics/%s"
to
"/sys/bus/xen-backend/devices/vbd-%d-%d/statistics/%s"

* src/xen/block_stats.c: try the extra path in case of failure to
  find the statistics in /sys
---

diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index 6e7a5c3439..1d875f28d7 100644
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -117,6 +117,18 @@ read_bd_stat (int device, int domid, const char *str)
     char path[PATH_MAX];
     int64_t r;
 
+    snprintf (path, sizeof path,
+              "/sys/bus/xen-backend/devices/vbd-%d-%d/statistics/%s",
+              domid, device, str);
+    r = read_stat (path);
+    if (r >= 0) return r;
+
+    snprintf (path, sizeof path,
+              "/sys/bus/xen-backend/devices/tap-%d-%d/statistics/%s",
+              domid, device, str);
+    r = read_stat (path);
+    if (r >= 0) return r;
+
     snprintf (path, sizeof path,
               "/sys/devices/xen-backend/vbd-%d-%d/statistics/%s",
               domid, device, str);