From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: Akihiko Odaki <akihiko.odaki@daynix.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Subject: [PULL 03/12] tests/qtest: Use qtest_add_data_func_full()
Date: Tue, 2 Jul 2024 12:33:01 +0200 [thread overview]
Message-ID: <20240702103310.347201-4-thuth@redhat.com> (raw)
In-Reply-To: <20240702103310.347201-1-thuth@redhat.com>
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
next prev parent reply other threads:[~2024-07-02 10:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-02 10:32 [PULL 00/12] qtest, s390x, avocado and doc patches Thomas Huth
2024-07-02 10:32 ` [PULL 01/12] hw/intc/s390_flic: Fix interrupt controller migration on s390x with TCG Thomas Huth
2024-07-02 10:33 ` [PULL 02/12] tests/qtest/migration-test: enable " Thomas Huth
2024-07-04 11:20 ` Nicholas Piggin
2024-07-04 11:48 ` Thomas Huth
2024-07-05 0:11 ` Nicholas Piggin
2024-07-02 10:33 ` Thomas Huth [this message]
2024-07-02 10:33 ` [PULL 04/12] tests/qtest: Free unused QMP response Thomas Huth
2024-07-02 10:33 ` [PULL 05/12] tests/qtest: Free old machine variable name Thomas Huth
2024-07-02 10:33 ` [PULL 06/12] tests/qtest: Free paths Thomas Huth
2024-07-02 10:33 ` [PULL 07/12] tests/qtest: Free GThread Thomas Huth
2024-07-02 10:33 ` [PULL 08/12] docs: add precision about capstone for execlog plugin Thomas Huth
2024-07-02 10:33 ` [PULL 09/12] hw/s390x: Attach default virtio-net devices to the /machine/virtual-css-bridge Thomas Huth
2024-07-02 10:33 ` [PULL 10/12] tests/avocado: add hotplug_blk test Thomas Huth
2024-07-02 10:33 ` [PULL 11/12] .travis.yml: Install python3-tomli in all build jobs Thomas Huth
2024-07-02 10:33 ` [PULL 12/12] pc-bios/s390-ccw: Remove duplicated LDFLAGS Thomas Huth
2024-07-03 4:46 ` [PULL 00/12] qtest, s390x, avocado and doc patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240702103310.347201-4-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=akihiko.odaki@daynix.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).