Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-09-26 15:17:05 +02:00
commit f3596767c1
2 files changed
+3 -2

No files matched your search

+2 -1
View File
@@ -483,7 +483,8 @@ def test_build_command_kvm_2_4(linux_platform, vm, loop, fake_qemu_binary, port_
"-smp",
"cpus=1",
"-enable-kvm",
"-machine smm=off",
"-machine",
"smm=off",
"-boot",
"order=c",
"-serial",