Index: vws
==================================================================
--- vws
+++ vws
@@ -3,11 +3,11 @@
 from argparse import ArgumentParser
 import fcntl
 import socket
 import errno
 import re
-import os,sys
+import os,sys,time
 def find_vm(name):
     search_path=[os.environ['HOME']+"/VWs",
         config.get("directories","SharedVMs"),
         config.get("directories","AutostartVMs")]
     for dirname in search_path:
@@ -46,11 +46,13 @@
         n=line.find("address:")
         if n != -1:
             url=line[n+9:]
             if url.startswith('*:'):
                 url="localhost"+url[1:]
-    return "spice://"+url      
+    if url is None:
+        return None
+    return "spice://"+url.rstrip('\r')      
 
 #
 # command implementation
 #
 
@@ -60,20 +62,20 @@
 
 def cmd_start(options):
     if options.stopped:
         arg=""
         if options.cdrom:
-            arg=" -cdrom "+options.cdrom
+            arg=" -cdrom "+options.cdrom[0]
         cwd=os.getcwd()
         os.chdir(options.dir)
         os.system("./start%s" % arg)
         os.chdir(cwd)
-        os.sleep(2)
+        time.sleep(2)
         options.sock = connect_vm(options.dir)
     if options.gui:
         uri = spiceurl(options)
-        os.system("remote-viewer %s &"%uri)
+        os.system("remote-viewer %s &" % uri)
     elif not options.stopped:
         print >>sys.stderr,"VM already running"
         
 def cmd_stop(options):
     print send_command(options.sock,'system_powerdown')