From 4ee00db9a92f59bf21a24b21bf0120afdf187e56 Mon Sep 17 00:00:00 2001 From: shnavid Date: Mon, 2 Apr 2007 15:51:05 +0000 Subject: Replaced xen plugin with (better) version from Chris Lalancette git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@110 ef72aa8b-4018-0410-8976-d6e080ef94d8 --- src/lib/sos/plugins/xen.py | 56 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/lib/sos/plugins/xen.py b/src/lib/sos/plugins/xen.py index d58747a1..e0429fa3 100644 --- a/src/lib/sos/plugins/xen.py +++ b/src/lib/sos/plugins/xen.py @@ -13,16 +13,56 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. import sos.plugintools +import os, commands +from stat import * class xen(sos.plugintools.PluginBase): - """This plugin gathers XEN related information - """ + def determineXenHost(self): + if os.access("/proc/acpi/dsdt", os.R_OK): + (status, output) = commands.getstatusoutput("/usr/bin/strings /proc/acpi/dsdt | grep -q int-xen") + if status == 0: + return "hvm" + + if os.access("/proc/xen/capabilities", os.R_OK): + (status, output) = commands.getstatusoutput("grep -q control_d /proc/xen/capabilities") + if status == 0: + return "dom0" + else: + return "domU" + return "baremetal" + + def domCollectProc(self): + self.addCopySpec("/proc/xen/balloon") + self.addCopySpec("/proc/xen/capabilities") + self.addCopySpec("/proc/xen/xsd_kva") + self.addCopySpec("/proc/xen/xsd_port") + def setup(self): - self.addCopySpec("/etc/xen") - self.addCopySpec("/proc/xen") - self.addCopySpec("/var/log/xen") - self.collectExtOutput("/usr/sbin/xm info") - self.collectExtOutput("/usr/sbin/xm list") - self.collectExtOutput("/usr/sbin/xm dmesg") + host_type = self.determineXenHost() + if host_type == "domU": + # we should collect /proc/xen and /sys/hypervisor + self.domCollectProc() + self.addCopySpec("/sys/hypervisor") + elif host_type == "hvm": + # what do we collect here??? + pass + elif host_type == "dom0": + # default of dom0, collect lots of system information + self.addCopySpec("/var/log/xen") + self.addCopySpec("/etc/xen") + self.collectExtOutput("/usr/bin/xenstore-ls") + self.collectExtOutput("/usr/sbin/xm dmesg") + self.collectExtOutput("/usr/sbin/xm info") + self.domCollectProc() + self.addCopySpec("/sys/hypervisor") + # FIXME: we *might* want to collect things in /sys/bus/xen*, + # /sys/class/xen*, /sys/devices/xen*, /sys/modules/blk*, + # /sys/modules/net*, but I've never heard of them actually being + # useful, so I'll leave it out for now + else: + # for bare-metal, we don't have to do anything special + return + + self.addCustomText("Xen hostType: "+host_type) return -- cgit