From nobody Sat Apr 11 20:05:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1775394757; cv=none; d=zohomail.com; s=zohoarc; b=K8Fc1H2MNYz8tWGKPf+rlqQCjrglU5zR9fIQKSucyMkd6ViUMOli3+wjfmHlzArnLmyDqenwwv6JRWleEjSBPd+TpOvT3lD5IzD8Yy/iImu5y5Muk+Srv1J+S0kPb8sPuAaYI92sewv+4V35cfpBAS9zr3OT4/nt7aDV1LZ3lLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775394757; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9jNTIFU0LjmXcaVXV4Hvb2MsKrwWfRM62oOGqAu/gD4=; b=TM3wurSyyqVX9EPLpcivigW18kZftKpTJI6CMFbTkwQcGqBE7i1cnZdnedC8r0ZTYUSxgY52tCHmLVwVmN8FfEfyHiyKDTRCfVvaSS1sc1z/g3IZrcP23Onic3zG1RBHzLAkwUF+cqv9BDHeHJRtaft8ZMh+H7OxMbLJK+UBtVU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775394757245370.723568856287; Sun, 5 Apr 2026 06:12:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w9NGr-0006in-W9; Sun, 05 Apr 2026 09:12:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w9NGV-0006WN-1n for qemu-devel@nongnu.org; Sun, 05 Apr 2026 09:11:47 -0400 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w9NGT-0006eH-3g for qemu-devel@nongnu.org; Sun, 05 Apr 2026 09:11:46 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 3FBE94410D; Sun, 5 Apr 2026 13:11:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D23E1C116C6; Sun, 5 Apr 2026 13:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775394704; bh=cP8XbmJh0GXQB9MuBcgRv0ncdejCpajjhdMyKSshUIc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YO/9Aj3DJ1JjNoVW6JEuye2rD+QiJ+tpF6E34Y7RpQmJVNB4Ssq1XVcn0GzRZwuPv 9lQn/Y1cygEWdRSTYgGsMmZUN3cuBzhmAMaQJ8HU8KOoepJs3yxP7+7jWCiLMWCLWF lr62FIUVkdcxNMIXUwk5VmDlXFKPUemLURYzfwikEfBOrsr7CPSj0m6CVhgP8kuB/3 DLESmKsU2ZA2H45fGzPiy3oNmJd05J9mLwxiV66fW4cIIVPMw7orgMYVlqG32uLuG6 Jod4yV5q+cYBpftHH0/miHHxE78KWKjm5klQkurXwUAHa9PChHs0vvZOyHvY6ddwt/ wzShQYKFrDkHw== From: Christian Brauner Date: Sun, 05 Apr 2026 15:11:20 +0200 Subject: [PATCH v2 4/5] tests/qtest: add tests for dynamic monitor add/remove MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260405-work-qmp-monitor-hotplug-v2-4-ad5bedd2917a@kernel.org> References: <20260405-work-qmp-monitor-hotplug-v2-0-ad5bedd2917a@kernel.org> In-Reply-To: <20260405-work-qmp-monitor-hotplug-v2-0-ad5bedd2917a@kernel.org> To: qemu-devel@nongnu.org Cc: Markus Armbruster , Eric Blake , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Christian Brauner X-Mailer: b4 0.16-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=7943; i=brauner@kernel.org; h=from:subject:message-id; bh=cP8XbmJh0GXQB9MuBcgRv0ncdejCpajjhdMyKSshUIc=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMWReim9at7b/kZ3QTuV7aSVpAWpnNabFyZ1ek6n7Nj3XM 2HenNPlHaUsDGJcDLJiiiwO7Sbhcst5KjYbZWrAzGFlAhnCwMUpABOZ3sPIMLmyZ0+efnRxd1zc XL5fNwseLeydJKzM13L11+b2z9KPXzP8D9i566fqnYarOt/sWbY7FCw9cjz2M0dB5YmS/9XpPup PeQE= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2600:3c0a:e001:78e:0:1991:8:25; envelope-from=brauner@kernel.org; helo=sea.source.kernel.org X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1775394760123154100 Test the monitor-add, monitor-remove, and query-monitors QMP commands: - Basic lifecycle: chardev-add -> monitor-add -> query-monitors -> monitor-remove -> chardev-remove - Error: duplicate monitor id - Error: monitor-remove on nonexistent id - Error: monitor-add with nonexistent chardev - Error: second monitor on same chardev (chardev already in use) - Error: monitor-remove on CLI-created monitor - Error: monitor-remove on HMP monitor - Re-add after remove: same id and chardev reusable after removal Signed-off-by: Christian Brauner (Amutable) --- tests/qtest/qmp-test.c | 185 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 185 insertions(+) diff --git a/tests/qtest/qmp-test.c b/tests/qtest/qmp-test.c index edf0886787..a493a812a9 100644 --- a/tests/qtest/qmp-test.c +++ b/tests/qtest/qmp-test.c @@ -337,6 +337,186 @@ static void test_qmp_missing_any_arg(void) qtest_quit(qts); } =20 +static void test_qmp_monitor_add_remove(void) +{ + QTestState *qts; + QDict *resp; + + qts =3D qtest_init(common_args); + + /* Create a null chardev for the dynamic monitor */ + resp =3D qtest_qmp(qts, + "{'execute': 'chardev-add'," + " 'arguments': {'id': 'monitor-chardev'," + " 'backend': {'type': 'null'," + " 'data': {}}}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Add a dynamic monitor */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-add'," + " 'arguments': {'id': 'dyn-mon'," + " 'chardev': 'monitor-chardev'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Verify it shows up in query-monitors */ + resp =3D qtest_qmp(qts, "{'execute': 'query-monitors'}"); + g_assert(!qdict_haskey(resp, "error")); + qobject_unref(resp); + + /* Error: duplicate id */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-add'," + " 'arguments': {'id': 'dyn-mon'," + " 'chardev': 'monitor-chardev'}}"); + qmp_expect_error_and_unref(resp, "GenericError"); + + /* Remove the dynamic monitor */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-remove'," + " 'arguments': {'id': 'dyn-mon'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Error: remove nonexistent */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-remove'," + " 'arguments': {'id': 'dyn-mon'}}"); + qmp_expect_error_and_unref(resp, "GenericError"); + + /* Add again after remove -- same id and chardev should work */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-add'," + " 'arguments': {'id': 'dyn-mon'," + " 'chardev': 'monitor-chardev'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Clean up */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-remove'," + " 'arguments': {'id': 'dyn-mon'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + resp =3D qtest_qmp(qts, + "{'execute': 'chardev-remove'," + " 'arguments': {'id': 'monitor-chardev'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + qtest_quit(qts); +} + +static void test_qmp_monitor_error_paths(void) +{ + QTestState *qts; + QDict *resp; + + qts =3D qtest_init(common_args); + + /* Error: chardev does not exist */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-add'," + " 'arguments': {'id': 'bad-mon'," + " 'chardev': 'nonexistent'}}"); + qmp_expect_error_and_unref(resp, "GenericError"); + + /* Error: remove nonexistent monitor */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-remove'," + " 'arguments': {'id': 'bogus'}}"); + qmp_expect_error_and_unref(resp, "GenericError"); + + qtest_quit(qts); +} + +static void test_qmp_monitor_chardev_in_use(void) +{ + QTestState *qts; + QDict *resp; + + qts =3D qtest_init(common_args); + + /* Create a null chardev */ + resp =3D qtest_qmp(qts, + "{'execute': 'chardev-add'," + " 'arguments': {'id': 'shared-chr'," + " 'backend': {'type': 'null'," + " 'data': {}}}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Attach first monitor */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-add'," + " 'arguments': {'id': 'mon-1'," + " 'chardev': 'shared-chr'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Error: second monitor on the same chardev */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-add'," + " 'arguments': {'id': 'mon-2'," + " 'chardev': 'shared-chr'}}"); + qmp_expect_error_and_unref(resp, "GenericError"); + + /* Clean up */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-remove'," + " 'arguments': {'id': 'mon-1'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + resp =3D qtest_qmp(qts, + "{'execute': 'chardev-remove'," + " 'arguments': {'id': 'shared-chr'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + qtest_quit(qts); +} + +static void test_qmp_monitor_remove_cli(void) +{ + QTestState *qts; + QDict *resp; + + /* Launch with a named CLI monitor on a null chardev */ + qts =3D qtest_initf("%s -chardev null,id=3Dcli-chr" + " -mon id=3Dcli-mon,chardev=3Dcli-chr,mode=3Dcontrol= ", + common_args); + + /* Error: monitor-remove must reject CLI-created monitors */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-remove'," + " 'arguments': {'id': 'cli-mon'}}"); + qmp_expect_error_and_unref(resp, "GenericError"); + + qtest_quit(qts); +} + +static void test_qmp_monitor_remove_hmp(void) +{ + QTestState *qts; + QDict *resp; + + qts =3D qtest_initf("%s -chardev null,id=3Dhmp-chr" + " -mon id=3Dhmp-mon,chardev=3Dhmp-chr,mode=3Dreadlin= e", + common_args); + + /* Error: monitor-remove must reject HMP monitors */ + resp =3D qtest_qmp(qts, + "{'execute': 'monitor-remove'," + " 'arguments': {'id': 'hmp-mon'}}"); + qmp_expect_error_and_unref(resp, "GenericError"); + + qtest_quit(qts); +} + int main(int argc, char *argv[]) { g_test_init(&argc, &argv, NULL); @@ -348,6 +528,11 @@ int main(int argc, char *argv[]) #endif qtest_add_func("qmp/preconfig", test_qmp_preconfig); qtest_add_func("qmp/missing-any-arg", test_qmp_missing_any_arg); + qtest_add_func("qmp/monitor-add-remove", test_qmp_monitor_add_remove); + qtest_add_func("qmp/monitor-error-paths", test_qmp_monitor_error_paths= ); + qtest_add_func("qmp/monitor-chardev-in-use", test_qmp_monitor_chardev_= in_use); + qtest_add_func("qmp/monitor-remove-cli", test_qmp_monitor_remove_cli); + qtest_add_func("qmp/monitor-remove-hmp", test_qmp_monitor_remove_hmp); =20 return g_test_run(); } --=20 2.47.3