aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xenstat/xentop
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-02-27 16:13:08 +0000
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-02-27 16:13:08 +0000
commita2d9dd33747660fbe41c3ddc8c18b354a8a70751 (patch)
tree0013cc65263593f6595df0b3aea6008f1e319c5f /tools/xenstat/xentop
parent8ca1a72e7931800b9e06a84880d0a0b65f915541 (diff)
downloadxen-a2d9dd33747660fbe41c3ddc8c18b354a8a70751.tar.gz
xen-a2d9dd33747660fbe41c3ddc8c18b354a8a70751.tar.bz2
xen-a2d9dd33747660fbe41c3ddc8c18b354a8a70751.zip
Fix for Solaris compile/output for VBDs in xentop.
Signed-off-by: John Levon <john.levon@sun.com>
Diffstat (limited to 'tools/xenstat/xentop')
-rw-r--r--tools/xenstat/xentop/xentop.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index 170b5c4caa..faff532bfa 100644
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -916,11 +916,19 @@ void do_vbd(xenstat_domain *domain)
num_vbds = xenstat_domain_num_vbds(domain);
for (i=0 ; i< num_vbds; i++) {
+ char details[20];
+
vbd = xenstat_domain_vbd(domain,i);
-
- print("VBD %4d [%2x:%2x] OO: %8llu RD: %8llu WR: %8llu\n",
- xenstat_vbd_dev(vbd),
- MAJOR(xenstat_vbd_dev(vbd)), MINOR(xenstat_vbd_dev(vbd)),
+
+#ifdef __sun__
+ details[0] = '\0';
+#else
+ snprintf(details, 20, "[%2x:%2x] ", MAJOR(xenstat_vbd_dev(vbd)),
+ MINOR(xenstat_vbd_dev(vbd)));
+#endif
+
+ print("VBD %4d %s OO: %8llu RD: %8llu WR: %8llu\n",
+ xenstat_vbd_dev(vbd), details,
xenstat_vbd_oo_reqs(vbd),
xenstat_vbd_rd_reqs(vbd),
xenstat_vbd_wr_reqs(vbd));