Include a CDROM drive in listvms if there is one.

svn path=/trunk/packages/invirt-remote/; revision=2245

diff --git a/debian/changelog b/debian/changelog
index 58bd62f..de68d30 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-remote (0.3.9) unstable; urgency=low
+
+  * Include a CDROM in listvms, if there is one.
+
+ -- Evan Broder <broder@mit.edu>  Thu, 12 Mar 2009 17:20:15 -0400
+
 invirt-remote (0.3.8) unstable; urgency=low
 
   * Allow anyone on the adminacl to issue web remctls.

diff --git a/host/usr/sbin/invirt-listvms b/host/usr/sbin/invirt-listvms
index c16a883..0f9d5dc 100755 (executable)
--- a/host/usr/sbin/invirt-listvms
+++ b/host/usr/sbin/invirt-listvms
@@ -32,6 +32,12 @@ def get_dom(domid):
     data['vm'] = xsc.read('', '/local/domain/%d/vm' % domid)
     data['start_time'] = float(xsc.read('', '%s/start_time' % data['vm']))
     data['uptime'] = time.time()-data['start_time']
+    # CD, if there is one
+    vbds = xsc.ls('', '/local/domain/%d/device/vbd' % domid)
+    for vbd in vbds:
+        dev = '/local/domain/%d/device/vbd/%s' % (domid, vbd)
+        if xsc.read('', '%s/device-type' % dev) == 'cdrom':
+            data['cdrom'] = xsc.read('', '%s/params' % xsc.read('', '%s/backend' % dev))
     
     return name, data