Merge branch 'master' into 1.5

tests/modules/qemu/test_qemu_vm.py

@@ -258,6 +258,18 @@ 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):