diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2018-06-28 12:35:34 -0300 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2018-08-15 10:12:35 +0800 |
| commit | dcf7ea4a78b10575dcc032e0356233ab3a95e7d2 (patch) | |
| tree | d346f66540a6634ff30ffdaf6f39842dcb61c220 /tests/vm | |
| parent | 38441756b70eec5807b5f60dad11a93a91199866 (diff) | |
tests/vm: Only use -cpu 'host' if KVM is available
If KVM is not available, then use the 'max' cpu.
This fixes:
ERROR:root:Log:
ERROR:root:qemu-system-x86_64: CPU model 'host' requires KVM
Failed to prepare guest environment
error: [Errno 104] Connection reset by peer
source/qemu/tests/vm/Makefile.include:25: recipe for target 'tests/vm/ubuntu.i386.img' failed
make: *** [tests/vm/ubuntu.i386.img] Error 2
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180628153535.1411-4-f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/vm')
| -rwxr-xr-x | tests/vm/basevm.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 3643117816..d80cc8ab85 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -65,7 +65,6 @@ class BaseVM(object): self._stdout = self._devnull self._args = [ \ "-nodefaults", "-m", "2G", - "-cpu", "host", "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22", "-device", "virtio-net-pci,netdev=vnet", "-vnc", "127.0.0.1:0,to=20", @@ -73,9 +72,11 @@ class BaseVM(object): if vcpus: self._args += ["-smp", str(vcpus)] if os.access("/dev/kvm", os.R_OK | os.W_OK): + self._args += ["-cpu", "host"] self._args += ["-enable-kvm"] else: logging.info("KVM not available, not using -enable-kvm") + self._args += ["-cpu", "max"] self._data_args = [] def _download_with_cache(self, url, sha256sum=None): |