From 8225bad76b1e3ce9ea69b29524c8e3d8e2e400a4 Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@duponchelle.info>
Date: Thu, 14 Jan 2016 17:40:58 +0100
Subject: [PATCH] Fix usage of qemu 0.10 on Windows

Fix #392
---
 gns3server/modules/qemu/qemu_vm.py |  6 +++++-
 tests/modules/qemu/test_qemu_vm.py | 13 +++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/gns3server/modules/qemu/qemu_vm.py b/gns3server/modules/qemu/qemu_vm.py
index 077d7469..24cbd41b 100644
--- a/gns3server/modules/qemu/qemu_vm.py
+++ b/gns3server/modules/qemu/qemu_vm.py
@@ -157,7 +157,11 @@ class QemuVM(BaseVM):
         else:
             qemu_bin = os.path.basename(qemu_path)
             qemu_bin = re.sub(r'(w)?\.(exe|EXE)$', '', qemu_bin)
-            self._platform = re.sub(r'^qemu-system-(.*)$', r'\1', qemu_bin, re.IGNORECASE)
+            # Old version of GNS3 provide a binary named qemu.exe
+            if qemu_bin == "qemu":
+                self._platform = "i386"
+            else:
+                self._platform = re.sub(r'^qemu-system-(.*)$', r'\1', qemu_bin, re.IGNORECASE)
         if self._platform.split(".")[0] not in QEMU_PLATFORMS:
             raise QemuError("Platform {} is unknown".format(self._platform))
         log.info('QEMU VM "{name}" [{id}] has set the QEMU path to {qemu_path}'.format(name=self._name,
diff --git a/tests/modules/qemu/test_qemu_vm.py b/tests/modules/qemu/test_qemu_vm.py
index ca1b3b2b..d047270b 100644
--- a/tests/modules/qemu/test_qemu_vm.py
+++ b/tests/modules/qemu/test_qemu_vm.py
@@ -258,6 +258,19 @@ def test_set_qemu_path_windows(vm, tmpdir):
     assert vm.platform == "x86_64"
 
 
+def test_set_qemu_path_old_windows(vm, tmpdir):
+
+    bin_path = os.path.join(os.environ["PATH"], "qemu.exe")
+    open(bin_path, "w+").close()
+    os.chmod(bin_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
+
+    vm.qemu_path = bin_path
+
+    assert vm.qemu_path == bin_path
+    assert vm.platform == "i386"
+
+
+
 @pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
 def test_set_qemu_path_kvm_binary(vm, tmpdir, fake_qemu_binary):