Skip to content
Snippets Groups Projects
Commit bd91614b authored by Guido Günther's avatar Guido Günther
Browse files

Drop 0007-Fix-block-statistics-with-newer-versions-of-Xen.patch

fixed upstream.
parent 9e7922f7
No related branches found
No related tags found
No related merge requests found
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 10 Sep 2010 15:57:35 +0200
Subject: [PATCH] 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
Origin: upstream, http://libvirt.org/git/?p=libvirt.git;a=commit;h=8a70113a9949fd482151f2962dd760364525a996
Closes: #596004
---
src/xen/block_stats.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index 6e7a5c3..1d875f2 100644
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -118,6 +118,18 @@ read_bd_stat (int device, int domid, const char *str)
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);
r = read_stat (path);
--
......@@ -4,4 +4,3 @@
0004-fix-Debian-specific-path-to-hvm-loader.patch
0005-Terminate-nc-on-EOF.patch
0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
0007-Fix-block-statistics-with-newer-versions-of-Xen.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment