From patchwork Mon Oct 23 20:35:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabiano Rosas X-Patchwork-Id: 1854025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=0KqVa5dR; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=qQ7pE7mM; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SDn9v0vtSz23jl for ; Tue, 24 Oct 2023 07:39:47 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qv1f2-0002k1-SB; Mon, 23 Oct 2023 16:36:28 -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 1qv1ey-0002it-Uw for qemu-devel@nongnu.org; Mon, 23 Oct 2023 16:36:25 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qv1ew-0001mz-MU for qemu-devel@nongnu.org; Mon, 23 Oct 2023 16:36:24 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 41BE721B27; Mon, 23 Oct 2023 20:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1698093379; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z6/HK5rLwaWV5PTzUS7sMhXDaBGHK8AaYqDlOVmMg0o=; b=0KqVa5dRR77WS8DeG989MiY1FL8PIT+QBSGOtxtc+/Ap1b4BpsfoonFTU4FPaBeN8PIB7o RTLd7L5RDH8GOQ6ZpLAMWqJG7wS7Qo37zpD6ztci8cGuvIj7QLLH+sqK33NC7z4FL7zJpm HZer3XqkfBwVgR0fW1q2RxV0LgtMjCE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1698093379; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z6/HK5rLwaWV5PTzUS7sMhXDaBGHK8AaYqDlOVmMg0o=; b=qQ7pE7mM7mhoj9VxyZjGukEoLql1kLGoQxiKY1zXdcTA9tzy66TXfq0JnJHtUkYxNHe02f 23qwSV2ybt9MiCCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B5AEB132FD; Mon, 23 Oct 2023 20:36:16 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CD3/H0DZNmV1JQAAMHmgww (envelope-from ); Mon, 23 Oct 2023 20:36:16 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: berrange@redhat.com, armbru@redhat.com, Juan Quintela , Peter Xu , Leonardo Bras , Claudio Fontana , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH v2 02/29] tests/qtest: Move QTestMigrationState to libqtest Date: Mon, 23 Oct 2023 17:35:41 -0300 Message-Id: <20231023203608.26370-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231023203608.26370-1-farosas@suse.de> References: <20231023203608.26370-1-farosas@suse.de> MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spam-Score: -2.10 X-Spamd-Result: default: False [-2.10 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_MISSING_CHARSET(2.50)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-3.00)[-1.000]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_SEVEN(0.00)[10]; MID_CONTAINS_FROM(1.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] Received-SPF: pass client-ip=195.135.220.28; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move the QTestMigrationState into QTestState so we don't have to pass it around to the wait_for_* helpers anymore. Since QTestState is private to libqtest.c, move the migration state struct to libqtest.h and add a getter. Signed-off-by: Fabiano Rosas --- tests/qtest/libqtest.c | 14 ++++++++++ tests/qtest/libqtest.h | 23 ++++++++++++++++ tests/qtest/migration-helpers.c | 18 +++++++++++++ tests/qtest/migration-helpers.h | 8 +++--- tests/qtest/migration-test.c | 47 +++++++++------------------------ 5 files changed, 72 insertions(+), 38 deletions(-) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index f33a210861..f7e85486dc 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -87,6 +87,7 @@ struct QTestState GList *pending_events; QTestQMPEventCallback eventCB; void *eventData; + QTestMigrationState *migration_state; }; static GHookList abrt_hooks; @@ -500,6 +501,8 @@ static QTestState *qtest_init_internal(const char *qemu_bin, s->irq_level[i] = false; } + s->migration_state = g_new0(QTestMigrationState, 1); + /* * Stopping QEMU for debugging is not supported on Windows. * @@ -601,6 +604,7 @@ void qtest_quit(QTestState *s) close(s->fd); close(s->qmp_fd); g_string_free(s->rx, true); + g_free(s->migration_state); for (GList *it = s->pending_events; it != NULL; it = it->next) { qobject_unref((QDict *)it->data); @@ -854,6 +858,11 @@ void qtest_qmp_set_event_callback(QTestState *s, s->eventData = opaque; } +void qtest_qmp_set_migration_callback(QTestState *s, QTestQMPEventCallback cb) +{ + qtest_qmp_set_event_callback(s, cb, s->migration_state); +} + QDict *qtest_qmp_event_ref(QTestState *s, const char *event) { while (s->pending_events) { @@ -1906,3 +1915,8 @@ bool mkimg(const char *file, const char *fmt, unsigned size_mb) return ret && !err; } + +QTestMigrationState *qtest_migration_state(QTestState *s) +{ + return s->migration_state; +} diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index 6e3d3525bf..0421a1da24 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -23,6 +23,20 @@ typedef struct QTestState QTestState; +struct QTestMigrationState { + bool stop_seen; + bool resume_seen; +}; +typedef struct QTestMigrationState QTestMigrationState; + +/** + * qtest_migration_state: + * @s: #QTestState instance to operate on. + * + * Returns: #QTestMigrationState instance. + */ +QTestMigrationState *qtest_migration_state(QTestState *s); + /** * qtest_initf: * @fmt: Format for creating other arguments to pass to QEMU, formatted @@ -288,6 +302,15 @@ typedef bool (*QTestQMPEventCallback)(QTestState *s, const char *name, void qtest_qmp_set_event_callback(QTestState *s, QTestQMPEventCallback cb, void *opaque); +/** + * qtest_qmp_set_migration_callback: + * @s: #QTestSTate instance to operate on + * @cb: callback to invoke for events + * + * Like qtest_qmp_set_event_callback, but includes migration state events + */ +void qtest_qmp_set_migration_callback(QTestState *s, QTestQMPEventCallback cb); + /** * qtest_qmp_eventwait: * @s: #QTestState instance to operate on. diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c index fd3b94efa2..cffa525c81 100644 --- a/tests/qtest/migration-helpers.c +++ b/tests/qtest/migration-helpers.c @@ -92,6 +92,24 @@ void migrate_set_capability(QTestState *who, const char *capability, capability, value); } +void wait_for_stop(QTestState *who) +{ + QTestMigrationState *state = qtest_migration_state(who); + + if (!state->stop_seen) { + qtest_qmp_eventwait(who, "STOP"); + } +} + +void wait_for_resume(QTestState *who) +{ + QTestMigrationState *state = qtest_migration_state(who); + + if (!state->resume_seen) { + qtest_qmp_eventwait(who, "RESUME"); + } +} + void migrate_incoming_qmp(QTestState *to, const char *uri, const char *fmt, ...) { va_list ap; diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h index c1d4c84995..7297f1ff2c 100644 --- a/tests/qtest/migration-helpers.h +++ b/tests/qtest/migration-helpers.h @@ -15,13 +15,13 @@ #include "libqtest.h" -typedef struct QTestMigrationState { - bool stop_seen, resume_seen; -} QTestMigrationState; - bool migrate_watch_for_events(QTestState *who, const char *name, QDict *event, void *opaque); + +void wait_for_stop(QTestState *who); +void wait_for_resume(QTestState *who); + G_GNUC_PRINTF(3, 4) void migrate_qmp(QTestState *who, const char *uri, const char *fmt, ...); diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 0425d1d527..88e611e98f 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -43,8 +43,6 @@ unsigned start_address; unsigned end_address; static bool uffd_feature_thread_id; -static QTestMigrationState src_state; -static QTestMigrationState dst_state; /* * An initial 3 MB offset is used as that corresponds @@ -230,13 +228,6 @@ static void wait_for_serial(const char *side) } while (true); } -static void wait_for_stop(QTestState *who, QTestMigrationState *state) -{ - if (!state->stop_seen) { - qtest_qmp_eventwait(who, "STOP"); - } -} - /* * It's tricky to use qemu's migration event capability with qtest, * events suddenly appearing confuse the qmp()/hmp() responses. @@ -290,8 +281,9 @@ static void read_blocktime(QTestState *who) static void wait_for_migration_pass(QTestState *who) { uint64_t pass, prev_pass = 0, changes = 0; + QTestMigrationState *state = qtest_migration_state(who); - while (changes < 2 && !src_state.stop_seen) { + while (changes < 2 && !state->stop_seen) { usleep(1000); pass = get_migration_pass(who); changes += (pass != prev_pass); @@ -622,7 +614,7 @@ static void migrate_postcopy_start(QTestState *from, QTestState *to) { qtest_qmp_assert_success(from, "{ 'execute': 'migrate-start-postcopy' }"); - wait_for_stop(from, &src_state); + wait_for_stop(from); qtest_qmp_eventwait(to, "RESUME"); } @@ -757,9 +749,6 @@ static int test_migrate_start(QTestState **from, QTestState **to, } } - dst_state = (QTestMigrationState) { }; - src_state = (QTestMigrationState) { }; - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { memory_size = "150M"; @@ -849,9 +838,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, ignore_stderr); if (!args->only_target) { *from = qtest_init_with_env(QEMU_ENV_SRC, cmd_source); - qtest_qmp_set_event_callback(*from, - migrate_watch_for_events, - &src_state); + qtest_qmp_set_migration_callback(*from, migrate_watch_for_events); } cmd_target = g_strdup_printf("-accel kvm%s -accel tcg " @@ -870,9 +857,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, args->opts_target ? args->opts_target : "", ignore_stderr); *to = qtest_init_with_env(QEMU_ENV_DST, cmd_target); - qtest_qmp_set_event_callback(*to, - migrate_watch_for_events, - &dst_state); + qtest_qmp_set_migration_callback(*to, migrate_watch_for_events); /* * Remove shmem file immediately to avoid memory leak in test failed case. @@ -1622,7 +1607,7 @@ static void test_precopy_common(MigrateCommon *args) */ if (args->result == MIG_TEST_SUCCEED) { qtest_qmp_assert_success(from, "{ 'execute' : 'stop'}"); - wait_for_stop(from, &src_state); + wait_for_stop(from); migrate_ensure_converge(from); } } @@ -1668,7 +1653,7 @@ static void test_precopy_common(MigrateCommon *args) */ wait_for_migration_complete(from); - wait_for_stop(from, &src_state); + wait_for_stop(from); } else { wait_for_migration_complete(from); @@ -1682,10 +1667,7 @@ static void test_precopy_common(MigrateCommon *args) qtest_qmp_assert_success(to, "{ 'execute' : 'cont'}"); } - if (!dst_state.resume_seen) { - qtest_qmp_eventwait(to, "RESUME"); - } - + wait_for_resume(to); wait_for_serial("dest_serial"); } @@ -1723,7 +1705,7 @@ static void test_file_common(MigrateCommon *args, bool stop_src) if (stop_src) { qtest_qmp_assert_success(from, "{ 'execute' : 'stop'}"); - wait_for_stop(from, &src_state); + wait_for_stop(from); } if (args->result == MIG_TEST_QMP_ERROR) { @@ -1745,10 +1727,7 @@ static void test_file_common(MigrateCommon *args, bool stop_src) qtest_qmp_assert_success(to, "{ 'execute' : 'cont'}"); } - if (!dst_state.resume_seen) { - qtest_qmp_eventwait(to, "RESUME"); - } - + wait_for_resume(to); wait_for_serial("dest_serial"); finish: @@ -1866,7 +1845,7 @@ static void test_ignore_shared(void) migrate_wait_for_dirty_mem(from, to); - wait_for_stop(from, &src_state); + wait_for_stop(from); qtest_qmp_eventwait(to, "RESUME"); @@ -2376,7 +2355,7 @@ static void test_migrate_auto_converge(void) break; } usleep(20); - g_assert_false(src_state.stop_seen); + g_assert_false(qtest_migration_state(from)->stop_seen); } while (true); /* The first percentage of throttling should be at least init_pct */ g_assert_cmpint(percentage, >=, init_pct); @@ -2715,7 +2694,7 @@ static void test_multifd_tcp_cancel(void) migrate_ensure_converge(from); - wait_for_stop(from, &src_state); + wait_for_stop(from); qtest_qmp_eventwait(to2, "RESUME"); wait_for_serial("dest_serial");