test-char: Destroy chardev correctly at char_file_test_internal()
commit1e419ee68f
("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:1e419ee68f
("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>
This commit is contained in:
parent
facf7c60ee
commit
08bdf5d44f
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user