From ad44f1015791261e912dc6d7b17aab945eefb8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Wed, 16 Feb 2011 18:36:46 +0100
Subject: [PATCH] Bugs in poll_xen_kvm.rb for Xen monitoring:

    * usedmem changed to usedmemory
    * State detection fixed for Xen
---
 src/vmm_mad/remotes/poll_xen_kvm.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/vmm_mad/remotes/poll_xen_kvm.rb b/src/vmm_mad/remotes/poll_xen_kvm.rb
index 959a746936..5b02bbfb10 100755
--- a/src/vmm_mad/remotes/poll_xen_kvm.rb
+++ b/src/vmm_mad/remotes/poll_xen_kvm.rb
@@ -181,7 +181,13 @@ module XEN
     }
     
     def self.get_vm_info(vm_id)
-        get_all_vm_info[vm_id]
+        data = get_all_vm_info[vm_id]
+
+        if !data
+            return {:STATE => 'd'}
+        else
+            return data
+        end
     end
     
     def self.get_all_vm_info
@@ -203,7 +209,7 @@ module XEN
             dom_hash[:name]=dom_data[0]
             dom_hash[:state]=get_state(dom_data[1])
             dom_hash[:usedcpu]=dom_data[3]
-            dom_hash[:usedmem]=dom_data[4]
+            dom_hash[:usedmemory]=dom_data[4]
             dom_hash[:nettx]=dom_data[10]
             dom_hash[:netrx]=dom_data[11]
             
@@ -218,7 +224,7 @@ module XEN
     end
     
     def self.get_state(state)
-        case state
+        case state.gsub('-', '')[-1..-1]
         when *%w{r b s d}
             'a'
         when 'p'