Re: [PATCH v3 03/17] tests/migration: Disambiguate guestperf vs. a-b

[Peter Xu]

On Fri, Nov 29, 2024 at 10:19:36AM -0300, Fabiano Rosas wrote:
> Fabiano Rosas <farosas@suse.de> writes:
> 
> > The current build structure for migration tests is confusing. There is
> > the tests/migration directory, which contains two different guest code
> > implementations, one for the qtests (a-b-{bootblock|kernel}.S) and
> > another for the guestperf script (stress.c). One uses a Makefile,
> > while the other uses meson.
> >
> > The next patches will add a new qtests/migration/ directory to hold
> > qtest code which will make the situation even more confusing.
> >
> > Move the guest code used by qtests into a new qtests/migration/
> > directory and rename the old one to tests/migration-stress.
> >
> > Reviewed-by: Peter Xu <peterx@redhat.com>
> > Signed-off-by: Fabiano Rosas <farosas@suse.de>
> 
> Please squash this in:
> 
> -->8--
> From 9f8a693e31be198e1e052d86be99ffaaa0a3e8a8 Mon Sep 17 00:00:00 2001
> From: Fabiano Rosas <farosas@suse.de>
> Date: Fri, 29 Nov 2024 10:05:21 -0300
> Subject: [PATCH] fixup! tests/migration: Disambiguate guestperf vs. a-b
> 
> ---
>  tests/migration-stress/guestperf/shell.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/migration-stress/guestperf/shell.py 
> b/tests/migration-stress/guestperf/shell.py
> index c85d89efec..046afeb84e 100644
> --- a/tests/migration-stress/guestperf/shell.py
> +++ b/tests/migration-stress/guestperf/shell.py
> @@ -46,7 +46,8 @@ def __init__(self):
>          parser.add_argument("--binary", dest="binary", 
> default="/usr/bin/qemu-system-x86_64")
>          parser.add_argument("--dst-host", dest="dst_host", 
> default="localhost")
>          parser.add_argument("--kernel", dest="kernel", 
> default="/boot/vmlinuz-%s" % platform.release())
> -        parser.add_argument("--initrd", dest="initrd", 
> default="tests/migration/initrd-stress.img")
> +        parser.add_argument("--initrd", dest="initrd",
> +                            
> default="tests/migration-stress/initrd-stress.img")
>          parser.add_argument("--transport", dest="transport", default="unix")

Queued for 10.0 and squashed this in.

-- 
Peter Xu