Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

versal: use object_declare_type where possible #22

Merged
merged 2 commits into from
Dec 10, 2024

Conversation

ho28
Copy link
Collaborator

@ho28 ho28 commented Dec 10, 2024

This is a follow-up change to make sure OBJECT_DECLARE_TYPE is used where possible in the versal device models recently added.

ho28 added 2 commits December 10, 2024 16:47
As part of moving the device implementations for LPD INT CSR,
LPD SLCR, and PMC INT CSR from Xilinx QEMU to stable 9.1, some
of the device models need to be migrated to use the modern QOM
templates for device structures. This eliminates the use of
OBJECT_CHECK in favor of the OBJECT_DECLARE_TYPE macros.

Signed-off-by: Nelson Ho <[email protected]>
Update the versal LPD IOU SLCR device model to use
OBJECT_DECLARE_SIMPLE_TYPE instead of the old OBJECT_CHECK.

Signed-off-by: Nelson Ho <[email protected]>
@ho28 ho28 requested a review from kay-ge December 10, 2024 16:58
@ho28 ho28 merged commit ff2e53d into Wind-River:wr-integration Dec 10, 2024
1 check passed
@ho28 ho28 deleted the nho/versal/object-declare-type branch December 10, 2024 19:03
ho28 pushed a commit to ho28/wr-qemu that referenced this pull request Jan 15, 2025
…et_end()

In multifd_mapped_ram_fdset_end() we call qtest_qmp() but forgot
to unref the response QDict we get back, which means it is leaked:

Indirect leak of 4120 byte(s) in 1 object(s) allocated from:
    #0 0x55c0c095d318 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/tests/qtest/migration-test+0x22f318) (BuildI
d: 07f667506452d6c467dbc06fd95191966d3e91b4)
    Wind-River#1 0x7f186f939c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13
    Wind-River#2 0x55c0c0ae9b01 in qdict_new qobject/qdict.c:30:13
    Wind-River#3 0x55c0c0afc16c in parse_object qobject/json-parser.c:317:12
    Wind-River#4 0x55c0c0afb90f in parse_value qobject/json-parser.c:545:16
    Wind-River#5 0x55c0c0afb579 in json_parser_parse qobject/json-parser.c:579:14
    Wind-River#6 0x55c0c0afa21d in json_message_process_token qobject/json-streamer.c:92:12
    Wind-River#7 0x55c0c0bca2e5 in json_lexer_feed_char qobject/json-lexer.c:313:13
    Wind-River#8 0x55c0c0bc97ce in json_lexer_feed qobject/json-lexer.c:350:9
    Wind-River#9 0x55c0c0afabbc in json_message_parser_feed qobject/json-streamer.c:121:5
    Wind-River#10 0x55c0c09cbd52 in qmp_fd_receive tests/qtest/libqmp.c:86:9
    Wind-River#11 0x55c0c09be69b in qtest_qmp_receive_dict tests/qtest/libqtest.c:760:12
    Wind-River#12 0x55c0c09bca77 in qtest_qmp_receive tests/qtest/libqtest.c:741:27
    Wind-River#13 0x55c0c09bee9d in qtest_vqmp tests/qtest/libqtest.c:812:12
    Wind-River#14 0x55c0c09bd257 in qtest_qmp tests/qtest/libqtest.c:835:16
    Wind-River#15 0x55c0c0a87747 in multifd_mapped_ram_fdset_end tests/qtest/migration-test.c:2393:12
    Wind-River#16 0x55c0c0a85eb3 in test_file_common tests/qtest/migration-test.c:1978:9
    Wind-River#17 0x55c0c0a746a3 in test_multifd_file_mapped_ram_fdset tests/qtest/migration-test.c:2437:5
    Wind-River#18 0x55c0c0a93237 in migration_test_wrapper tests/qtest/migration-helpers.c:458:5
    Wind-River#19 0x7f186f958aed in test_case_run debian/build/deb/../../../glib/gtestutils.c:2930:15
    Wind-River#20 0x7f186f958aed in g_test_run_suite_internal debian/build/deb/../../../glib/gtestutils.c:3018:16
    Wind-River#21 0x7f186f95880a in g_test_run_suite_internal debian/build/deb/../../../glib/gtestutils.c:3035:18
    Wind-River#22 0x7f186f95880a in g_test_run_suite_internal debian/build/deb/../../../glib/gtestutils.c:3035:18
    Wind-River#23 0x7f186f95880a in g_test_run_suite_internal debian/build/deb/../../../glib/gtestutils.c:3035:18
    Wind-River#24 0x7f186f95880a in g_test_run_suite_internal debian/build/deb/../../../glib/gtestutils.c:3035:18
    Wind-River#25 0x7f186f95880a in g_test_run_suite_internal debian/build/deb/../../../glib/gtestutils.c:3035:18
    Wind-River#26 0x7f186f958faa in g_test_run_suite debian/build/deb/../../../glib/gtestutils.c:3109:18
    Wind-River#27 0x7f186f959055 in g_test_run debian/build/deb/../../../glib/gtestutils.c:2231:7
    #28 0x7f186f959055 in g_test_run debian/build/deb/../../../glib/gtestutils.c:2218:1
    #29 0x55c0c0a6e427 in main tests/qtest/migration-test.c:4033:11

Unref the object after we've confirmed that it is what we expect.

Signed-off-by: Peter Maydell <[email protected]>
Reviewed-by: Fabiano Rosas <[email protected]>
Signed-off-by: Fabiano Rosas <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants