SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/vm: pass args through to BaseVM's __init__

Browse Source 
Adding the args parameter to BaseVM's __init__.
We will shortly need to pass more parameters to the class
so let's just pass args rather than growing the parameter list.

Signed-off-by: Robert Foley <robert.foley@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200601211421.1277-2-robert.foley@linaro.org>
Message-Id: <20200701135652.1366-6-alex.bennee@linaro.org>
This commit is contained in:
Robert Foley 2020-07-01 14:56:17 +01:00 committed by Alex Bennée
parent 995f5c3c32
commit 1f335d18e5
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/vm/basevm.py
View File

@ -61,11 +61,10 @@ class BaseVM(object):
# 4 is arbitrary, but greater than 2, # 4 is arbitrary, but greater than 2,
# since we found we need to wait more than twice as long. # since we found we need to wait more than twice as long.
tcg_ssh_timeout_multiplier = 4 tcg_ssh_timeout_multiplier = 4
def __init__(self, debug=False, vcpus=None, genisoimage=None, def __init__(self, args):
build_path=None):
self._guest = None self._guest = None
self._genisoimage = genisoimage self._genisoimage = args.genisoimage
self._build_path = build_path self._build_path = args.build_path
self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-", self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
suffix=".tmp", suffix=".tmp",
dir=".")) dir="."))
@ -78,7 +77,7 @@ class BaseVM(object):
self._ssh_pub_key_file = os.path.join(self._tmpdir, "id_rsa.pub") self._ssh_pub_key_file = os.path.join(self._tmpdir, "id_rsa.pub")
open(self._ssh_pub_key_file, "w").write(SSH_PUB_KEY) open(self._ssh_pub_key_file, "w").write(SSH_PUB_KEY)
self.debug = debug self.debug = args.debug
self._stderr = sys.stderr self._stderr = sys.stderr
self._devnull = open(os.devnull, "w") self._devnull = open(os.devnull, "w")
if self.debug: if self.debug:
@ -92,8 +91,8 @@ class BaseVM(object):
(",ipv6=no" if not self.ipv6 else ""), (",ipv6=no" if not self.ipv6 else ""),
"-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"]
if vcpus and vcpus > 1: if args.jobs and args.jobs > 1:
self._args += ["-smp", "%d" % vcpus] self._args += ["-smp", "%d" % args.jobs]
if kvm_available(self.arch): if kvm_available(self.arch):
self._args += ["-enable-kvm"] self._args += ["-enable-kvm"]
else: else:
@ -456,8 +455,7 @@ def main(vmcls):
return 1 return 1
logging.basicConfig(level=(logging.DEBUG if args.debug logging.basicConfig(level=(logging.DEBUG if args.debug
else logging.WARN)) else logging.WARN))
vm = vmcls(debug=args.debug, vcpus=args.jobs, vm = vmcls(args)
genisoimage=args.genisoimage, build_path=args.build_path)
if args.build_image: if args.build_image:
if os.path.exists(args.image) and not args.force: if os.path.exists(args.image) and not args.force:
sys.stderr.writelines(["Image file exists: %s\n" % args.image, sys.stderr.writelines(["Image file exists: %s\n" % args.image,