From patchwork Thu Dec 7 15:58:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabiano Rosas X-Patchwork-Id: 1873287 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=ypttE4sC; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=8ei06WNt; 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 4SmJqf381Lz23yf for ; Fri, 8 Dec 2023 02:59:26 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBGlu-0000Dw-9r; Thu, 07 Dec 2023 10:58:42 -0500 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 1rBGlb-0000Bl-As for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:23 -0500 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBGlZ-0007Ej-FM for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:23 -0500 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C9E19220B7; Thu, 7 Dec 2023 15:58:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701964699; 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=T4b3KsoKj14covOlKePkH9uAYMEAWOoAnWXTMbP3a5k=; b=ypttE4sC96bREs7QWPIlHUyz21/vZ4AOlO7w7uYPYyhmJQLwFOx7HTEqfoO5OLSolZOI7s zJhg7tUmA8KO7r9ah76VcR1LGWwihfs+Fug1mOZsx3FZCWVvEJuJs9mmnuZirerxTSvHwn smS1QxRj87pvz2OKS8dhDCvXCPgpZtE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701964699; 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=T4b3KsoKj14covOlKePkH9uAYMEAWOoAnWXTMbP3a5k=; b=8ei06WNtg2D2EPLKmoI7GNV7wGxqEfElt/XRx1qQ9maf18ptkAK93VeWvEeSkokg6whvJw 0hJ3iCqFGN+NdZCA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4F1E813B6A; Thu, 7 Dec 2023 15:58:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id KJgHBpnrcWXDVgAAD6G6ig (envelope-from ); Thu, 07 Dec 2023 15:58:17 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Juan Quintela , Peter Xu , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 2/5] tests/qtest/migration: Add infrastructure to skip tests on older QEMUs Date: Thu, 7 Dec 2023 12:58:06 -0300 Message-Id: <20231207155809.25673-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231207155809.25673-1-farosas@suse.de> References: <20231207155809.25673-1-farosas@suse.de> MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spam-Score: 0.70 X-Spamd-Result: default: False [0.70 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCPT_COUNT_SEVEN(0.00)[9]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] Received-SPF: pass client-ip=2a07:de40:b251:101:10:150:64:1; 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, T_SCC_BODY_TEXT_LINE=-0.01 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 We can run the migration tests with two different QEMU binaries to test migration compatibility between QEMU versions. This means we'll be running the tests with an older QEMU in either source or destination. We need to avoid trying to test functionality that is unknown to the older QEMU. This could mean new features, bug fixes, error message changes, QEMU command line changes, migration API changes, etc. Add a 'since' argument to the tests that inform when the functionality that is being test has been added to QEMU so we can skip the test on older versions. Also add a version comparison function so we can adapt test code depending on the QEMU binary version being used. Signed-off-by: Fabiano Rosas --- tests/qtest/migration-helpers.c | 11 +++++++++++ tests/qtest/migration-helpers.h | 1 + tests/qtest/migration-test.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c index 24fb7b3525..d21f5cd8c0 100644 --- a/tests/qtest/migration-helpers.c +++ b/tests/qtest/migration-helpers.c @@ -292,3 +292,14 @@ char *resolve_machine_version(const char *alias, const char *var1, return find_common_machine_version(machine_name, var1, var2); } + +int migration_vercmp(QTestState *who, const char *tgt_version) +{ + int major, minor, micro; + g_autofree char *version = NULL; + + qtest_query_version(who, &major, &minor, µ); + version = g_strdup_printf("%d.%d.%d", major, minor, micro); + + return strcmp(version, tgt_version); +} diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h index e31dc85cc7..7b4f8e851e 100644 --- a/tests/qtest/migration-helpers.h +++ b/tests/qtest/migration-helpers.h @@ -47,4 +47,5 @@ char *find_common_machine_version(const char *mtype, const char *var1, const char *var2); char *resolve_machine_version(const char *alias, const char *var1, const char *var2); +int migration_vercmp(QTestState *who, const char *tgt_version); #endif /* MIGRATION_HELPERS_H */ diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 0fbaa6a90f..b3ce288a73 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -637,6 +637,12 @@ typedef struct { bool use_dirty_ring; const char *opts_source; const char *opts_target; + /* + * If a test checks against new functionality that might not be + * present in older QEMUs this needs to be set so we can skip + * running it when doing compatibility testing. + */ + const char *since; } MigrateStart; /* @@ -850,6 +856,17 @@ static int test_migrate_start(QTestState **from, QTestState **to, qtest_qmp_set_event_callback(*from, migrate_watch_for_stop, &got_src_stop); + + if (args->since && migration_vercmp(*from, args->since) < 0) { + g_autofree char *msg = NULL; + + msg = g_strdup_printf("Test requires at least QEMU version %s", + args->since); + g_test_skip(msg); + qtest_quit(*from); + + return -1; + } } cmd_target = g_strdup_printf("-accel kvm%s -accel tcg " @@ -872,6 +889,17 @@ static int test_migrate_start(QTestState **from, QTestState **to, migrate_watch_for_resume, &got_dst_resume); + if (args->since && migration_vercmp(*to, args->since) < 0) { + g_autofree char *msg = NULL; + + msg = g_strdup_printf("Test requires at least QEMU version %s", + args->since); + g_test_skip(msg); + qtest_quit(*to); + + return -1; + } + /* * Remove shmem file immediately to avoid memory leak in test failed case. * It's valid because QEMU has already opened this file