[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/17] tests/vm: Only use -cpu 'host' if KVM is avail
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 01/17] tests/vm: Only use -cpu 'host' if KVM is available |
Date: |
Wed, 15 Aug 2018 11:12:32 +0800 |
From: Philippe Mathieu-Daudé <address@hidden>
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é <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
tests/vm/basevm.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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):
--
2.17.1
- [Qemu-devel] [PULL 00/17] Block and testing patches, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 01/17] tests/vm: Only use -cpu 'host' if KVM is available,
Fam Zheng <=
- [Qemu-devel] [PULL 02/17] tests/vm: Add flex and bison to the vm image, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 05/17] aio-posix: Don't count ctx->notifier as progress when polling, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 04/17] nvme: simplify plug/unplug, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 03/17] nvme: Fix nvme_init error handling, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 06/17] aio: Do aio_notify_accept only during blocking aio_poll, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 09/17] tests: Allow overriding archive path with SRC_ARCHIVE, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 10/17] tests: Add centos VM testing, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 08/17] tests: Add an option for snapshot (default: off), Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 13/17] tests/vm: Propagate V=1 down into the make inside the VM, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 11/17] tests: vm: Add vm-clean-all, Fam Zheng, 2018/08/14