Re: [PATCH v6 1/9] tests/vm: Add configuration to basevm.py

[Robert Foley <robert.foley@linaro.org>]

On Fri, 15 May 2020 at 13:23, Alex Bennée <alex.bennee@linaro.org> wrote:
>
>
> Robert Foley <robert.foley@linaro.org> writes:
>
> > Added use of a configuration to tests/vm/basevm.py.
> > The configuration provides parameters used to configure a VM.
> > This allows for providing alternate configurations to the VM being
> > created/launched. cpu, machine, memory, and NUMA configuration are all
> > examples of configuration which we might want to vary on the VM being created
> > or launched.
> > This will for example allow for creating an aarch64 vm.
> >
> > Signed-off-by: Robert Foley <robert.foley@linaro.org>
> > Reviewed-by: Peter Puhov <peter.puhov@linaro.org>
> <snip>
> > @@ -61,19 +86,30 @@ 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):
> > +    def __init__(self, debug=False, vcpus=None, config=None):
> >          self._guest = None
> <snip>
> >                                     else logging.WARN))
> > -        vm = vmcls(debug=args.debug, vcpus=args.jobs)
> > +        vm = vmcls(debug=args.debug, vcpus=args.jobs, config=config)
>
> Given the number of times I've just had to fix merge failures with the
> patches I've just sent I wonder if we should just pass args as a while
> to vmcls and be done with it?

Great point !
I have also noticed the tendency for merge conflicts when changing the
vmcls params.
It makes good sense to pass the args through to vmcls.

Will add this change.

Thanks & Regards,
-Rob
>
> >          if args.build_image:
> >              if os.path.exists(args.image) and not args.force:
> >                  sys.stderr.writelines(["Image file exists: %s\n" % args.image,
>
>
> --
> Alex Bennée