fix default qemu and remove choices limitation for clients

1 files changed, 8 insertions, 2 deletions

diff --git a/migrate.py b/migrate.py
index a7d673f..bbdc615 100755
--- a/migrate.py
+++ b/migrate.py
@@ -55,10 +55,10 @@ def get_args():
     parser.add_argument('--spice_port2', dest='spice_port2', type=int, default=6911)
     parser.add_argument('--migrate_port', dest='migrate_port', type=int, default=8000)
     parser.add_argument('--client_count', dest='client_count', type=int, default=1)
-    parser.add_argument('--qemu', dest='qemu', default='../../qemu/x86_64-softmmu/qemu-system-x86_64')
+    parser.add_argument('--qemu', dest='qemu', default='qemu-system-x86_64')
     parser.add_argument('--log_filename', dest='log_filename', default='migrate.log')
     parser.add_argument('--image', dest='image', default='')
-    parser.add_argument('--client', dest='client', default='spicy', choices=['spicec', 'spicy'])
+    parser.add_argument('--client', dest='client', default='spicy')
     parser.add_argument('--vdagent', choices=['on', 'off'], default='on')
     parser.add_argument('--usbtablet', choices=['on', 'off'], default='on')
     parser.add_argument('--secure', choices=['on', 'off'], default='off')
@@ -70,6 +70,12 @@ def get_args():
     if not os.path.exists(args.qemu_exec):
         print "qemu not found (qemu = %r)" % args.qemu_exec
         sys.exit(1)
+    orig_client = args.client
+    if not os.path.exists(args.client):
+        args.client = os.popen('which %s' % args.client).read().strip()
+    if not os.path.exists(args.client):
+        print "client %r not found" % orig_client
+        sys.exit(1)
     print "qemu = %s" % args.qemu_exec
     return args