From patchwork Tue Mar 23 17:57:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 12159047 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4F61C433C1 for ; Tue, 23 Mar 2021 18:46:43 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1CE7B619B8 for ; Tue, 23 Mar 2021 18:46:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CE7B619B8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=web.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOm38-00013P-1x for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 14:46:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOlHq-0001b4-DU for qemu-devel@nongnu.org; Tue, 23 Mar 2021 13:57:50 -0400 Received: from mout.web.de ([212.227.15.14]:43737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOlHn-0004Dv-Ux for qemu-devel@nongnu.org; Tue, 23 Mar 2021 13:57:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1616522261; bh=4ySMfeGkLEh9zg8HyE3ZYBf6mYJhDGGm1avak+YyRXw=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=QWHNVKKu6lep5QJye6wiVNL6s4PFIIq9pnu1ECoG4Ura662usV2dKzm4qBXwGujGX 71ABxdPqe6NuzF8wxXQgBuq4nNZ0aoCVH+6XUiUqf+2+usN3jPXics8JMXvG1B6/JB GCZfNxgZx1ErOFyV/Yns5zP7kl1mC1SD6BrU44qo= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([88.130.61.81]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LaTdP-1m5Tha0yiN-00mJOg; Tue, 23 Mar 2021 18:57:41 +0100 Date: Tue, 23 Mar 2021 18:57:39 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 1/4] tests: Add tests for yank with the chardev-change case Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:NlzUZozkdovH2lBW8QK9dx2LHjK5ZbiGZsrrWvgRg8LGrc0dLeb BiTAKK4hHrE0QiYtDkEjLpCsFKBizCFknKXU1mrqv7PSm0IGQh1Gr+c/irwQkSXOzDqDX4D O9RjWP9Ss0lkgAGIB/zbGmYLdwzXgYAq/Xe5825lRQJlymuNmM2Ghu9rvEFc5qu3Fd3Re23 AX5s3knC5IOLNUvKgkfEg== X-UI-Out-Filterresults: notjunk:1;V03:K0:vZecZI4/XGQ=:WI5wNqRKEMDxLSPvCpK8GQ gjptq9oXYAWi1c10wMe9LVGgoQgC+jGtwJU/6UBxOLIA6rxUvuLC2XTyLGaJ+W0ZIG++YCImN 1eJMyFcl33eI1qbhM7hB2wO9IFtYctH0ro6pI/PhpZeQHaYmkGJPBqKbM2B26Dy056nKWGYoU ynPMY0k8wq0CcIS1AFtJc5oeoj5O/YwfR54qqic+Fkx2DpSy0bMDB+I5sRaQOsOtt7PtHaCxg 6roV77fsgjXG3D88W2AYwtKauNmLCrSupi7kExC96CNWwFApfC/zGjRxTt6GASVrLWbFEZIW4 GrVB5kWt3Q68ta7NTtjBZIZzuOfwgbc6xTq5TQ7QZAS6mPv2SLY8UO+WRA/bpB4aBQiUVAWNZ QObVuVncJEiVW6TdzdEFkvl6LUcVvEOthoSFZm5fN5A6+TkJ/j6Nydwi5CI7cFQc/rT+YVZK6 1oVvQTMc3WhCCog53sBqpu4QF29Joe2XgQ7sboFJmb+DRCuc8v9isQBuPR3/PvHoZiFgnwzQ3 Aip+7zOcnxQ9PaGYsTcmHFydz6HQthj2eErLT36TqYbNaLLbbAliEkbVn5cILzaFXTjWju113 4IaJKcnbojCGxJCPkXUCO+DIuM7dGKoEA7yIDdxEM1Df++cblwPMypkMkWsPG6vqqmXzdMNl4 Ze3VLOewuMDx/fekkOkOfNsNmrICdYYiiYtIXt4odTJTBurksg3JH1QlVSAH0LdS0ltbWuBE1 mqEVOYYE2Xbxsl5uPXYxgTvAEYqBbtTI1QKFydLncQRgxyYUOuLjzd8FKb9iKvdQY6nSdwdEp G8HZiac2ZYlqC5UuZika9lMmAO1CRqDj/znC0xSy6OFEl2OzfgGWDS3QJgeFwCJQzgcV7Xkbd hLIODrsvEjFiSo0iueEg== Received-SPF: pass client-ip=212.227.15.14; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+qemu-devel=archiver.kernel.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 | 201 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 204 insertions(+), 1 deletion(-) create mode 100644 tests/unit/test-yank.c -- 2.30.2 diff --git a/MAINTAINERS b/MAINTAINERS index 77259c031d..accb683a55 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2821,6 +2821,7 @@ M: Lukas Straub S: Odd fixes F: util/yank.c F: migration/yank_functions* +F: tests/unit/test-yank.c F: include/qemu/yank.h F: qapi/yank.json diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 4bfe4627ba..b3bc2109da 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] + 'test-vmstate': [migration, io], + 'test-yank': ['socket-helpers.c', qom, io, chardev] } 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..5cb94c2fe4 --- /dev/null +++ b/tests/unit/test-yank.c @@ -0,0 +1,201 @@ +/* + * Tests for QEMU yank feature + * + * Copyright (c) Lukas Straub + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include + +#include "qemu/config-file.h" +#include "qemu/module.h" +#include "qemu/option.h" +#include "chardev/char-fe.h" +#include "sysemu/sysemu.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-char.h" +#include "qapi/qapi-types-char.h" +#include "qapi/qapi-commands-yank.h" +#include "qapi/qapi-types-yank.h" +#include "io/channel-socket.h" +#include "socket-helpers.h" + +typedef struct { + SocketAddress *addr; + bool old_yank; + bool new_yank; + bool fail; +} CharChangeTestConfig; + +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_test(gconstpointer opaque) +{ + CharChangeTestConfig *conf = (gpointer) opaque; + SocketAddress *addr; + 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, conf->addr, 1, &error_abort); + addr = qio_channel_socket_get_local_address(ioc, &error_abort); + g_assert_nonnull(addr); + + ChardevBackend backend[2] = { + /* doesn't support yank */ + { .type = CHARDEV_BACKEND_KIND_NULL }, + /* supports yank */ + { + .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 fail_backend[2] = { + /* doesn't support yank */ + { + .type = CHARDEV_BACKEND_KIND_UDP, + .u.udp.data = &(ChardevUdp) { + .remote = &(SocketAddressLegacy) { + .type = SOCKET_ADDRESS_LEGACY_KIND_UNIX, + .u.q_unix.data = &(UnixSocketAddress) { + .path = (char *)"" + } + } + } + }, + /* supports yank */ + { + .type = CHARDEV_BACKEND_KIND_SOCKET, + .u.socket.data = &(ChardevSocket) { + .addr = &(SocketAddressLegacy) { + .type = SOCKET_ADDRESS_LEGACY_KIND_INET, + .u.inet.data = &(InetSocketAddress) { + .host = (char *)"127.0.0.1", + .port = (char *)"0" + } + }, + .has_server = true, + .server = false + } + } }; + + g_assert(!is_yank_instance_registered()); + + ret = qmp_chardev_add("chardev", &backend[conf->old_yank], &error_abort); + qapi_free_ChardevReturn(ret); + chr = qemu_chr_find("chardev"); + g_assert_nonnull(chr); + + g_assert(is_yank_instance_registered() == conf->old_yank); + + 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); + + if (conf->fail) { + g_setenv("QTEST_SILENT_ERRORS", "1", 1); + ret = qmp_chardev_change("chardev", &fail_backend[conf->new_yank], + NULL); + g_assert_null(ret); + g_assert(be.chr == chr); + g_assert(is_yank_instance_registered() == conf->old_yank); + g_unsetenv("QTEST_SILENT_ERRORS"); + } else { + ret = qmp_chardev_change("chardev", &backend[conf->new_yank], + &error_abort); + g_assert_nonnull(ret); + g_assert(be.chr != chr); + g_assert(is_yank_instance_registered() == conf->new_yank); + } + + 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); + +#define CHAR_CHANGE_TEST(name, _old_yank, _new_yank) \ + do { \ + g_test_add_data_func("/yank/char_change/success/" # name, \ + &(CharChangeTestConfig) { .addr = &tcpaddr, \ + .old_yank = (_old_yank),\ + .new_yank = (_new_yank),\ + .fail = false }, \ + char_change_test); \ + g_test_add_data_func("/yank/char_change/fail/" # name, \ + &(CharChangeTestConfig) { .addr = &tcpaddr, \ + .old_yank = (_old_yank),\ + .new_yank = (_new_yank),\ + .fail = true }, \ + char_change_test); \ + } while (0) + + CHAR_CHANGE_TEST(to_yank, false, true); + CHAR_CHANGE_TEST(yank_to_yank, true, true); + CHAR_CHANGE_TEST(from_yank, true, false); + +end: + return g_test_run(); +} From patchwork Tue Mar 23 17:57:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 12159063 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FF77C433DB for ; Tue, 23 Mar 2021 18:53:49 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C4EEA6157F for ; Tue, 23 Mar 2021 18:53:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4EEA6157F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=web.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOm9z-0008LI-Na for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 14:53:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOlHr-0001ge-Vg for qemu-devel@nongnu.org; Tue, 23 Mar 2021 13:57:51 -0400 Received: from mout.web.de ([212.227.15.14]:36559) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOlHq-0004Fw-3O for qemu-devel@nongnu.org; Tue, 23 Mar 2021 13:57:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1616522265; bh=TFTB0ZU+53dFErY8QuGfDPnX+OOHpgoWFc6pwJE3cqk=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=IzKxI8K3YcJQd2C5J3mJT+qwOS5ggdrW7WPLB1eoEDokUvHh+qAInNjtkL3K8qvQq sDDcOLLqajwVFXz47VrAembu38xIZGXw9ux54PUzWfrx8yFrZ00rBr41IwgKk+p14N E3IPZe7RiLNbCVBH2+xrzxv7y7738NbMEBEC/9EA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([88.130.61.81]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MC6ZE-1lXWjB1wLg-008s1Y; Tue, 23 Mar 2021 18:57:45 +0100 Date: Tue, 23 Mar 2021 18:57:44 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 2/4] chardev/char.c: Move object_property_try_add_child out of chardev_new Message-ID: <833b5a98554d9f68bfc00ac8486ee901a76292d7.1616521487.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:ljuo794wTOHmEsc3Pg6VgZ/szniweOM6E39P7/flW9KIHDfHZws AouelmRE5ZokZLtFNJh1dkFjg+JK5Ivu8dclH2T4VBITsOVDstpe2ge72X24mYdyPh0lmur ohE8G2NttlbqeqnLjUTG6JWbw9bGneQC9u5t5V8FUXsflrwpwvgCYMpAeNfpail6MnCFL8M uMnAgWpFZi/SUM1HKcP0A== X-UI-Out-Filterresults: notjunk:1;V03:K0:gqLpDHtJFMA=:H35xP4ESNcrchiz0OpXYJC rXrKCiSxSgW+XWDKS79odxhXuqZcXr9JQ6k4sz2+rOL9uo6W7vKYEkjyka5JhNxxyyV7OVMpj whhOEtcs44SG3T4sElCL+pD06k3QJxrFBHeCy6TABheRslZeK16/TGQOlg3/3YbteV8vSphc5 ly/kMRyaAb5BQ1csf3bDjXswAHu2Dptqo3mJ4td4Agg+kLNLAB/iGCCu453syMot3ocHVJxaa mZz9pUdOGZ8HWLSPaIuS4dqhMJbrVA+dxRZZTiK8V4QxkgASSGI2oxpiq6hrWEbuyK6KePvtT qu4z2Tfe3BLe07y0b/k9/IHzV+TWhJaR8kTo0GJjsG/ePENIstEk90VQgCXYmY6VvodEUDJ7W 2QFvKJWPHSTraae3UxZ6GiAck0s6CadKhLBxDHw4gKeSPGEAciH1rsX0j0Dd8bvJKhKC3Cymd FflidkjHdd1fF9QsFfmQDdk4hwTGEIch2vI2xeF4wU1znSorIHytowzbTQc/HD7gU9XQSIeVc conCZPXI56FJ4Y2s8AVpwMOjWyaguO2poh968z4qihRz0rZZtr3N6y+jW8mhZiFKc49tZd3G2 cWCcZ1v/YvPaUvlOV/OIq2ujLCaq/cJp6+hPi4SWrvsxRIGjlEFTTVZ1IdTy+HrF5dHnkOQP6 wqij1wv3bQnk6VplTXuICVGlDPtfnJV+cyeE+hR54V5Tcd+qJIeF+2QyNWKRLYjBNL/Kt8qyp W7d+CmqxvhSRM8wog/nXHF3Kr/DYNzI8VMXxEix7r9FoU4qLX/e62IWG0UUpZ0Zm3HaBTzeJt rqX71SxCG0o0J4luMj5K8OzmLUdb8Ne1gqCK4UUzXdSfloZp3Yrwt2rPq8QGjnGm1c1ED1cfB nsAaHPQknY/2S9zJA2yQ== Received-SPF: pass client-ip=212.227.15.14; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+qemu-devel=archiver.kernel.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 Tested-by: Li Zhang --- 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 140d6d9d36..48f321b3e1 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -975,7 +975,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) { @@ -985,22 +987,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; } @@ -1009,6 +995,7 @@ Chardev *qemu_chardev_new(const char *id, const char *typename, GMainContext *gcontext, Error **errp) { + Chardev *chr; g_autofree char *genid = NULL; if (!id) { @@ -1016,7 +1003,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, @@ -1037,6 +1036,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 Tue Mar 23 17:57:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 12159075 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA77DC433DB for ; Tue, 23 Mar 2021 18:57:12 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 55060619C5 for ; Tue, 23 Mar 2021 18:57:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 55060619C5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=web.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOmDH-0004ay-6B for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 14:57:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOlHw-0001sU-5E for qemu-devel@nongnu.org; Tue, 23 Mar 2021 13:57:56 -0400 Received: from mout.web.de ([212.227.15.14]:34271) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOlHu-0004I3-Dd for qemu-devel@nongnu.org; Tue, 23 Mar 2021 13:57:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1616522269; bh=LXggCB8ecqoSh8tjz0A8Nn4Ru5bnI9kUzCo0zAKIKgQ=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=gItmfvuyUhJFzwlil5Fz1aJ48asx0DdLHY0fx+5BAuhRfyvftuGQl4EGfoVCDozWZ 7rc55FCBAnY0kghNsScZVkHYF4JdoIgNeGy5YiaBr0mYg8bjbHeUhwQnez8oPM9rm/ YT5z7Eit7ZCPHr6BLnGIXkG13uT11DXECfGh2x24= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([88.130.61.81]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MRTzc-1lDmx315Ds-00Sgl4; Tue, 23 Mar 2021 18:57:49 +0100 Date: Tue, 23 Mar 2021 18:57:47 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 3/4] chardev/char.c: Always pass id to chardev_new Message-ID: <0c5420ab030df09cdd4189e39f2182acde7b56b7.1616521487.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:EnMB12kfrBgmBHZhUUbLsKPy2zK026TDkNfSGiJyr1V2IH1DTiJ lbbYr0ZY9TEBWbStn00qILjzCj2APBk/ZH3+SdTxvy6q5b3GvClwbF/HQl2W3fwr0qJEc1L OAMKDv2E5NgtQm5kjpQlW8fgWfu5hKKt5IF26p+KwAZHDlAB7462e2syY8xVOw8u7SEDE4a tU6HuBMdssfR8n1nQwbeQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:WiRvsIEdFqg=:9gaeqswd5f80Iuqc4oYe1w vvGrbajbKrpRT1bc5f6Z5fDuPc8/X7/n7TSDuQADyNuMeunGUnX7Y0A6DFOU5hmIDbjxLttZR G/LYw5LT+AY22l1MPpI9r6gYfDh/i+Nb1LV/XV8sCOB2Th/UwNGP6hxD4pRhT095H7kDqi1Ug zeR2LfTuSInY5exTzuUHXUb3nbXuzbTpQmxtP7aAAWCDj/qSoS4rvYldqWyVyff5XT9vDR745 fLkHAyUMMulWvvvaGDZ9KrXI4Vzio4VzdSyvlXj3xxKhGUvmyGHiGhQ2ewl/e0KwyuovZQkxE xzoS+qZyc0rbbVBF7ZF0SiJ55WC5BDog3ZsmSLP7b6ESRuO+a3nVDynQpxwzBgJzC6JVmGJSO 2Q5nAaRgjBc9qGx+3K64yu0ioMItEmGikN4NczlFTiUjVZfb+xgjmyjS47zeZj3Fap+m3yTnY Zg3utSkb+Zv/PioiCjCjZRE72MmpCW/7gcMy8aZF1zGZ+qcAyq46tysyHWzKSUB5FCrobn6Yn AmWKi/GvdPwV/iz7uwwL6YZuiLEpijT4R4LlCX6qp7ad0W0IZBh3SGlT3a7QmoD4atA01ZZnr 7Vxe3YWXP846Eb3cqrFYVrV65idFpHK+KcWVf3ZWPmH6sbSejacQLKzTEOwZ4wndovCEEKb7f sFhJBhcmIQ5ajkp0iL5G+F9+qFMnwtFJnxZ3qL3f6gfCQV7kfkmvxeMwuJTWWoPy687rUp7Aw JXeijonogLMo7gnaj6XdBpbPnN+WXDZqYlYkG0lN6QYkqXAFAPY2I/9uCFdihq59lk9Ji3Pu9 WbjnzSnHy+gEUJV+thPu8r29HTiDA4DgSIa6UNSdEen/4aIWeXU1ZnmF2VcECLZsqR07/Vp17 UVt4rV5yYPWLTJtbWjQA== Received-SPF: pass client-ip=212.227.15.14; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+qemu-devel=archiver.kernel.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 48f321b3e1..75993f903f 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -967,6 +967,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); @@ -1095,12 +1096,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 Tue Mar 23 17:57:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 12159077 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8065C433DB for ; Tue, 23 Mar 2021 18:59:33 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7E82C6198C for ; Tue, 23 Mar 2021 18:59:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E82C6198C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=web.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOmFY-0000K3-H8 for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 14:59:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOlI0-00023M-3Y for qemu-devel@nongnu.org; Tue, 23 Mar 2021 13:58:00 -0400 Received: from mout.web.de ([212.227.15.3]:40901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOlHx-0004Jx-Pg for qemu-devel@nongnu.org; Tue, 23 Mar 2021 13:57:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1616522273; bh=sjreKfuXJKhjrLHdD3bk4kmFtSJ8VoOxQGfzelxXDkc=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=mcMFUGRxWC6Lyov9s6gBjMo8SYzyxAuigz5xfBq11CGs9oDX7OWTbEWjVb/33wTVO J9+x7KJT4ZQC2Qcd0CLuzfjTqqIBb698NVmYxWvruiGWZ1KKEFHyqDMdQXBublulcf xd1dn8V1AVKnYQ1o8frVD2EOL7K6ui/RLAqnRTvM= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([88.130.61.81]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LlWVj-1lyvBf3Ecp-00bLXU; Tue, 23 Mar 2021 18:57:52 +0100 Date: Tue, 23 Mar 2021 18:57:51 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 4/4] chardev: Fix yank with the chardev-change case Message-ID: <209b759b2d3d06658f1c0660c47f1f8a5927ffe2.1616521487.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:/9Pbq5wQfrzhidEbtp2TPH4ws9aQQ3QKX5ggJQ0Qh3lx/xzT+8Z Ly+f3lnmG7/FZQmiw6mhiL5dU8EYaKBkDQFdWx6gM/ywBX7ZAahK6hERHsitF0e/VurhgPt LK4n3bPZlrRDM+bPAf0MgE26MH/8W0ifmJPoyODrYnWTQW3nXBdc12BCVfwnKC1B2omWs7t hWTyOkLQ2FLFaKJrXG4cw== X-UI-Out-Filterresults: notjunk:1;V03:K0:d3FCeYtkNCU=:BGjkRAYPWmyP8492yW0gR1 uSC2L7yewktciwaf/P83fgLWjsbwuCxGjK6PVCPgzaq26g9WMQGln8aEm97Pp3PFi3h8fUC5M HVqknLeENuJsWTU06gPq4P0UHMUyC2gwwbbE2k5Q7N1aZknPXiW9rKDpBkeKuU7PRlpOLpFrw qNyizWmyuW6YI0+QNljmxe7uvT8avZxgL2ct3XZ5vbKTS2qTW6vbmgEqQ7fuIoSY75KSCJaXg VxdkMXQhdp6Ko7uIfBl8NkCRIWCjwnUikWiq6X1EnEIvJ2YjpmmZA20Fj7W2P14L9QdIdSnCu bti8iv9Z4TbTci2p+tlU18mKTDVTq+3Z5kjPEne3okcDiugrReOqaI4WXc8dZeo2ENvBA6fo3 z1Db3Jt/uibpy8YX7a48kO5YWpbO01iuJaPqqk6ZhoXwLonTaSKPZ3MtL2Z6MDuq2gFNbR84f XCExztcKumt+B+aip1IZ27aUA2TUQtQpvxE7jwlnfLCua2kv+QCo09weHAFpDH1+7ughBFEYC zbh9a5BEqajn2QAr42aihVKIiQRLH06PW1Frmm03MS/jKuHe8oJyUlUu0pvdv5jHS/b1dUJA1 Jzw9CenfX33Muz7K3inF+XCDFOaRRKJa3yDRCqwMZtjla6Go4AskGNNhZn/fyG39FCcj2mAzb R7tF3JmShX7Ok6cq+QyWG6dSbf2plZs3fotaL2gIwLGMU0aoz3zoF/xnIkNmZojWYzxn+YiPe ZjJwHceNUvE4G918VF7mr3DGm6zwgdIkC3SnDzQ8hxk83a+0lNve8UMWtzC222qcuZRBPNzE1 NBAW2LBSOVVPgRu6IvaHt8lSDPRqLsiwNFCMCrN4XSeE0ONRxZGn9ZRAOaINdESRTocUC8pij g68J+AZs8apUt5er08CRtF4xU+Hg5V5INhwH6qkLa/CVnYD2jtcUCt0Z3PCFHp7JLZ5yYeXoN L+G8Ex8Zj0DgQ/YSXwt4ecFErPCCMj7b4AOqoKe0ukDGAHZPpD/R9wO4z3s/SUAogckExw6m5 mvNldzeMuAcXKveElzxUtWkn3bSIcjePnwRjOXBPhpaKQ5XOgZkgZw6vd6iOoxD9uQK4P1+nU uy48AEnGCJkQmsHfCrxrOIdkK64812H8GZ3PwqkMeKD+LG2ZC/912qy+rFRgj9YVSeJ2oHu9J qjD0dE5XxtFfebFJHqJDy6gKXIZ+kZXgQM/i3/m1kyAjWMcpvyd3j9HYLcm/3riAjVBG4= Received-SPF: pass client-ip=212.227.15.3; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+qemu-devel=archiver.kernel.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. If the initialization of the new chardev fails, it still has chr->handover_yank_instance set and won't unregister the yank instance when it is freed. 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 Tested-by: Li Zhang --- chardev/char-socket.c | 20 +++++++++++++++++--- chardev/char.c | 35 ++++++++++++++++++++++++++++------- include/chardev/char.h | 3 +++ 3 files changed, 48 insertions(+), 10 deletions(-) -- 2.30.2 diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 1d455ecca4..daa89fe5d1 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1126,7 +1126,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->handover_yank_instance) { + yank_unregister_instance(CHARDEV_YANK_INSTANCE(chr->label)); + } } qemu_chr_be_event(chr, CHR_EVENT_CLOSED); @@ -1424,8 +1430,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->handover_yank_instance) { + if (!yank_register_instance(CHARDEV_YANK_INSTANCE(chr->label), errp)) { + return; + } } s->registered_yank = true; @@ -1567,6 +1579,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 75993f903f..398f09df19 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,7 @@ static void char_init(Object *obj) { Chardev *chr = CHARDEV(obj); + chr->handover_yank_instance = false; chr->logfd = -1; qemu_mutex_init(&chr->chr_write_lock); @@ -959,6 +961,7 @@ void qemu_chr_set_feature(Chardev *chr, static Chardev *chardev_new(const char *id, const char *typename, ChardevBackend *backend, GMainContext *gcontext, + bool handover_yank_instance, Error **errp) { Object *obj; @@ -971,6 +974,7 @@ static Chardev *chardev_new(const char *id, const char *typename, obj = object_new(typename); chr = CHARDEV(obj); + chr->handover_yank_instance = handover_yank_instance; chr->label = g_strdup(id); chr->gcontext = gcontext; @@ -1004,7 +1008,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, false, errp); if (!chr) { return NULL; } @@ -1032,7 +1036,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, false, errp); if (!chr) { return NULL; } @@ -1057,9 +1061,10 @@ 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; + bool handover_yank_instance; ChardevReturn *ret; chr = qemu_chr_find(id); @@ -1091,13 +1096,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); + /* + * The new chardev should not register a yank instance if the current + * chardev has registered one already. + */ + handover_yank_instance = cc->supports_yank && cc_new->supports_yank; + + chr_new = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc_new)), + backend, chr->gcontext, handover_yank_instance, errp); if (!chr_new) { return NULL; } @@ -1121,6 +1133,15 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend, return NULL; } + /* change successfull, clean up */ + chr_new->handover_yank_instance = false; + + /* + * When the old chardev is freed, it should not unregister the yank + * instance if the new chardev needs it. + */ + chr->handover_yank_instance = handover_yank_instance; + 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..7c0444f90d 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -65,6 +65,8 @@ struct Chardev { char *filename; int logfd; int be_open; + /* used to coordinate the chardev-change special-case: */ + bool handover_yank_instance; GSource *gsource; GMainContext *gcontext; DECLARE_BITMAP(features, QEMU_CHAR_FEATURE_LAST); @@ -251,6 +253,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,