Commit dcf7ea4a authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Fam Zheng
Browse files

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: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180628153535.1411-4-f4bug@amsat.org>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent 38441756

tests/vm/basevm.py

+2 −1
Original line number Diff line number Diff line
@@ -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):