aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2020-12-15 17:41:32 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2021-01-02 21:03:09 +0100
commit08bdf5d44f999c92399ff73df00f2ea2c7ee04bd (patch)
treeb50c8b6201c80fe66212de729e7c4a6ad027f2a9 /tests
parentfacf7c60ee60aab7d73b204ee8c86b90fbc6b3db (diff)
downloadqemu-08bdf5d44f999c92399ff73df00f2ea2c7ee04bd.zip
qemu-08bdf5d44f999c92399ff73df00f2ea2c7ee04bd.tar.gz
qemu-08bdf5d44f999c92399ff73df00f2ea2c7ee04bd.tar.bz2
test-char: Destroy chardev correctly at char_file_test_internal()
commit 1e419ee68fa5 ("chardev: generate an internal id when none given") changed the reference ownership semantics of qemu_chardev_new(NULL, ...): now all chardevs created using qemu_chardev_new() are added to the /chardevs QOM container, and the caller does not own a reference to the newly created object. However, the code at char_file_test_internal() had not been updated and was calling object_unref() on a chardev object it didn't own. This makes the chardev be destroyed, but leaves a dangling pointer in the /chardev container children list, and seems to be the cause of the following char_serial_test() crash: Unexpected error in object_property_try_add() at ../qom/object.c:1220: \ attempt to add duplicate property 'serial-id' to object (type 'container') ERROR test-char - too few tests run (expected 38, got 9) Update the code to use object_unparent() at the end of char_file_test_internal(), to make sure the chardev will be correctly removed from the QOM tree. Fixes: 1e419ee68fa5 ("chardev: generate an internal id when none given") Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20201215224133.3545901-2-ehabkost@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/test-char.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-char.c b/tests/test-char.c
index 953e0d1..0610297 100644
--- a/tests/test-char.c
+++ b/tests/test-char.c
@@ -1298,7 +1298,7 @@ static void char_file_test_internal(Chardev *ext_chr, const char *filepath)
g_assert(strncmp(contents, "hello!", 6) == 0);
if (!ext_chr) {
- object_unref(OBJECT(chr));
+ object_unparent(OBJECT(chr));
g_unlink(out);
}
g_free(contents);