Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
libvirt
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Libvirt Packaging Team
libvirt
Commits
bd91614b
Commit
bd91614b
authored
14 years ago
by
Guido Günther
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/patches/0007-Fix-block-statistics-with-newer-versions-of-Xen.patch
+0
-42
0 additions, 42 deletions
...007-Fix-block-statistics-with-newer-versions-of-Xen.patch
debian/patches/series
+0
-1
0 additions, 1 deletion
debian/patches/series
with
0 additions
and
43 deletions
debian/patches/0007-Fix-block-statistics-with-newer-versions-of-Xen.patch
deleted
100644 → 0
+
0
−
42
View file @
9e7922f7
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);
--
This diff is collapsed.
Click to expand it.
debian/patches/series
+
0
−
1
View file @
bd91614b
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment