On Tue, Nov 05, 2024 at 03:08:25PM -0300, Fabiano Rosas wrote:
> We currently have some environment validation to perform and flags to
> set during the initialization of the tests. To be able to add more
> migration test binaries, we'll need these tasks to be in their own
> function so they can be called from more than one place.
>
> Move the initialization code to a function and introduce the
> MigrationTestEnv structure to hold the flags that are accessed during
> test registration.
>
> Make the env object static to avoid have to change all the code to
> pass it around. Similarly with the tmpfs variable, which is used
> extensively.
>
> Note: I'm keeping the new functions in migration-test.c because they
> are going to be moved in the next patch to the correct place.
>
> Signed-off-by: Fabiano Rosas <[email protected]>
> ---
> tests/qtest/migration-test.c | 103 ++++++++++++++++---------
> tests/qtest/migration/migration-util.c | 1 -
> tests/qtest/migration/migration-util.h | 4 +-
> 3 files changed, 69 insertions(+), 39 deletions(-)
> diff --git a/tests/qtest/migration/migration-util.c
> b/tests/qtest/migration/migration-util.c
> index 858a6c9830..6874a7ad40 100644
> --- a/tests/qtest/migration/migration-util.c
> +++ b/tests/qtest/migration/migration-util.c
> @@ -18,7 +18,6 @@
> #include "qapi/qmp/qlist.h"
> #include "qemu/cutils.h"
> #include "qemu/memalign.h"
> -
> #include "migration/bootfile.h"
> #include "migration/migration-util.h"
>
Squash this into the earlier patch which added the redundant blank line
> diff --git a/tests/qtest/migration/migration-util.h
> b/tests/qtest/migration/migration-util.h
> index ef94a6be02..e94d30a293 100644
> --- a/tests/qtest/migration/migration-util.h
> +++ b/tests/qtest/migration/migration-util.h
> @@ -29,6 +29,7 @@ typedef struct MigrationTestEnv {
> bool has_kvm;
> bool has_tcg;
> bool has_uffd;
> + bool uffd_feature_thread_id;
> bool has_dirty_ring;
> bool is_x86;
> const char *arch;
> @@ -39,9 +40,6 @@ typedef struct MigrationTestEnv {
>
> /* migration-util.c */
>
> -void migration_env_init(MigrationTestEnv *env);
> -int migration_env_clean(MigrationTestEnv *env);
Removing the decl of these two functions, but this patch isn't
removing their impl. Guess this is supposed to be in a different
patch in the series ?
> -
> bool migrate_watch_for_events(QTestState *who, const char *name,
> QDict *event, void *opaque);
>
> --
> 2.35.3
>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
