[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/12] tests/qtest: Use qtest_add_data_func_full()
From: |
Thomas Huth |
Subject: |
[PULL 03/12] tests/qtest: Use qtest_add_data_func_full() |
Date: |
Tue, 2 Jul 2024 12:33:01 +0200 |
From: Akihiko Odaki <akihiko.odaki@daynix.com>
A test function may not be executed depending on the test command line
so it is wrong to free data with a test function. Use
qtest_add_data_func_full() to register a function to free data.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-ID: <20240627-san-v2-10-750bb0946dbd@daynix.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/device-introspect-test.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tests/qtest/device-introspect-test.c
b/tests/qtest/device-introspect-test.c
index 5b0ffe43f5..587da59623 100644
--- a/tests/qtest/device-introspect-test.c
+++ b/tests/qtest/device-introspect-test.c
@@ -266,7 +266,6 @@ static void test_device_intro_concrete(const void *args)
qobject_unref(types);
qtest_quit(qts);
- g_free((void *)args);
}
static void test_abstract_interfaces(void)
@@ -310,12 +309,12 @@ static void add_machine_test_case(const char *mname)
path = g_strdup_printf("device/introspect/concrete/defaults/%s", mname);
args = g_strdup_printf("-M %s", mname);
- qtest_add_data_func(path, args, test_device_intro_concrete);
+ qtest_add_data_func_full(path, args, test_device_intro_concrete, g_free);
g_free(path);
path = g_strdup_printf("device/introspect/concrete/nodefaults/%s", mname);
args = g_strdup_printf("-nodefaults -M %s", mname);
- qtest_add_data_func(path, args, test_device_intro_concrete);
+ qtest_add_data_func_full(path, args, test_device_intro_concrete, g_free);
g_free(path);
}
@@ -330,7 +329,7 @@ int main(int argc, char **argv)
qtest_add_func("device/introspect/abstract-interfaces",
test_abstract_interfaces);
if (g_test_quick()) {
qtest_add_data_func("device/introspect/concrete/defaults/none",
- g_strdup(common_args), test_device_intro_concrete);
+ common_args, test_device_intro_concrete);
} else {
qtest_cb_for_every_machine(add_machine_test_case, true);
}
--
2.45.2
- [PULL 00/12] qtest, s390x, avocado and doc patches, Thomas Huth, 2024/07/02
- [PULL 04/12] tests/qtest: Free unused QMP response, Thomas Huth, 2024/07/02
- [PULL 03/12] tests/qtest: Use qtest_add_data_func_full(),
Thomas Huth <=
- [PULL 05/12] tests/qtest: Free old machine variable name, Thomas Huth, 2024/07/02
- [PULL 06/12] tests/qtest: Free paths, Thomas Huth, 2024/07/02
- [PULL 07/12] tests/qtest: Free GThread, Thomas Huth, 2024/07/02
- [PULL 08/12] docs: add precision about capstone for execlog plugin, Thomas Huth, 2024/07/02
- [PULL 09/12] hw/s390x: Attach default virtio-net devices to the /machine/virtual-css-bridge, Thomas Huth, 2024/07/02
- [PULL 11/12] .travis.yml: Install python3-tomli in all build jobs, Thomas Huth, 2024/07/02
- [PULL 10/12] tests/avocado: add hotplug_blk test, Thomas Huth, 2024/07/02
- [PULL 12/12] pc-bios/s390-ccw: Remove duplicated LDFLAGS, Thomas Huth, 2024/07/02
- Re: [PULL 00/12] qtest, s390x, avocado and doc patches, Richard Henderson, 2024/07/03