[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v8 01/12] tests/vm: pass args through to BaseVM's __init__
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v8 01/12] tests/vm: pass args through to BaseVM's __init__ |
Date: |
Sun, 31 May 2020 12:29:51 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 |
On 5/29/20 10:34 PM, Robert Foley wrote:
> 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>
> ---
> tests/vm/basevm.py | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
> index a2d4054d72..fbefda0595 100644
> --- a/tests/vm/basevm.py
> +++ b/tests/vm/basevm.py
> @@ -61,9 +61,9 @@ class BaseVM(object):
> # 4 is arbitrary, but greater than 2,
> # since we found we need to wait more than twice as long.
> tcg_ssh_timeout_multiplier = 4
> - def __init__(self, debug=False, vcpus=None, genisoimage=None):
> + def __init__(self, args):
> self._guest = None
> - self._genisoimage = genisoimage
> + self._genisoimage = args.genisoimage
> self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
> suffix=".tmp",
> dir="."))
> @@ -76,7 +76,7 @@ class BaseVM(object):
> self._ssh_pub_key_file = os.path.join(self._tmpdir, "id_rsa.pub")
> open(self._ssh_pub_key_file, "w").write(SSH_PUB_KEY)
>
> - self.debug = debug
> + self.debug = args.debug
> self._stderr = sys.stderr
> self._devnull = open(os.devnull, "w")
> if self.debug:
> @@ -90,8 +90,8 @@ class BaseVM(object):
> (",ipv6=no" if not self.ipv6 else ""),
> "-device", "virtio-net-pci,netdev=vnet",
> "-vnc", "127.0.0.1:0,to=20"]
> - if vcpus and vcpus > 1:
> - self._args += ["-smp", "%d" % vcpus]
> + if args.jobs and args.jobs > 1:
> + self._args += ["-smp", "%d" % args.jobs]
> if kvm_available(self.arch):
> self._args += ["-enable-kvm"]
> else:
> @@ -438,8 +438,7 @@ def main(vmcls):
> return 1
> logging.basicConfig(level=(logging.DEBUG if args.debug
> else logging.WARN))
> - vm = vmcls(debug=args.debug, vcpus=args.jobs,
> - genisoimage=args.genisoimage)
> + vm = vmcls(args)
> if args.build_image:
> if os.path.exists(args.image) and not args.force:
> sys.stderr.writelines(["Image file exists: %s\n" %
> args.image,
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
- [PATCH v8 00/12] tests/vm: Add support for aarch64 VMs, Robert Foley, 2020/05/29
- [PATCH v8 01/12] tests/vm: pass args through to BaseVM's __init__, Robert Foley, 2020/05/29
- Re: [PATCH v8 01/12] tests/vm: pass args through to BaseVM's __init__,
Philippe Mathieu-Daudé <=
- [PATCH v8 02/12] tests/vm: Add configuration to basevm.py, Robert Foley, 2020/05/29
- [PATCH v8 03/12] tests/vm: Added configuration file support, Robert Foley, 2020/05/29
- [PATCH v8 04/12] tests/vm: Pass --debug through for vm-boot-ssh., Robert Foley, 2020/05/29
- [PATCH v8 05/12] tests/vm: Add ability to select QEMU from current build., Robert Foley, 2020/05/29
- [PATCH v8 06/12] tests/vm: allow wait_ssh() to specify command, Robert Foley, 2020/05/29
- [PATCH v8 07/12] tests/vm: Add common Ubuntu python module, Robert Foley, 2020/05/29
- [PATCH v8 08/12] tests/vm: Added a new script for ubuntu.aarch64., Robert Foley, 2020/05/29