mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/vm: Use -cpu max rather than -cpu host

Browse Source 
-cpu max works with any accelerator, so we don't need
to use it only conditionally if not using KVM. Just use
it all the time.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20180820155554.23476-1-peter.maydell@linaro.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Peter Maydell 2018-08-20 16:55:54 +01:00 committed by Fam Zheng
parent cfeb35d677
commit b33bd859d1
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/vm/basevm.py
View File

@ -65,6 +65,7 @@ class BaseVM(object):
self._stdout = self._devnull self._stdout = self._devnull
self._args = [ \ self._args = [ \
"-nodefaults", "-m", "4G", "-nodefaults", "-m", "4G",
"-cpu", "max",
"-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22", "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22",
"-device", "virtio-net-pci,netdev=vnet", "-device", "virtio-net-pci,netdev=vnet",
"-vnc", "127.0.0.1:0,to=20", "-vnc", "127.0.0.1:0,to=20",
@ -72,11 +73,9 @@ class BaseVM(object):
if vcpus: if vcpus:
self._args += ["-smp", str(vcpus)] self._args += ["-smp", str(vcpus)]
if os.access("/dev/kvm", os.R_OK | os.W_OK): if os.access("/dev/kvm", os.R_OK | os.W_OK):
self._args += ["-cpu", "host"]
self._args += ["-enable-kvm"] self._args += ["-enable-kvm"]
else: else:
logging.info("KVM not available, not using -enable-kvm") logging.info("KVM not available, not using -enable-kvm")
self._args += ["-cpu", "max"]
self._data_args = [] self._data_args = []
def _download_with_cache(self, url, sha256sum=None): def _download_with_cache(self, url, sha256sum=None):