X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/308f5555dc4e49e2e2c734e03f7875bb9220f700..9f88189ca1aaa08faf6bca2a9fb0ae95393a7b5d:/host/usr/sbin/invirt-listvms diff --git a/host/usr/sbin/invirt-listvms b/host/usr/sbin/invirt-listvms index 0f9d5dc..d71d6eb 100755 --- a/host/usr/sbin/invirt-listvms +++ b/host/usr/sbin/invirt-listvms @@ -32,12 +32,16 @@ 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 + # CD or autoinstall, if we're using either 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)) + dev_type = xsc.read('', '%s/device-type' % dev) + dev_params = xsc.read('', '%s/params' % xsc.read('', '%s/backend' % dev)) + if dev_type == 'cdrom': + data['cdrom'] = dev_params + elif dev_type == 'disk' and dev_params == '/dev/xenvg/s_install_hda': + data['autoinstall'] = True return name, data