From patchwork Sun Mar 21 23:31:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 1456336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=Woh8cQiJ; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F3Yr014Ywz9sVb for ; Mon, 22 Mar 2021 10:34:24 +1100 (AEDT) Received: from localhost ([::1]:48136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lO7aQ-0001tN-4O for incoming@patchwork.ozlabs.org; Sun, 21 Mar 2021 19:34:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO7Y2-0007vZ-69 for qemu-devel@nongnu.org; Sun, 21 Mar 2021 19:31:54 -0400 Received: from mout.web.de ([212.227.17.12]:45101) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO7Y0-0000FN-Gv for qemu-devel@nongnu.org; Sun, 21 Mar 2021 19:31:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1616369507; bh=tuyfOEeBolxuiT4kdpqwI8Wgqhvay43ezbANQOEuxAI=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=Woh8cQiJ52L9iC99mHeZ1PdqIzJSdUDyT24vfwyuqvhUUc4eP4nap3h+rvOJpV1xc KKtX+XAgF9aStrJX6DgxMirrM6wIM6A0sI8GnaIukHM6Q24LwPtKSBMbn1mtjqEo6I RNjnLQcvxwQCXzYQVPGvyQFFQl6Kvc5IgZ1EdK68= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([94.134.180.131]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MORuj-1lIK7r4B4H-005u5o; Mon, 22 Mar 2021 00:31:47 +0100 Date: Mon, 22 Mar 2021 00:31:45 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH 1/5] tests: Use the normal yank code instead of stubs in relevant tests Message-ID: <950007e82e19e75831b29fac07ab990c213d2352.1616368879.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:ej3DrsVhwNwtE0w9ysuxD0oWGlavD6FrHOGq1wTRfRmWhgkwff0 JYnDvKyQiZZOu6Vejvx6CQEHm17li9n6aGY/hAyg9uw/t5IQGFxiSGZsPitLUmaoJ6QMiWn IosrXShu8/d9t/mUAjQZDKHgimtzGv6c0x5MDIbQLSYuC83ppzLX23pWGYnPYYofQmQsu76 VE0sEvHbwCku7utRxqccg== X-UI-Out-Filterresults: notjunk:1;V03:K0:Sg51EiL4+wg=:Dt/Q0kx7ADKNQWYup/gE/1 VZ/bjCpqqOuI4bB+GjG9xCa0LqACzZYr1X7wkk4NWbAZ8JxoQPcAQygYh0NFPexR5uHyuQzJl un4/4aC/do5Vlcd0T4G1BurqVgogCBn54YGvW3G/yWu+FN1MllpBIPlIFAqPXenJrqP5hPuka q77Gh062SljYoOqX61TMDNXpU/wwuaY/lVRZhB803CqTvkKiFB+xe89roerjZrp682UMxCyEj fsAziPV6ni/tHwRAAKB+IIFF6zfzp5h3x394HDr9Z/8GudIgciSgUjiFKYf6FPLcDlp1s3tnp lmc0OxiOe10qnmSnQY9ITbDwDsEIg5lJxq50kcrqFdDhirs9+28ShdGqjS1Fgs4hgd0FCYLDy v0Emm8hGpI9UIE7Aop8AYaXfQ9i5mf3infThCpCcK26oBMV2mmX9NLHuMje2lPkarte+a1cMY JKNRLRNwNOdXdfzgyP3bjOXD7UVtubiOCQC9s14X+qb5xDFtpDbKmREM0cX1IxABEbUf3m6ol vAdwO8JwUBIy9BCzmTIr1xfz9L8eTIrUj85zU9KpvSrRkS7Dar+nAMnDpHgCkNO/hk8sPm39n NsgAA9GHra87WGttqr4r9UkUYC+rE+kgfdu3MNGqqv2UJOcY6LmoKRCnc9qoMIiGPh/HHXAZe vEfciSRfPLx8j959bXSXDLekSw91gq0aQ9jGK+3rmYI9VMYqSvP+2tUKtDi8Brf3quesY9Fyu 66n2GNw3OngCFIVwuhc0q4oCuUYrchQNJSu9xkBkIeDeQ77YRJ5ljWXtBf3OajwDLu7wBKRAG t/5szLcoCreklH81kMcNp8AW3UihE56UgOCtSmeOCI/j3big+RXljo8VV7Rph8Hl8WfqZ3s73 G68eQdyz3GQtMkDltKS8stTb6XDOUdUHzbZrH0PYU= Received-SPF: pass client-ip=212.227.17.12; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Marc-Andre Lureau , Thomas Huth , Li Zhang , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Use the normal yank code instead of stubs in relevant tests to increase coverage and to ensure that registering and unregistering of yank instances and functions is done correctly. Signed-off-by: Lukas Straub --- tests/qtest/meson.build | 6 +++--- tests/unit/meson.build | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) -- 2.30.2 diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 66ee9fbf45..40e1f495f7 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -234,9 +234,9 @@ tpmemu_files = ['tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'] qtests = { 'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'], 'cdrom-test': files('boot-sector.c'), - 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1, + 'dbus-vmstate-test': ['migration-helpers.c', dbus_vmstate1, '../../monitor/yank.c'], 'ivshmem-test': [rt, '../../contrib/ivshmem-server/ivshmem-server.c'], - 'migration-test': files('migration-helpers.c'), + 'migration-test': ['migration-helpers.c', io, '../../monitor/yank.c'], 'pxe-test': files('boot-sector.c'), 'qos-test': [chardev, io, qos_test_ss.apply(config_host, strict: false).sources()], 'tpm-crb-swtpm-test': [io, tpmemu_files], @@ -266,7 +266,7 @@ foreach dir : target_dirs endif qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vmstate-daemon.sh') qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base) - + foreach test : target_qtests # Executables are shared across targets, declare them only the first time we # encounter them diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 4bfe4627ba..8ccf60af66 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -123,7 +123,7 @@ if have_system 'test-util-sockets': ['socket-helpers.c'], 'test-base64': [], 'test-bufferiszero': [], - 'test-vmstate': [migration, io] + 'test-vmstate': [migration, io, '../../monitor/yank.c'] } if 'CONFIG_INOTIFY1' in config_host tests += {'test-util-filemonitor': []} @@ -135,7 +135,7 @@ if have_system if 'CONFIG_TSAN' not in config_host if 'CONFIG_POSIX' in config_host tests += { - 'test-char': ['socket-helpers.c', qom, io, chardev] + 'test-char': ['socket-helpers.c', qom, io, chardev, '../../monitor/yank.c'] } endif From patchwork Sun Mar 21 23:31:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 1456334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=HldLYBfn; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F3Ynj3Wr3z9sWF for ; Mon, 22 Mar 2021 10:32:25 +1100 (AEDT) Received: from localhost ([::1]:42504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lO7YV-0007zS-Hh for incoming@patchwork.ozlabs.org; Sun, 21 Mar 2021 19:32:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO7Y5-0007yO-7V for qemu-devel@nongnu.org; Sun, 21 Mar 2021 19:31:57 -0400 Received: from mout.web.de ([217.72.192.78]:50867) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO7Y3-0000Gh-9G for qemu-devel@nongnu.org; Sun, 21 Mar 2021 19:31:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1616369511; bh=g96QoTGwedFUXA0fm9qRHfwgSpJ5sKc88uQ9mOYbs8g=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=HldLYBfnwi/K6EMLBLsNFThCJvvRXoNQ/MaQVybK1DBp8sswnUBpROay0kfcukKvq xXNPj8jBrprHmLhSg/qKqASmTbme1d5H4swnZdAOlrdV9dJV/3ok2gCDTNVSPL6ZAO TlZetMq4CR0D8hsTDVLfb6nBxo37bPRIYOZ/ukY4= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([94.134.180.131]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LfAoO-1m3o5P0R9U-00omLQ; Mon, 22 Mar 2021 00:31:51 +0100 Date: Mon, 22 Mar 2021 00:31:49 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH 2/5] tests: Add tests for yank with the chardev-change Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:uBbVE/AGt6Cs/n1SLeOx7krvvnF1f2SiUvcmPVjMKH325m8ypIL 8HDXMcGIfdCtJbD424GTZKzaUb96B6XoMYH85a9cJjxx8WAgfCQO+vJWTK331WY26nr1DT+ nrTmWP9C0Z59swCDB97hcLrmbv8zF+ECb+TAgNjcgGr59W5B8ZZ63UNxs+ezHeyAPdqZ4T7 eiZGbUSvbUp2Es48mPekA== X-UI-Out-Filterresults: notjunk:1;V03:K0:5WIsvmLIz/4=:1IBQmfxnOCkHfc5bUSf6fy 05+f5jQ2y0tPwCKvgNnmlwyyorUPbBeADsUkCHt/Q/HCx0Jbe1y/k9aNCAoqISZstpIbfMZgL IAckN6EJ1YqRw/C17itkqN6oL56xLOaxihnyHCVLwgPo5UiqKrFOVnQY/qLQfQgIqeYD88HMg shzoY521bQduu/Ft2VGDEuCvtdOlr0iPUaoRCfvWfCPitYfx9MBo1QDJDgn1/yDjrMaPBXkY0 EuRzvFHCe6aYyf1WPwKBjQiw7mXEyJ+VfHQqes2muk6ji8jNytvYvuUGUICrqHPXK0bBDXzNb 1qAbxGk0TQ1Im1MS1RHvOjzUoBkGYW6OmD/AZd5e1/O+v/UuMyX1oe92U9rXCv17xWS7TNBpr CceVjNW+B24cWfMmoHIR2NVANH7mCBqCPkhBwbGrFINAUh1a61rdztu4uS1xLcfti2sHjWH7+ 5cztiVuWQg3FLYwBkgjqAk+HOVa0tr8oN7qwqkZn/O/df05inn1+zslM6sUQs9T8BYiGJmoMZ LfSncZm1Uxq5mm8r6jWXbkfvE7bVaDERRIGgc1JLVYCQsryNRJPLwGa5gplaoGVcrTcFykBT0 7ryI9/hkqUg9b41j1kfFUD6/M90+ebEg2K6e8kVsMxYG8NGOeY8TKcgC94Ld6qhCRdWOK2/mk CCEEffXJ4HFwANAnqCeteRdswRM2fSALw4yEeoxTIzVlinAHX2yCBm/ROxE2k53rtFAlsA5wn l3jP8GVNF2hUDk0jmx3ulZFubSTYYTA7HL6C/el5aXJmh5B2ZJWTl0v0ZDtPxXsM9TJ7TLxIp qWImah9BvgfS4Dzk8gW2qhtydcc9yh545NOdv6oaFo4dGqv9j9gIe8fQAw3p9L4CUJtQYuVlo Tv1KTCr/Eor/BrkGMR7cskgYj2SngW5DPfNE6e0yo= Received-SPF: pass client-ip=217.72.192.78; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Marc-Andre Lureau , Thomas Huth , Li Zhang , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add tests for yank with the chardev-change case. Signed-off-by: Lukas Straub --- MAINTAINERS | 1 + tests/unit/meson.build | 3 +- tests/unit/test-yank.c | 240 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 tests/unit/test-yank.c -- 2.30.2 diff --git a/MAINTAINERS b/MAINTAINERS index aa024eed17..a8a7f0d1c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2817,6 +2817,7 @@ F: monitor/yank.c F: stubs/yank.c F: include/qemu/yank.h F: qapi/yank.json +F: tests/unit/test-yank.c COLO Framework M: zhanghailiang diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 8ccf60af66..38e5dba920 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -123,7 +123,8 @@ if have_system 'test-util-sockets': ['socket-helpers.c'], 'test-base64': [], 'test-bufferiszero': [], - 'test-vmstate': [migration, io, '../../monitor/yank.c'] + 'test-vmstate': [migration, io, '../../monitor/yank.c'], + 'test-yank': ['socket-helpers.c', qom, io, chardev, '../../monitor/yank.c'] } if 'CONFIG_INOTIFY1' in config_host tests += {'test-util-filemonitor': []} diff --git a/tests/unit/test-yank.c b/tests/unit/test-yank.c new file mode 100644 index 0000000000..44f24c45a8 --- /dev/null +++ b/tests/unit/test-yank.c @@ -0,0 +1,240 @@ +#include "qemu/osdep.h" +#include + +#include "qemu/config-file.h" +#include "qemu/module.h" +#include "qemu/option.h" +#include "qemu/sockets.h" +#include "chardev/char-fe.h" +#include "sysemu/sysemu.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-char.h" +#include "qapi/qmp/qdict.h" +#include "qom/qom-qobject.h" +#include "io/channel-socket.h" +#include "qapi/qobject-input-visitor.h" +#include "qapi/qapi-visit-sockets.h" +#include "socket-helpers.h" +#include "qapi/qapi-commands-yank.h" +#include "qapi/qapi-types-yank.h" + +static int chardev_change(void *opaque) +{ + return 0; +} + +static bool is_yank_instance_registered(void) +{ + YankInstanceList *list; + bool ret; + + list = qmp_query_yank(&error_abort); + + ret = !!list; + + qapi_free_YankInstanceList(list); + + return ret; +} + +static void char_change_to_yank_test(gconstpointer opaque) +{ + SocketAddress *addr = (gpointer) opaque; + Chardev *chr; + CharBackend be; + ChardevReturn *ret; + QIOChannelSocket *ioc; + + /* + * Setup a listener socket and determine its address + * so we know the TCP port for the client later + */ + ioc = qio_channel_socket_new(); + g_assert_nonnull(ioc); + qio_channel_socket_listen_sync(ioc, addr, 1, &error_abort); + addr = qio_channel_socket_get_local_address(ioc, &error_abort); + g_assert_nonnull(addr); + + ChardevBackend old_backend = { .type = CHARDEV_BACKEND_KIND_NULL }; + ChardevBackend new_backend = { + .type = CHARDEV_BACKEND_KIND_SOCKET, + .u.socket.data = &(ChardevSocket) { + .addr = &(SocketAddressLegacy) { + .type = SOCKET_ADDRESS_LEGACY_KIND_INET, + .u.inet.data = &addr->u.inet + }, + .has_server = true, + .server = false + } }; + + g_assert(!is_yank_instance_registered()); + + ret = qmp_chardev_add("chardev", &old_backend, &error_abort); + qapi_free_ChardevReturn(ret); + chr = qemu_chr_find("chardev"); + g_assert_nonnull(chr); + + g_assert(!is_yank_instance_registered()); + + qemu_chr_wait_connected(chr, &error_abort); + qemu_chr_fe_init(&be, chr, &error_abort); + /* allow chardev-change */ + qemu_chr_fe_set_handlers(&be, NULL, NULL, + NULL, chardev_change, NULL, NULL, true); + + ret = qmp_chardev_change("chardev", &new_backend, &error_abort); + g_assert_nonnull(ret); + g_assert(be.chr != chr); + g_assert(is_yank_instance_registered()); + + object_unparent(OBJECT(be.chr)); + object_unref(OBJECT(ioc)); + qapi_free_ChardevReturn(ret); +} + +static void char_change_yank_to_yank_test(gconstpointer opaque) +{ + SocketAddress *addr = (gpointer) opaque; + Chardev *chr; + CharBackend be; + ChardevReturn *ret; + QIOChannelSocket *ioc; + + /* + * Setup a listener socket and determine its address + * so we know the TCP port for the client later + */ + ioc = qio_channel_socket_new(); + g_assert_nonnull(ioc); + qio_channel_socket_listen_sync(ioc, addr, 1, &error_abort); + addr = qio_channel_socket_get_local_address(ioc, &error_abort); + g_assert_nonnull(addr); + + ChardevBackend backend = { + .type = CHARDEV_BACKEND_KIND_SOCKET, + .u.socket.data = &(ChardevSocket) { + .addr = &(SocketAddressLegacy) { + .type = SOCKET_ADDRESS_LEGACY_KIND_INET, + .u.inet.data = &addr->u.inet + }, + .has_server = true, + .server = false + } }; + + g_assert(!is_yank_instance_registered()); + + ret = qmp_chardev_add("chardev", &backend, &error_abort); + qapi_free_ChardevReturn(ret); + chr = qemu_chr_find("chardev"); + g_assert_nonnull(chr); + + g_assert(is_yank_instance_registered()); + + qemu_chr_wait_connected(chr, &error_abort); + qemu_chr_fe_init(&be, chr, &error_abort); + /* allow chardev-change */ + qemu_chr_fe_set_handlers(&be, NULL, NULL, + NULL, chardev_change, NULL, NULL, true); + + ret = qmp_chardev_change("chardev", &backend, &error_abort); + g_assert_nonnull(ret); + g_assert(be.chr != chr); + g_assert(is_yank_instance_registered()); + + object_unparent(OBJECT(be.chr)); + object_unref(OBJECT(ioc)); + qapi_free_ChardevReturn(ret); +} + +static void char_change_from_yank_test(gconstpointer opaque) +{ + SocketAddress *addr = (gpointer) opaque; + Chardev *chr; + CharBackend be; + ChardevReturn *ret; + QIOChannelSocket *ioc; + + /* + * Setup a listener socket and determine its address + * so we know the TCP port for the client later + */ + ioc = qio_channel_socket_new(); + g_assert_nonnull(ioc); + qio_channel_socket_listen_sync(ioc, addr, 1, &error_abort); + addr = qio_channel_socket_get_local_address(ioc, &error_abort); + g_assert_nonnull(addr); + + ChardevBackend old_backend = { + .type = CHARDEV_BACKEND_KIND_SOCKET, + .u.socket.data = &(ChardevSocket) { + .addr = &(SocketAddressLegacy) { + .type = SOCKET_ADDRESS_LEGACY_KIND_INET, + .u.inet.data = &addr->u.inet + }, + .has_server = true, + .server = false + } }; + ChardevBackend new_backend = { .type = CHARDEV_BACKEND_KIND_NULL }; + + g_assert(!is_yank_instance_registered()); + + ret = qmp_chardev_add("chardev", &old_backend, &error_abort); + qapi_free_ChardevReturn(ret); + chr = qemu_chr_find("chardev"); + g_assert_nonnull(chr); + + g_assert(is_yank_instance_registered()); + + qemu_chr_wait_connected(chr, &error_abort); + qemu_chr_fe_init(&be, chr, &error_abort); + /* allow chardev-change */ + qemu_chr_fe_set_handlers(&be, NULL, NULL, + NULL, chardev_change, NULL, NULL, true); + + ret = qmp_chardev_change("chardev", &new_backend, &error_abort); + g_assert_nonnull(ret); + g_assert(be.chr != chr); + g_assert(!is_yank_instance_registered()); + + object_unparent(OBJECT(be.chr)); + object_unref(OBJECT(ioc)); + qapi_free_ChardevReturn(ret); +} + +static SocketAddress tcpaddr = { + .type = SOCKET_ADDRESS_TYPE_INET, + .u.inet.host = (char *)"127.0.0.1", + .u.inet.port = (char *)"0", +}; + +int main(int argc, char **argv) +{ + bool has_ipv4, has_ipv6; + + qemu_init_main_loop(&error_abort); + socket_init(); + + g_test_init(&argc, &argv, NULL); + + if (socket_check_protocol_support(&has_ipv4, &has_ipv6) < 0) { + g_printerr("socket_check_protocol_support() failed\n"); + goto end; + } + + if (!has_ipv4) { + goto end; + } + + module_call_init(MODULE_INIT_QOM); + qemu_add_opts(&qemu_chardev_opts); + + g_test_add_data_func("/yank/char_change_to_yank", &tcpaddr, + char_change_to_yank_test); + g_test_add_data_func("/yank/char_change_yank_to_yank", &tcpaddr, + char_change_yank_to_yank_test); + g_test_add_data_func("/yank/char_change_from_yank", &tcpaddr, + char_change_from_yank_test); + +end: + return g_test_run(); +} From patchwork Sun Mar 21 23:31:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 1456338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=kKpaFXVA; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F3YtL2rqhz9sVb for ; Mon, 22 Mar 2021 10:36:26 +1100 (AEDT) Received: from localhost ([::1]:53384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lO7cO-000464-Ec for incoming@patchwork.ozlabs.org; Sun, 21 Mar 2021 19:36:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO7Y9-00084w-3B for qemu-devel@nongnu.org; Sun, 21 Mar 2021 19:32:01 -0400 Received: from mout.web.de ([212.227.17.11]:37551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO7Y7-0000Is-6N for qemu-devel@nongnu.org; Sun, 21 Mar 2021 19:32:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1616369515; bh=U/L3Q2NvRQad/NYnXasRUe7+xtntL2sQsIlsQlfr38A=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=kKpaFXVAci4MZu9ItDtR1CJwXE2JT+rzSfWL1XG76AS0rAXlz1Vndq4FE1Zo38k8R aSgMvAmJCoQFKcZ9/HtFAuJkjOtn3htCcehJ+cW//r9NKDcapjv0vykMqP8YD9lfK5 3PpEk/pdiTdFeJA4GifwxAfDGTxJuZPFFU2//nao= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([94.134.180.131]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0M09hY-1lgcMw3dgS-00uL6H; Mon, 22 Mar 2021 00:31:54 +0100 Date: Mon, 22 Mar 2021 00:31:53 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH 3/5] chardev/char.c: Move object_property_try_add_child out of chardev_new Message-ID: <4d61f31f4c2ba1e768d91b2d8f946ea49b3a36fe.1616368879.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:W77HgDixPhRrWxlghc1U5hPGmtWVGbMZ+2tQIL1UuyHrmG1A74A Aa/p5V9FzR+9MCCT+JXz6bxp2YH4gtiCYE+IecoWqJ2XMSsMYjPXjx3LeVPpScyzJzwy7Dw /6PPRffMxvaaR6dcluZM/usl0HJwDO9VbbL3m8N5cH0n1FxYixUr0NK0upzSXLJNd4g0edB gn4+pg8BF80iAbwNto0SA== X-UI-Out-Filterresults: notjunk:1;V03:K0:Vp3fwZzT1Ko=:Dy/cj/a/NC96eNZl7MwWLP cGoaesrDyCsJ1W/oFP9mLg4JMcIzorHvYwUTg7mu8UYun9aMmHYxvbAcEO213WYScc14M5Mel V6gcEQbt0vCZ26mV0lHmRgW8lcqSLg/goyw09Xvr1QgXefmTkW5P+I/yCTLoBHMGgpH3WjLHW 5eRs8itD2dht5X8gN+cChDqZGLH3OoFvRQ9aMM9WcyranMNn687G4R8CEboUIKNHc4EAP+OQ6 ajHekWtmHzBCO38Hiimn68pIRIcLGOOQfvrNwZeTU+0QPzBR/vJXif64XuyYxT2PftSVGvzRG 7iqcq3zbLzkimdhNhZpEaXFQsf1VQtflKBWdOXxC/BUFt6oXR0/RJCVjrqdb5b7RCr9Nl7mXE hFCUN5akUKuqHzdCfJmD0jvq8bZd5N3bX8cY9UG6Ha9zNHYkeSqig6mrZuaDbqxYTK16r+AgP T6QzkivSWxGEnILByMY007H+4ewo2hfzzSdqsqdKhUiTNrq6Ac0JtEFDcV+PTC79K944o2cVR lMqvnJqc0/PpyXxcTlJiZ7OxSz5u+sAWTFtb9KPQca2hABx0DGDL1I6fjOdiOYtFgJUZ0vLCJ eJtXaTlLNQD50tTY3+0XcrogCUXU2OWjP5Bxj+wWtNvwRhzRLNAzUBqFho8CcDHqIrc2TU75v Pic21/RGtJk0Q3WKLKmWcMSPUGHyiZFSc7hVY4ZGPHUDfHjuhU1ggorXGPh7BpxWxfQYZZhUB vBty2bGp2I4eXELJZ/AjyKg2S0lO+xwwoT6/SvkpArozx3fSGaG24XBRx6BdNbFC2hcz28sGk ZgmI5yDMoNhR1yD8sMCqW1r8F4n0VSvFJAXyq+0RMQpU2vQKs5bruYQq3uxM08BawtO2zn6Zf AdEMS5N9kz18VdyXMLghHSVBaH75WybrjUGjHbclazdai5kxbQieXNN9aJ9aSyCJ0QECUHVSI gRdW0Gz/3Kg+V7v/6fmfZSrHRR5zP/fjE9aiLy1hBF+gxbRWxMxVedL+iYryr92QKD2OIiZm7 bJ6z4xfPgEglLstF3pItoFUCfTpjDjBuUNUReMH1aZaJNbk/KckFegzQtH/07yml/u/TBlDLI sEyb2ZswR5vZEtrvsnfQzk2hu8O+uEFL6z1cTcoYhagoCBIlPAD1ilnMHvPDwklkYr1GilOtH WWtdOuexhhawmpq0wkk0yTuez2i0ldEpB9E6InWdi9KimiFe/kZmnT96Yldcamj6d3Zz6UTqE pSrLH7lA/j3fmzc7s5GPJiSRwCT/zF91i5td9Qw== Received-SPF: pass client-ip=212.227.17.11; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Marc-Andre Lureau , Thomas Huth , Li Zhang , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Move object_property_try_add_child out of chardev_new into it's callers. This is a preparation for the next patches to fix yank with the chardev-change case. Signed-off-by: Lukas Straub Reviewed-by: Marc-André Lureau --- chardev/char.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) -- 2.30.2 diff --git a/chardev/char.c b/chardev/char.c index 97cafd6849..1584865027 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -972,7 +972,9 @@ static Chardev *chardev_new(const char *id, const char *typename, qemu_char_open(chr, backend, &be_opened, &local_err); if (local_err) { - goto end; + error_propagate(errp, local_err); + object_unref(obj); + return NULL; } if (!chr->filename) { @@ -982,22 +984,6 @@ static Chardev *chardev_new(const char *id, const char *typename, qemu_chr_be_event(chr, CHR_EVENT_OPENED); } - if (id) { - object_property_try_add_child(get_chardevs_root(), id, obj, - &local_err); - if (local_err) { - goto end; - } - object_unref(obj); - } - -end: - if (local_err) { - error_propagate(errp, local_err); - object_unref(obj); - return NULL; - } - return chr; } @@ -1006,6 +992,7 @@ Chardev *qemu_chardev_new(const char *id, const char *typename, GMainContext *gcontext, Error **errp) { + Chardev *chr; g_autofree char *genid = NULL; if (!id) { @@ -1013,7 +1000,19 @@ Chardev *qemu_chardev_new(const char *id, const char *typename, id = genid; } - return chardev_new(id, typename, backend, gcontext, errp); + chr = chardev_new(id, typename, backend, gcontext, errp); + if (!chr) { + return NULL; + } + + if (!object_property_try_add_child(get_chardevs_root(), id, OBJECT(chr), + errp)) { + object_unref(OBJECT(chr)); + return NULL; + } + object_unref(OBJECT(chr)); + + return chr; } ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, @@ -1034,6 +1033,13 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, return NULL; } + if (!object_property_try_add_child(get_chardevs_root(), id, OBJECT(chr), + errp)) { + object_unref(OBJECT(chr)); + return NULL; + } + object_unref(OBJECT(chr)); + ret = g_new0(ChardevReturn, 1); if (CHARDEV_IS_PTY(chr)) { ret->pty = g_strdup(chr->filename + 4); From patchwork Sun Mar 21 23:31:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 1456337 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=Mce/Ua3q; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F3YrB3HDcz9sVb for ; Mon, 22 Mar 2021 10:34:34 +1100 (AEDT) Received: from localhost ([::1]:49044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lO7aa-0002FX-E7 for incoming@patchwork.ozlabs.org; Sun, 21 Mar 2021 19:34:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO7YC-0008BO-GK for qemu-devel@nongnu.org; Sun, 21 Mar 2021 19:32:04 -0400 Received: from mout.web.de ([212.227.17.11]:57431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO7YA-0000KC-S2 for qemu-devel@nongnu.org; Sun, 21 Mar 2021 19:32:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1616369518; bh=/CQzRMKhJDxrhta8zXxxjDrA9hXcSEfYPXhsm1MQFlc=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=Mce/Ua3qGFBT0DShy0fvB8jH3M1B78hvnZBralvGKBvco/3CGqbd/h5osSqjnDhpX fFzLLXeHoi5CYQgSCudAVgu9mGcMsN9BhsCpXy9wXUvf/DcXeNE9LElKNcrE+vHqLq bJozCVi6pnLcgbTkdpMcBHBYjGe0//YVaw+OjEe8= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([94.134.180.131]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Le4Po-1m2hcY1lng-00pvEv; Mon, 22 Mar 2021 00:31:58 +0100 Date: Mon, 22 Mar 2021 00:31:57 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH 4/5] chardev/char.c: Always pass id to chardev_new Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:N4LwLlL46OHDs6JuU8sO7Mw9Sn67CdlyRTUo3coUcSVo1lzyoLR J9IKeTnLVkqoeuNPlnrNDtIUuSFCFuhsLkAwCd603GnuXM/QNfvSTs4uYU4iEu/6oFj/0s3 ETzSDK6NAFmIkuYlMqMse0JBzTKHERXuUJ0cRMqmPeGm4qN++rQlk3N14TERKXA6f8OSVG0 FpFor3pH1ORYbyH/HasTw== X-UI-Out-Filterresults: notjunk:1;V03:K0:KaivfXGRMLU=:VSHuqhj4JGCKT//wfhssI2 YDU+7TLyauC0rPkgr82H8fAXy8SFJO0Ggbt7xljzjq3dM81n2GZfpxfjRWUK8MmkgwrjierQp tMTwXdQok3fA9ED1Iz6fvrd6Z51K0t1NVHmZjC83OQ1Z57aME+WPeMlyfLjg6CvwORpgwVGl1 TPvRDJjxmUFevmyEvDz/SH5mgVi+Jz4k9+tHlRENPzP+UyxjsqZy9lKzU9pxrkO1I/Uj+rpzh 0IebtwYLeT2H/bMwRZtC3TVjyJ1FAgknUUFt2hHHStHI0eWd0KrS7a/Bp1RYRCq89bnjNqOrZ Q1JGSnJm4Jb2rznjQ9VbMPCitoPNNK3fJTHs/c7dwV8HNawQTgcJ4/FGs5U/F1lpNzPp0o9pV BMB+jQdaPWHDolhWIcVn8krPdVYF6yA3MWz4/9Xd/ZjEB4yQ/jBynow4IQahsFafKiG3tsepl Z7a7cjf9wV0mZr0Dn193OjEdVKJ6Eiv5NDs/SLVQdtvO8c57H6vj4BsuNwCENcMrJZFqFVc6D i15U/h/ed3BdDNkTWo9cKVAesZG6F3rJ7sgN0Ui9iotkcVLQzK2x2KwKW7BMJUtTx43tZhFNs UXQLBJBCh1cBt9bo7MpXA2hhF3l/evKRTZm1kUMFMKKJxPl5cxl0EsCJjRc5/A5OuKqo4ileW KmLByFebXMAINzQEVp4cMEIsFckD2Qhit0VMcpPxNAQfoblKq2wnTBaRkQ/pFO89qiRuLewjc JmVUiPnK4fl3wVYdiOgly5Wv5dn05VipccCmgE76vB5hCheHVnL1+OZaTqZ9XmojZ0eVUfqbd 6wkq9yNGjJmr523drbTrupNDY1OQ5nnr1PdyiEov0PR2CB0bEnmTQwsAYl09g0Wd4W94MwxLp 92EFQNoF0CjE7dq+fdMDDseV3UMEMJA9yvFoMbFLuV0Eh01066vdEApSqI+Xxrjes8tFFjh9T sXauzyVwH6CkdC062Ac7BRGmXBmKmpK1YpdU4VT3QCVmc05BJ9SUDDfLkVNZ2Drqo33KoR/AB oSALj5ZK2BwsMUir2Al+jPj9p4C/9ZVHg+d8UF4XfpD7TPoYYWEonT4gzU1bgKkdG1cBY/LC1 vnKlqs65JGUnH44R67Bae0yTku+9eg7vxxGM320/ngP5IIx8DgBQUzjzWxmoCWt9WhcndDjY1 ZcClqU6IhNd6A1i+MbDNNBmWMBsGf1AoVO+UOX0iki2mttCqU4xOBsmBdDkVd2zE5BT2oouaZ 7fWkTciK6YfSbzmpr3g0KY97aswBCN/Tv2c4spA== Received-SPF: pass client-ip=212.227.17.11; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Marc-Andre Lureau , Thomas Huth , Li Zhang , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Always pass the id to chardev_new, since it is needed to register the yank instance for the chardev. Also, after checking that nothing calls chardev_new with id=NULL, assert() that id!=NULL. This fixes a crash when using chardev-change to change a chardev to chardev-socket, which attempts to register a yank instance. This in turn tries to dereference the NULL-pointer. Signed-off-by: Lukas Straub Reviewed-by: Marc-André Lureau Tested-by: Li Zhang --- chardev/char.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/chardev/char.c b/chardev/char.c index 1584865027..ad416c0714 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -964,6 +964,7 @@ static Chardev *chardev_new(const char *id, const char *typename, bool be_opened = true; assert(g_str_has_prefix(typename, "chardev-")); + assert(id); obj = object_new(typename); chr = CHARDEV(obj); @@ -1092,12 +1093,11 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend, return NULL; } - chr_new = chardev_new(NULL, object_class_get_name(OBJECT_CLASS(cc)), + chr_new = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc)), backend, chr->gcontext, errp); if (!chr_new) { return NULL; } - chr_new->label = g_strdup(id); if (chr->be_open && !chr_new->be_open) { qemu_chr_be_event(chr, CHR_EVENT_CLOSED); From patchwork Sun Mar 21 23:32:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 1456335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=odZvEgvL; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F3Ypp2snKz9sWF for ; Mon, 22 Mar 2021 10:33:22 +1100 (AEDT) Received: from localhost ([::1]:44782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lO7ZQ-0000We-BH for incoming@patchwork.ozlabs.org; Sun, 21 Mar 2021 19:33:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO7YH-0008JY-1I for qemu-devel@nongnu.org; Sun, 21 Mar 2021 19:32:09 -0400 Received: from mout.web.de ([212.227.17.11]:54165) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO7YE-0000Lc-E3 for qemu-devel@nongnu.org; Sun, 21 Mar 2021 19:32:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1616369522; bh=wqQ4An/TMM6FIxQ0nDBdd6hH4ru3wVj1eu+s7vxDmBQ=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=odZvEgvLEUT6i7run8acvREwUhUzLS3njqc8gnGLzR//bGvjgep/OvJDt4SoYjvfO Kl0l73LL+nZhp5UIURRSDgzoQ7gvE2CYodlwyXyiRFNd3PDjIatAYd5npI5n5xWIRT bI40d3+VsDsrWtTAKn3jDg9IhfIH6Ft1Mr779Rxk= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([94.134.180.131]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MfHfy-1l3gz20B4s-00Onto; Mon, 22 Mar 2021 00:32:02 +0100 Date: Mon, 22 Mar 2021 00:32:00 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH 5/5] chardev: Fix yank with the chardev-change case Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:+IRZnfbiFq3UcLckaA+3TzYJPUKBusUva1ERotabTiz1xiBiFdK BIACuDqLgT5dCQxWne0z52JwqLOt0dMnwH716q68dopj6O3yA1rFR8GtLl2/W4vcDjim1Cp UckzjlOnKecdHdH9YvRXMo0/tXp2mHeqA8bt6fqu6pOa7JsMjPF/0ODD4fSrUrfmQ9Ybx9u HUiyJdCmhpltCqEaTBs0w== X-UI-Out-Filterresults: notjunk:1;V03:K0:5+YUTg2wbP4=:wEQVyDQggLzrSmy/L+o2Jw Sv5017iV8dQ0qSxDVrhNIfM8P30dUMt74ikqIfkB8w/tLZbevBuPWcXtjtiM/4qHrDJoqILfa GsLtgqVGkjXSbgH9DZhYxNK1VTzijMOPSnufBrKFCHqCjLyuqqCZAXMu+2hceEUg/+JFX9CmO 6pu0FVSBy1yENFL23vZUnEKwC7W42S251hbpJIH9nwRHywhXa7aLk5HIjJ32TPwJ6NgyDKRIb drs6OFd3mhEQDoW01du6sSHZ3oW8D6y/E7knJUBNm/zOyrF3ILs+Kx+rGHhsZ4SmXXmnXUrV+ Y+TGlTZSPuTLIUspnXbgFSCHBWLuccFdQdcFB2K4j59bC22Ovd471VRSmhSVJMGO087ja0x19 R6Px3WSGyoF2NerIWkPi7SV92Dv14Vwsbj+x61UnBKhYwz9a0GaCaFfZG1aehEJaF6DCbuGWo 9CSw1BgXn3MmhJhkZFkpQ2sPlCfYt9nTAWjLj/Uos0S/nLvDbviBkYiGzKjxb77nbnPf2pcVR eeyyUDVSTCDgzZ/SakE6DD/GrKJrCYA19b9qCFMv4qHyq9Pv0xMz1KAFl5MQVGLi0USDeVUko rWrVejJ5G72hnczIuLsfXaROnDAWsfK40jGY8cI0/mdm8J4aElvlZJdtgkdBePEOeG0Jo4VFj Vndeg5xB+D1kVbr6nPsSK3QqA0wjl249mbPuqlkkHvTTWUHho6zflp9nTqfE3aSyBri+fvIfd fiAGefLhq+5RUg8TbDp2qw8FsymY0BMAjP30nU3pPi5FGpM9wEm8Pu9jXRrO51EV/iuz24lfu cSXVThHqfKsmp4nBCNPB0YO0zY1t3L4HiHD3Q2ieySw6k3af4HKr0nSjTAYSTubI92KB2whtH zwyUBtPFVQqXW7ntvqz/z4csR58a4ePTH8OuEkSIfwx4jTp+Qirsf41TiSw3TzuOjC1iEvGVy k9vnSv1rHakU63xLEYfe1ql2CrY7H1Imvjx64zT8a0NwjoyZ8LfIhHQ4cblTkYtSWUE4UScPy 3G3occ4APinXFbxeCRLpig+iA1CVQPVuRWdiEvNt5h7HGNnXm35wYeintz5TmqFVu4zUUbbrs qTdUxPhvuqmb3xs39w/P70VLjBFvKL8Sv2UOgPsk65aV7n7wA0UB3oAiCx+oDIinchP8qbJ8X l7qj9eO7x5xWDPcFCX8ett6DyYQCl2EjkGqLbbQuHC0pm7e9q4Aiq3JOgfFg5Vn8vzsK6nIYK rgGdFVPmXH2NOnanHZhrqfVmkXtVK1TiOkNohnA== Received-SPF: pass client-ip=212.227.17.11; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Marc-Andre Lureau , Thomas Huth , Li Zhang , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When changing from chardev-socket (which supports yank) to chardev-socket again, it fails, because the new chardev attempts to register a new yank instance. This in turn fails, as there still is the yank instance from the current chardev. Also, the old chardev shouldn't unregister the yank instance when it is freed. To fix this, now the new chardev only registers a yank instance if the current chardev doesn't support yank and thus hasn't registered one already. Also, when the old chardev is freed, it now only unregisters the yank instance if the new chardev doesn't need it. s->registered_yank is always true here, as chardev-change only works on user-visible chardevs and those are guraranteed to register a yank instance as they are initialized via chardev_new() qemu_char_open() cc->open() (qmp_chardev_open_socket()). Signed-off-by: Lukas Straub Reviewed-by: Marc-André Lureau --- chardev/char-socket.c | 20 +++++++++++++++++--- chardev/char.c | 32 +++++++++++++++++++++++++------- include/chardev/char.h | 4 ++++ 3 files changed, 46 insertions(+), 10 deletions(-) -- 2.30.2 diff --git a/chardev/char-socket.c b/chardev/char-socket.c index c8bced76b7..8186b6a205 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1119,7 +1119,13 @@ static void char_socket_finalize(Object *obj) } g_free(s->tls_authz); if (s->registered_yank) { - yank_unregister_instance(CHARDEV_YANK_INSTANCE(chr->label)); + /* + * In the chardev-change special-case, we shouldn't unregister the yank + * instance, as it still may be needed. + */ + if (chr->yank_unregister_instance) { + yank_unregister_instance(CHARDEV_YANK_INSTANCE(chr->label)); + } } qemu_chr_be_event(chr, CHR_EVENT_CLOSED); @@ -1421,8 +1427,14 @@ static void qmp_chardev_open_socket(Chardev *chr, qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_FD_PASS); } - if (!yank_register_instance(CHARDEV_YANK_INSTANCE(chr->label), errp)) { - return; + /* + * In the chardev-change special-case, we shouldn't register a new yank + * instance, as there already may be one. + */ + if (chr->yank_register_instance) { + if (!yank_register_instance(CHARDEV_YANK_INSTANCE(chr->label), errp)) { + return; + } } s->registered_yank = true; @@ -1564,6 +1576,8 @@ static void char_socket_class_init(ObjectClass *oc, void *data) { ChardevClass *cc = CHARDEV_CLASS(oc); + cc->supports_yank = true; + cc->parse = qemu_chr_parse_socket; cc->open = qmp_chardev_open_socket; cc->chr_wait_connected = tcp_chr_wait_connected; diff --git a/chardev/char.c b/chardev/char.c index ad416c0714..245f8be201 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -39,6 +39,7 @@ #include "qemu/option.h" #include "qemu/id.h" #include "qemu/coroutine.h" +#include "qemu/yank.h" #include "chardev-internal.h" @@ -266,6 +267,8 @@ static void char_init(Object *obj) { Chardev *chr = CHARDEV(obj); + chr->yank_register_instance = true; + chr->yank_unregister_instance = true; chr->logfd = -1; qemu_mutex_init(&chr->chr_write_lock); @@ -956,6 +959,7 @@ void qemu_chr_set_feature(Chardev *chr, static Chardev *chardev_new(const char *id, const char *typename, ChardevBackend *backend, GMainContext *gcontext, + bool yank_register_instance, Error **errp) { Object *obj; @@ -968,6 +972,7 @@ static Chardev *chardev_new(const char *id, const char *typename, obj = object_new(typename); chr = CHARDEV(obj); + chr->yank_register_instance = yank_register_instance; chr->label = g_strdup(id); chr->gcontext = gcontext; @@ -1001,7 +1006,7 @@ Chardev *qemu_chardev_new(const char *id, const char *typename, id = genid; } - chr = chardev_new(id, typename, backend, gcontext, errp); + chr = chardev_new(id, typename, backend, gcontext, true, errp); if (!chr) { return NULL; } @@ -1029,7 +1034,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, } chr = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc)), - backend, NULL, errp); + backend, NULL, true, errp); if (!chr) { return NULL; } @@ -1054,7 +1059,7 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend, Error **errp) { CharBackend *be; - const ChardevClass *cc; + const ChardevClass *cc, *cc_new; Chardev *chr, *chr_new; bool closed_sent = false; ChardevReturn *ret; @@ -1088,13 +1093,20 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend, return NULL; } - cc = char_get_class(ChardevBackendKind_str(backend->type), errp); - if (!cc) { + cc = CHARDEV_GET_CLASS(chr); + cc_new = char_get_class(ChardevBackendKind_str(backend->type), errp); + if (!cc_new) { return NULL; } - chr_new = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc)), - backend, chr->gcontext, errp); + /* + * Only register a yank instance if the current chardev hasn't registered + * one already. + */ + chr_new = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc_new)), + backend, chr->gcontext, + /* yank_register_instance = */ !cc->supports_yank, + errp); if (!chr_new) { return NULL; } @@ -1118,6 +1130,12 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend, return NULL; } + /* + * When the old chardev is freed, it should only unregister the yank + * instance if the new chardev doesn't need it. + */ + chr->yank_unregister_instance = !cc_new->supports_yank; + object_unparent(OBJECT(chr)); object_property_add_child(get_chardevs_root(), chr_new->label, OBJECT(chr_new)); diff --git a/include/chardev/char.h b/include/chardev/char.h index 4181a2784a..ff38bb3af0 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -65,6 +65,9 @@ struct Chardev { char *filename; int logfd; int be_open; + /* used to coordinate the chardev-change special-case: */ + bool yank_register_instance; + bool yank_unregister_instance; GSource *gsource; GMainContext *gcontext; DECLARE_BITMAP(features, QEMU_CHAR_FEATURE_LAST); @@ -251,6 +254,7 @@ struct ChardevClass { ObjectClass parent_class; bool internal; /* TODO: eventually use TYPE_USER_CREATABLE */ + bool supports_yank; void (*parse)(QemuOpts *opts, ChardevBackend *backend, Error **errp); void (*open)(Chardev *chr, ChardevBackend *backend,