aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabiano Rosas <farosas@suse.de>2024-11-27 15:28:50 -0300
committerFabiano Rosas <farosas@suse.de>2024-12-12 10:25:40 -0300
commitb7d7f723a9853a68a648075a1f2ab96d410e929e (patch)
treec2e6f8ed39049c965bc4e4dc381b948ac765f52a
parente6c5704043f0cdb3ce567b74d73a99c79457e3e6 (diff)
downloadqemu-b7d7f723a9853a68a648075a1f2ab96d410e929e.zip
qemu-b7d7f723a9853a68a648075a1f2ab96d410e929e.tar.gz
qemu-b7d7f723a9853a68a648075a1f2ab96d410e929e.tar.bz2
tests/qtest/migration: Rename migration-helpers.c
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>
-rw-r--r--tests/qtest/meson.build4
-rw-r--r--tests/qtest/migration-test.c2
-rw-r--r--tests/qtest/migration/migration-qmp.c2
-rw-r--r--tests/qtest/migration/migration-qmp.h2
-rw-r--r--tests/qtest/migration/migration-util.c (renamed from tests/qtest/migration-helpers.c)4
-rw-r--r--tests/qtest/migration/migration-util.h (renamed from tests/qtest/migration-helpers.h)6
-rw-r--r--tests/qtest/virtio-net-failover.c2
7 files changed, 12 insertions, 10 deletions
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 0b113ad..ec809af 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -333,9 +333,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()
@@ -350,7 +350,7 @@ 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/migration-qmp.c',
- 'migration-helpers.c') + dbus_vmstate1,
+ 'migration/migration-util.c') + dbus_vmstate1,
'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 489fca7..e295bd3 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 20be46f..71b14b5 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 ed927cf..caaa787 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
index 218ee4e..8a974de 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
index 2cb1f78..0fa3676 100644
--- a/tests/qtest/migration-helpers.h
+++ b/tests/qtest/migration/migration-util.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef MIGRATION_HELPERS_H
-#define MIGRATION_HELPERS_H
+#ifndef MIGRATION_UTIL_H
+#define MIGRATION_UTIL_H
#include "libqtest.h"
@@ -51,4 +51,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 28a6147..08365ff 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"