From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CE0B9C88E6E for ; Mon, 14 Sep 2026 15:35:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x68iD-0001bH-EV; Mon, 14 Sep 2026 11:35:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x68hy-0001Ia-RR for qemu-devel@nongnu.org; Mon, 14 Sep 2026 11:35:05 -0400 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x68hw-0000ES-2W for qemu-devel@nongnu.org; Mon, 14 Sep 2026 11:35:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=Content-Type:MIME-Version:Message-ID:Subject:From:Date:From :Subject; bh=6ELbbHyFlma1qkTD+ceiZ+ayaLa5sbo29KiR8lHXaPg=; b=E7u1BjOZxDNo396v DplxzOB0SwWJI5eV8mzFrfRS8zDIMkn588JWFaxjDTOOo3q3NFuF9T9lsIUP8XU6T9XlRWJpYba0C 8pn9X9EQAJlyh7eL0u/E4WrT8l5XE4sTV5lco0YyDyjB4dCgNptCY9gQ98BSyz/n2JgHHejICb7zy UmRcP3JYJapiRGQFcK1g7rn+L8qNpIDDfHQH7/Of3DeN2eSJclflb8srkeZy+ucYeWlrogsylmtjH W0OzDMIaYL9cnq8+jTKvaE16DqnRudWTKBfmTDQC8kqCxSLQQ0v1YTy7JsCgvxOVP7Ogm64WRRjEQ d4d4C0ot4ookx/u9CA==; Received: from dg by mx.treblig.org with local (Exim 4.98.2) (envelope-from ) id 1x68hq-00000000SZU-25rH; Mon, 14 Sep 2026 15:34:54 +0000 Date: Mon, 14 Sep 2026 15:34:54 +0000 From: "Dr. David Alan Gilbert" To: Fabiano Rosas Cc: qemu-devel@nongnu.org, Peter Xu , Markus Armbruster , Laurent Vivier , Paolo Bonzini Subject: Re: [PATCH v2 09/18] tests/qtest/migration: Add a test for HMP Message-ID: References: <20260909214509.237309-1-farosas@suse.de> <20260909214509.237309-10-farosas@suse.de> <875x07ubse.fsf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <875x07ubse.fsf@suse.de> X-Chocolate: 70 percent or better cocoa solids preferably X-Operating-System: Linux/6.12.107+deb13-amd64 (x86_64) X-Uptime: 15:31:12 up 2 days, 3:16, 2 users, load average: 0.00, 0.01, 0.00 User-Agent: Mutt/2.2.13 (2024-03-09) Received-SPF: pass client-ip=2a00:1098:5b::1; envelope-from=dg@treblig.org; helo=mx.treblig.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org * Fabiano Rosas (farosas@suse.de) wrote: > "Dr. David Alan Gilbert" writes: > Thanks for the reviews! > > > Two minor thoughts: > > a) You might try a numeric out of range test? > > I will, but allow me to do it as a follow-up, otherwise this series will > drag on for too long. Sure > > b) 'input1' and 'input2' seem odd names for something that oculd be .name and .value ? > > (But only if you need to rework anyway). > > > > Oh, it's because the completion test has different semantics for them > and this used to be a single patch. Ah ok. Generally a comment (for the series) is that you seem to have a lot of string and buffer and file manipulation stuff that feels like it should be more general; just keep an eye out for anything that exists you can re/mis use. Dave > > Dave > > > >> --- > >> tests/qtest/migration/misc-tests.c | 201 +++++++++++++++++++++++++++++ > >> 1 file changed, 201 insertions(+) > >> > >> diff --git a/tests/qtest/migration/misc-tests.c b/tests/qtest/migration/misc-tests.c > >> index 4e0deb7f18..533cf3d55d 100644 > >> --- a/tests/qtest/migration/misc-tests.c > >> +++ b/tests/qtest/migration/misc-tests.c > >> @@ -22,6 +22,203 @@ > >> > >> static char *tmpfs; > >> > >> +#ifdef CONFIG_HMP > >> +static int test_case_line; > >> + > >> +#define TEST(i1, i2, e) { i1, i2, e , .line = __LINE__, } > >> +#define SKIP(i1, i2, e) { i1, i2, e , .skip = true, } > >> +#define BG_SNAP_MSG ("Error: Background-snapshot is not compatible with " \ > >> + "currently set capabilities") > >> + > >> +typedef struct HMPTestData { > >> + const char *input1; > >> + const char *input2; > >> + const char *output1; > >> + bool skip; > >> + int line; > >> +} HMPTestData; > >> + > >> +/* > >> + * .input1: string to be used as parameter name > >> + * .input2: string to be used as parameter value > >> + * .output1: expected output of migrate_set_parameters > >> + * E.g: > >> + * (qemu) migrate_set_parameters .input1 .input2 > >> + * .output1 > >> + */ > >> +HMPTestData test_cases[] = { > >> + TEST("", "", "migrate_set_parameter: string expected"), > >> + TEST("foo", "", "migrate_set_parameter: string expected"), > >> + TEST("foo", "on", "Error: invalid parameter value: foo"), > >> + > >> + /* bool */ > >> + TEST("cpu-throttle-tailslow", "on", "on"), > >> + TEST("direct-io", "on", "on"), > >> + > >> + /* uint64_t */ > >> + TEST("announce-initial", "60", "60 ms"), > >> + TEST("announce-max", "600", "600 ms"), > >> + TEST("announce-rounds", "6", "6"), > >> + TEST("announce-step", "15", "15 ms"), > >> + TEST("downtime-limit", "400", "400 ms"), > >> + TEST("avail-switchover-bandwidth", "2097152", "2199023255552 bytes/second"), > >> + TEST("max-bandwidth", "9876543", "10356305952768 bytes/second"), > >> + TEST("max-postcopy-bandwidth", "1048576", "1048576 bytes/second"), > >> + TEST("vcpu-dirty-limit", "20", "20 MB/s"), > >> + TEST("x-rdma-chunk-size", "1048576", "1048576 bytes"), > >> + TEST("x-vcpu-dirty-limit-period", "750", "750 ms"), > >> + TEST("xbzrle-cache-size", "67108864", "67108864 bytes"), > >> + > >> + /* uint32_t */ > >> + TEST("x-checkpoint-delay", "5000", "5000 ms"), > >> + > >> + /* uint8_t */ > >> + TEST("cpu-throttle-increment", "15", "15"), > >> + TEST("cpu-throttle-initial", "25", "25"), > >> + TEST("max-cpu-throttle", "85", "85"), > >> + TEST("multifd-channels", "8", "8"), > >> + TEST("throttle-trigger-threshold", "65", "65"), > >> + > >> + /* complex types */ > >> + TEST("mode", "cpr-exec", "cpr-exec"), > >> + TEST("multifd-compression", "zlib", "zlib"), > >> + TEST("zero-page-detection", "none", "none"), > >> + TEST("tls-authz", "my_authz", "'my_authz'"), > >> + TEST("tls-creds", "null", "'null'"), > >> + TEST("tls-hostname", "localhost", "'localhost'"), > >> + TEST("cpr-exec-command", "/bin/true foobar", "/bin/true foobar"), > >> + > >> + /* can be set but are currently missing in the query output */ > >> + SKIP("multifd-qatzip-level", "5", "5"), > >> + SKIP("multifd-zlib-level", "4", "4"), > >> + SKIP("multifd-zstd-level", "6", "6"), > >> + > >> + /* cannot be set */ > >> + TEST("block-bitmap-mapping", "[]", > >> + "Error: The block-bitmap-mapping parameter " > >> + "can only be set through QMP"), > >> +}; > >> + > >> +/* > >> + * Find a contiguous run of tokens in @larger that match the sequence > >> + * of tokens in @smaller, ignoring mismatches due to sequences of > >> + * empty tokens. > >> + * > >> + * Returns whether a match was found. @last is set if at least one > >> + * token has matched. > >> + */ > >> +static bool token_list_is_substr(char **smaller, char **larger, int *last) > >> +{ > >> + int i, j, k = 0; > >> + bool match = false; > >> + > >> + for (i = 0; smaller[i]; i++) { > >> + for (j = k; larger[j]; j++) { > >> + if (!*larger[j]) { > >> + continue; > >> + } > >> + > >> + /* readline adds several escape sequences */ > >> + if (*larger[j] == '\033') { > >> + continue; > >> + } > >> + > >> + if (g_str_equal(larger[j], smaller[i])) { > >> + match = true; > >> + *last = j; > >> + k = j + 1; > >> + break; > >> + } > >> + > >> + if (match) { > >> + return false; > >> + } else { > >> + match = false; > >> + } > >> + } > >> + } > >> + > >> + return match; > >> +} > >> + > >> +static void assert_hmp_match_line(const char *str, const char *text) > >> +{ > >> + g_auto(GStrv) tok_str = g_strsplit_set(str, " ", -1); > >> + g_auto(GStrv) lines = g_strsplit_set(text, " \r\n", -1); > >> + int i, idx = -1; > >> + > >> + /* > >> + * Note that the reason the 'str' above is split is to allow > >> + * token_list_is_substr() to first match on the parameter name so > >> + * matching can stop immediately after a mismatched value is > >> + * found. This provides a better output for failing test cases > >> + * than simply "str != line". > >> + */ > >> + > >> + for (i = 0; lines[i]; i++) { > >> + if (token_list_is_substr(tok_str, (char **)&lines[i], &idx)) { > >> + return; > >> + } > >> + > >> + if (idx >= 0) { > >> + break; > >> + } > >> + } > >> + > >> + g_test_message("HMP output mismatch for entry at line %d:", test_case_line); > >> + g_test_message("expected vs. found:\n\n%s\n---\n%s %s", str, lines[idx], > >> + lines[idx + 1]); > >> + g_assert_not_reached(); > >> +} > >> + > >> +static void assert_hmp_success(const char *str) > >> +{ > >> + if (!g_str_equal(str, "")) { > >> + g_test_message("HMP command failed:\n\n%s", str); > >> + g_assert_not_reached(); > >> + } > >> +} > >> + > >> +static void test_hmp_migration_parameters(char *name, MigrateCommon *args) > >> +{ > >> + QTestState *qts; > >> + > >> + /* force TCG so it can run in all targets */ > >> + qts = qtest_init("-accel tcg -nodefaults -S"); > >> + > >> + for (int i = 0; i < G_N_ELEMENTS(test_cases); i++) { > >> + g_autofree char *resp = NULL; > >> + g_autofree char *line = NULL; > >> + struct HMPTestData *t = &test_cases[i]; > >> + > >> + if (t->skip) { > >> + continue; > >> + } > >> + > >> + test_case_line = t->line; > >> + > >> + resp = qtest_hmp(qts, "migrate_set_parameter %s %s", t->input1, > >> + t->input2); > >> + > >> + if (g_str_has_prefix(t->output1, "Error:") || > >> + g_str_has_prefix(resp, "migrate_set_parameter:")) { > >> + > >> + assert_hmp_match_line(t->output1, resp); > >> + continue; > >> + } > >> + assert_hmp_success(resp); > >> + g_free(resp); > >> + > >> + resp = qtest_hmp(qts, "info migrate_parameters"); > >> + > >> + line = g_strconcat(t->input1, ": ", t->output1, NULL); > >> + assert_hmp_match_line(line, resp); > >> + } > >> + > >> + qtest_quit(qts); > >> +} > >> +#endif /* CONFIG_HMP */ > >> + > >> static void test_baddest(char *name, MigrateCommon *args) > >> { > >> QTestState *from, *to; > >> @@ -260,4 +457,8 @@ void migration_test_add_misc(MigrationTestEnv *env) > >> test_validate_uri_channels_both_set); > >> migration_test_add("/migration/validate_uri/channels/none_set", > >> test_validate_uri_channels_none_set); > >> +#ifdef CONFIG_HMP > >> + migration_test_add("/migration/hmp/parameters", > >> + test_hmp_migration_parameters); > >> +#endif > >> } > >> -- > >> 2.53.0 > >> -- -----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/