Re: [PATCH v2 07/22] tests/qtest/migration: Rename migration-helpers.c

[Peter Xu <peterx@redhat.com>]

On Wed, Nov 13, 2024 at 04:46:15PM -0300, Fabiano Rosas wrote:
> Rename migration-helpers.c to migration-util.c to make its purpose
> more explicit and avoid the "helper" terminology.
> 
> Move the file to the qtest/migration/ directory along with the rest of
> the migration files.
> 
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
>  tests/qtest/meson.build                                  | 4 ++--
>  tests/qtest/migration-test.c                             | 2 +-
>  tests/qtest/migration/migration-qmp.c                    | 2 +-
>  tests/qtest/migration/migration-qmp.h                    | 2 ++
>  .../{migration-helpers.c => migration/migration-util.c}  | 4 ++--
>  .../{migration-helpers.h => migration/migration-util.h}  | 9 ++++++---
>  tests/qtest/virtio-net-failover.c                        | 2 +-
>  7 files changed, 15 insertions(+), 10 deletions(-)
>  rename tests/qtest/{migration-helpers.c => migration/migration-util.c} (99%)
>  rename tests/qtest/{migration-helpers.h => migration/migration-util.h} (89%)
> 
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index ca199b9491..b9f70ac32f 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -331,9 +331,9 @@ endif
>  tpmemu_files = ['tpm-emu.c', 'tpm-util.c', 'tpm-tests.c']
>  
>  migration_files = [files(
> -  'migration-helpers.c',
>    'migration/bootfile.c',
>    'migration/migration-qmp.c',
> +  'migration/migration-util.c',
>  )]
>  
>  if gnutls.found()
> @@ -347,7 +347,7 @@ endif
>  qtests = {
>    'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'],
>    'cdrom-test': files('boot-sector.c'),
> -  'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1,
> +  'dbus-vmstate-test': files('migration/migration-qmp.c', 'migration/migration-util.c') + dbus_vmstate1,

Seems like the -qmp.c part should belong to previous patch.

>    'erst-test': files('erst-test.c'),
>    'ivshmem-test': [rt, '../../contrib/ivshmem-server/ivshmem-server.c'],
>    'migration-test': migration_files,
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index a0c63026ed..59f02f7815 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -22,9 +22,9 @@
>  #include "crypto/tlscredspsk.h"
>  #include "ppc-util.h"
>  
> -#include "migration-helpers.h"
>  #include "migration/bootfile.h"
>  #include "migration/migration-qmp.h"
> +#include "migration/migration-util.h"
>  #ifdef CONFIG_GNUTLS
>  # include "tests/unit/crypto-tls-psk-helpers.h"
>  # ifdef CONFIG_TASN1
> diff --git a/tests/qtest/migration/migration-qmp.c b/tests/qtest/migration/migration-qmp.c
> index 20be46fdf6..71b14b51b2 100644
> --- a/tests/qtest/migration/migration-qmp.c
> +++ b/tests/qtest/migration/migration-qmp.c
> @@ -12,8 +12,8 @@
>  
>  #include "qemu/osdep.h"
>  #include "libqtest.h"
> -#include "migration-helpers.h"
>  #include "migration-qmp.h"
> +#include "migration-util.h"
>  #include "qapi/error.h"
>  #include "qapi/qmp/qdict.h"
>  #include "qapi/qmp/qjson.h"
> diff --git a/tests/qtest/migration/migration-qmp.h b/tests/qtest/migration/migration-qmp.h
> index ed927cf408..caaa78722a 100644
> --- a/tests/qtest/migration/migration-qmp.h
> +++ b/tests/qtest/migration/migration-qmp.h
> @@ -2,6 +2,8 @@
>  #ifndef MIGRATION_QMP_H
>  #define MIGRATION_QMP_H
>  
> +#include "migration-util.h"
> +
>  G_GNUC_PRINTF(4, 5)
>  void migrate_qmp_fail(QTestState *who, const char *uri,
>                        const char *channels, const char *fmt, ...);
> diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration/migration-util.c
> similarity index 99%
> rename from tests/qtest/migration-helpers.c
> rename to tests/qtest/migration/migration-util.c
> index 218ee4e59f..8a974ded22 100644
> --- a/tests/qtest/migration-helpers.c
> +++ b/tests/qtest/migration/migration-util.c
> @@ -1,5 +1,5 @@
>  /*
> - * QTest migration helpers
> + * QTest migration utilities
>   *
>   * Copyright (c) 2016-2018 Red Hat, Inc. and/or its affiliates
>   *   based on the vhost-user-test.c that is:
> @@ -19,8 +19,8 @@
>  #include "qemu/cutils.h"
>  #include "qemu/memalign.h"
>  
> -#include "migration-helpers.h"
>  #include "migration/bootfile.h"
> +#include "migration/migration-util.h"
>  
>  static char *SocketAddress_to_str(SocketAddress *addr)
>  {
> diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration/migration-util.h
> similarity index 89%
> rename from tests/qtest/migration-helpers.h
> rename to tests/qtest/migration/migration-util.h
> index 2cb1f78d9e..de1bc0ad0c 100644
> --- a/tests/qtest/migration-helpers.h
> +++ b/tests/qtest/migration/migration-util.h
> @@ -10,11 +10,14 @@
>   *
>   */
>  
> -#ifndef MIGRATION_HELPERS_H
> -#define MIGRATION_HELPERS_H
> +#ifndef MIGRATION_UTIL_H
> +#define MIGRATION_UTIL_H
>  
>  #include "libqtest.h"
>  
> +#define QEMU_ENV_SRC "QTEST_QEMU_BINARY_SRC"
> +#define QEMU_ENV_DST "QTEST_QEMU_BINARY_DST"

Are these re-defined in migration-test.c?

> +
>  typedef struct QTestMigrationState {
>      bool stop_seen;
>      bool resume_seen;
> @@ -51,4 +54,4 @@ void migration_test_add(const char *path, void (*fn)(void));
>  char *migrate_get_connect_uri(QTestState *who);
>  void migrate_set_ports(QTestState *to, QList *channel_list);
>  
> -#endif /* MIGRATION_HELPERS_H */
> +#endif /* MIGRATION_UTIL_H */
> diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-failover.c
> index 28a6147d9a..08365ffa11 100644
> --- a/tests/qtest/virtio-net-failover.c
> +++ b/tests/qtest/virtio-net-failover.c
> @@ -11,8 +11,8 @@
>  #include "libqtest.h"
>  #include "libqos/pci.h"
>  #include "libqos/pci-pc.h"
> -#include "migration-helpers.h"
>  #include "migration/migration-qmp.h"
> +#include "migration/migration-util.h"
>  #include "qapi/qmp/qdict.h"
>  #include "qapi/qmp/qlist.h"
>  #include "qapi/qmp/qjson.h"
> -- 
> 2.35.3
> 

-- 
Peter Xu