From nobody Wed Nov 27 00:43:08 2024 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=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1701964756; cv=none; d=zohomail.com; s=zohoarc; b=esdssnjoPIqOx/5YYolVKbS9ckcK0ErywcQW3TIfcKt3ymYT6VhtBbRqUlT5reBvF7nxYp6Supx4rm8R+btPNaQEKPtRt9LXGktQebrAADfzfCfO4Re8EenNocDQ51THDX9AZ3G64JHN+nghp3hK81ynTRLS22wDjdVNbeIn3HQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701964756; h=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=GXlVKxAEzxwStXFlgc6yUq0QevzR9UkhEfJIwxqvs5Y=; b=g2L9zQSpPRW2fWimZLwFMz3x5GKJePyv/cjGnGDan08Ck/6HFF8xh6AeIjXA792vJwkN36hazJtmqetL9vU4BLZ7a7zRW09morBdR9p6Slp2muWk8f7g+wEQp0dOL/dTtK6GnW7lwGYAOCv5qOn4F5lz9sVBZeuX1p5LeaqSgdI= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701964756043724.8541644487564; Thu, 7 Dec 2023 07:59:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBGls-0000Dj-8l; Thu, 07 Dec 2023 10:58:40 -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 1rBGlZ-0000B3-J0 for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:21 -0500 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBGlW-0007Cs-Qf for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:21 -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-out2.suse.de (Postfix) with ESMTPS id D18D81FB68; Thu, 7 Dec 2023 15:58:16 +0000 (UTC) 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 5390413B6A; Thu, 7 Dec 2023 15:58:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id OMUAB5brcWXDVgAAD6G6ig (envelope-from ); Thu, 07 Dec 2023 15:58:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701964696; 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=GXlVKxAEzxwStXFlgc6yUq0QevzR9UkhEfJIwxqvs5Y=; b=Ebk2urIfnyf4JJMaSNte0qh4VduLgNra5aaZ8dQf7reJv7ZSszqtQnh0D0SepvDK36qPuE JlbIQ0XW6xX2xzpubjAlHTBMb08IhFzLa7zM3vJkg6MSyUoet/lOGJM4sFbhM8sspKoNv9 nNs+AP0s9g+d/5PrTLJ25AT0rKyF6JI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701964696; 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=GXlVKxAEzxwStXFlgc6yUq0QevzR9UkhEfJIwxqvs5Y=; b=t2PR7f8/wd92BRdZG9xv/ll7VvNtiNFm1DT1ewvQZeYG871X7DsnQg2XH5mwFSidrakrHq 1/irYFVCV3cSKnBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701964696; 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=GXlVKxAEzxwStXFlgc6yUq0QevzR9UkhEfJIwxqvs5Y=; b=Ebk2urIfnyf4JJMaSNte0qh4VduLgNra5aaZ8dQf7reJv7ZSszqtQnh0D0SepvDK36qPuE JlbIQ0XW6xX2xzpubjAlHTBMb08IhFzLa7zM3vJkg6MSyUoet/lOGJM4sFbhM8sspKoNv9 nNs+AP0s9g+d/5PrTLJ25AT0rKyF6JI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701964696; 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=GXlVKxAEzxwStXFlgc6yUq0QevzR9UkhEfJIwxqvs5Y=; b=t2PR7f8/wd92BRdZG9xv/ll7VvNtiNFm1DT1ewvQZeYG871X7DsnQg2XH5mwFSidrakrHq 1/irYFVCV3cSKnBw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Juan Quintela , Peter Xu , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 1/5] tests/qtest: Add a helper to query the QEMU version Date: Thu, 7 Dec 2023 12:58:05 -0300 Message-Id: <20231207155809.25673-2-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 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 3.16 Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 1.70 X-Spamd-Result: default: False [1.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(-2.00)[95.07%] 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=195.135.223.131; envelope-from=farosas@suse.de; helo=smtp-out2.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1701964757830100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fabiano Rosas Reviewed-by: Thomas Huth --- tests/qtest/libqtest.c | 24 ++++++++++++++++++++++++ tests/qtest/libqtest.h | 10 ++++++++++ 2 files changed, 34 insertions(+) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index f33a210861..7cee68a834 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -337,6 +337,30 @@ void qtest_remove_abrt_handler(void *data) } } =20 +void qtest_query_version(QTestState *who, int *major, int *minor, int *mic= ro) +{ + QDict *rsp, *version; + + rsp =3D qtest_qmp_assert_success_ref(who, "{ 'execute': 'query-version= ' }"); + g_assert(rsp); + + version =3D qdict_get_qdict(rsp, "qemu"); + + if (major) { + *major =3D qdict_get_int(version, "major"); + } + + if (minor) { + *minor =3D qdict_get_int(version, "minor"); + } + + if (micro) { + *micro =3D qdict_get_int(version, "micro"); + } + + qobject_unref(rsp); +} + static const char *qtest_qemu_binary(const char *var) { const char *qemu_bin; diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index 6e3d3525bf..db7a780d26 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -1085,4 +1085,14 @@ bool have_qemu_img(void); */ bool mkimg(const char *file, const char *fmt, unsigned size_mb); =20 +/** + * qtest_query_version: + * @who: QTestState instance to operate on + * @major: Pointer to where to store the major version number + * @minor: Pointer to where to store the minor version number + * @micro: Pointer to where to store the micro version number + * + */ +void qtest_query_version(QTestState *who, int *major, int *minor, int *mic= ro); + #endif --=20 2.35.3 From nobody Wed Nov 27 00:43:08 2024 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=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1701964765; cv=none; d=zohomail.com; s=zohoarc; b=I8LjMxugb01OlzTtx7J+ei4Q2gNzuWdjyx838WnHsYo0B0CEo7OGjVT1zKqL2zyceYS5sYXSgaRBLA5NBudRF/6fOgYTNjzSx/TAUYw9TVASYESKI0lfs7k//wjOdzuR1KHsWZNR1mlBcXKAMqAIusuFFrlanzz6s8BD/2G/HP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701964765; h=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=T4b3KsoKj14covOlKePkH9uAYMEAWOoAnWXTMbP3a5k=; b=TfACxuDdmw8PWiK0DY/0qlBAwypGNogOB9A01qZ9BBVLZw9TNKionhbW1oncg7w3GWdv7Sho25CDQmQ4pe5ENiOvIVJpSmGcLU12JBh0Vdc40Qi7V/7CVStOhmkIrP8+Ngsk/Y25AzJkV2wT5GRxx07cWCCJcXi+C84l62M4+Dc= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701964765627817.1560320948116; Thu, 7 Dec 2023 07:59:25 -0800 (PST) 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) 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 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== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Juan Quintela , Peter Xu , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-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 Content-Transfer-Encoding: quoted-printable 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 (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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1701964766049100003 Content-Type: text/plain; charset="utf-8" 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-helper= s.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, =20 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 =3D NULL; + + qtest_query_version(who, &major, &minor, µ); + version =3D 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-helper= s.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, cons= t 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; =20 /* @@ -850,6 +856,17 @@ static int test_migrate_start(QTestState **from, QTest= State **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 =3D NULL; + + msg =3D g_strdup_printf("Test requires at least QEMU version %= s", + args->since); + g_test_skip(msg); + qtest_quit(*from); + + return -1; + } } =20 cmd_target =3D g_strdup_printf("-accel kvm%s -accel tcg " @@ -872,6 +889,17 @@ static int test_migrate_start(QTestState **from, QTest= State **to, migrate_watch_for_resume, &got_dst_resume); =20 + if (args->since && migration_vercmp(*to, args->since) < 0) { + g_autofree char *msg =3D NULL; + + msg =3D 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 c= ase. * It's valid because QEMU has already opened this file --=20 2.35.3 From nobody Wed Nov 27 00:43:08 2024 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=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1701964768; cv=none; d=zohomail.com; s=zohoarc; b=IRNo9itKY0IuLCMdv+KUnD+U3LZoJz5IkWHFuGDBkqirWpzqJwQi6MC3SU9SQju8OLf4IWhhkvpnAPQgNYPgX+31nMACZYAOLh+8t2qWrRzVCEQl057FSOK9OFkQifGxyLnuCQtk/Z6d0VS+7meWVTOrHaWmzJenCpTyEFMquhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701964768; h=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=MaScGdicoRo8t6G0OgtEynTGHpaFIjjE8+S0lN8XEi8=; b=beVWXavlVxFrk7+e7nIkjOs10hZfHG/1skyMl5ClEnJFCLNvYyxh7pP2CqoyDGq04RDcBxMZwI0rojrPT6YjkYd4Bkh3HHvv3vWnxMuc58BhDp2cSCJbsybM+DjnDI8bHhb6Qoes3u1PtmmdfH/GKW2GH8YuzY1U6/sWamTgn7c= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701964768319682.5334586875637; Thu, 7 Dec 2023 07:59:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBGlt-0000Do-AA; Thu, 07 Dec 2023 10:58:41 -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 1rBGli-0000CM-K4 for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:30 -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 1rBGlc-0007JW-To for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:30 -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 BD8E1220B6; Thu, 7 Dec 2023 15:58:22 +0000 (UTC) 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 44BDD13B6A; Thu, 7 Dec 2023 15:58:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id kM+DA5zrcWXDVgAAD6G6ig (envelope-from ); Thu, 07 Dec 2023 15:58:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701964702; 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=MaScGdicoRo8t6G0OgtEynTGHpaFIjjE8+S0lN8XEi8=; b=eU0zXACd+8gDE1QAa41W7O+Zv2yX1WMPw2/884ewjrmnZtYzbs7w0WIEDrLWzbxjUVIoLE PmtyOYtRPZaR+PkwVYGntEeVSW6rN6FR2wUEhZsYpuumwmDJSTXj5uP1r7qVseeWaJ4rUG BWexUn+fd1eLBq06OZUpUptHvKMReWs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701964702; 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=MaScGdicoRo8t6G0OgtEynTGHpaFIjjE8+S0lN8XEi8=; b=iWy+xXcx2SgT+hMY0TIbM+15c9B/mRa7kVxsn6XF1kTBU7Nxdge5gaoJtxjZfXZtRipAtW A59kO7+EXkHtarDg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Juan Quintela , Peter Xu , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 3/5] tests/qtest/migration: Adapt tests to use older QEMUs Date: Thu, 7 Dec 2023 12:58:07 -0300 Message-Id: <20231207155809.25673-4-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 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [1.90 / 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)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; 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%] Authentication-Results: smtp-out1.suse.de; none X-Spam-Score: 1.90 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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1701964770182100014 Content-Type: text/plain; charset="utf-8" Add the 'since' annotations to recently added tests and adapt the postcopy test to use the older "uri" API when needed. Signed-off-by: Fabiano Rosas --- tests/qtest/migration-test.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index b3ce288a73..f16e71d821 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1337,14 +1337,21 @@ static int migrate_postcopy_prepare(QTestState **fr= om_ptr, migrate_ensure_non_converge(from); =20 migrate_prepare_for_dirty_mem(from); - qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming'," - " 'arguments': { " - " 'channels': [ { 'channel-type': 'main'= ," - " 'addr': { 'transport': 'socket'," - " 'type': 'inet'," - " 'host': '127.0.0.1'," - " 'port': '0' } } ] } }"); =20 + /* New syntax was introduced in 8.2 */ + if (migration_vercmp(to, "8.2") < 0) { + qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming'," + " 'arguments': { " + " 'uri': 'tcp:127.0.0.1:0' } }"); + } else { + qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming'," + " 'arguments': { " + " 'channels': [ { 'channel-type': 'm= ain'," + " 'addr': { 'transport': 'socket'," + " 'type': 'inet'," + " 'host': '127.0.0.1'," + " 'port': '0' } } ] } }"); + } /* Wait for the first serial output from the source */ wait_for_serial("src_serial"); =20 @@ -1602,6 +1609,9 @@ static void test_postcopy_recovery_double_fail(void) { MigrateCommon args =3D { .postcopy_recovery_test_fail =3D true, + .start =3D { + .since =3D "8.2", + }, }; =20 test_postcopy_recovery_common(&args); @@ -1664,6 +1674,7 @@ static void test_analyze_script(void) { MigrateStart args =3D { .opts_source =3D "-uuid 11111111-1111-1111-1111-111111111111", + .since =3D "8.2", }; QTestState *from, *to; g_autofree char *uri =3D NULL; @@ -2089,6 +2100,9 @@ static void test_precopy_file(void) MigrateCommon args =3D { .connect_uri =3D uri, .listen_uri =3D "defer", + .start =3D { + .since =3D "8.2" + }, }; =20 test_file_common(&args, true); @@ -2133,6 +2147,9 @@ static void test_precopy_file_offset(void) .connect_uri =3D uri, .listen_uri =3D "defer", .finish_hook =3D file_offset_finish_hook, + .start =3D { + .since =3D "8.2" + }, }; =20 test_file_common(&args, false); @@ -2147,6 +2164,9 @@ static void test_precopy_file_offset_bad(void) .connect_uri =3D uri, .listen_uri =3D "defer", .result =3D MIG_TEST_QMP_ERROR, + .start =3D { + .since =3D "8.2" + }, }; =20 test_file_common(&args, false); --=20 2.35.3 From nobody Wed Nov 27 00:43:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=suse.de Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701964764536455.9166217620402; Thu, 7 Dec 2023 07:59:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBGlu-0000Dx-FY; 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 1rBGli-0000CX-Ol for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:30 -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 1rBGlg-0007LW-8O for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:30 -0500 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 E72F8220B7; Thu, 7 Dec 2023 15:58:25 +0000 (UTC) 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 3911213B6A; Thu, 7 Dec 2023 15:58:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id IHChAJ/rcWXDVgAAD6G6ig (envelope-from ); Thu, 07 Dec 2023 15:58:23 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Juan Quintela , Peter Xu , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 4/5] ci: Add a migration compatibility test job Date: Thu, 7 Dec 2023 12:58:08 -0300 Message-Id: <20231207155809.25673-5-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 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [8.79 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; 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)[]; R_SPF_SOFTFAIL(4.60)[~all:c]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[]; RCPT_COUNT_SEVEN(0.00)[10]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(2.20)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; DMARC_POLICY_SOFTFAIL(0.10)[suse.de : No valid SPF, No valid DKIM,none] X-Spamd-Bar: ++++++++ Authentication-Results: smtp-out1.suse.de; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=suse.de (policy=none); spf=softfail (smtp-out1.suse.de: 2a07:de40:b281:104:10:150:64:97 is neither permitted nor denied by domain of farosas@suse.de) smtp.mailfrom=farosas@suse.de X-Rspamd-Server: rspamd1 X-Rspamd-Queue-Id: E72F8220B7 X-Spam-Score: 8.79 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=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1701964766052100004 Content-Type: text/plain; charset="utf-8" The migration tests have support for being passed two QEMU binaries to test migration compatibility. Add a CI job that builds the lastest release of QEMU and another job that uses that version plus an already present build of the current version and run the migration tests with the two, both as source and destination. I.e.: old QEMU (n-1) -> current QEMU (development tree) current QEMU (development tree) -> old QEMU (n-1) The purpose of this CI job is to ensure the code we're about to merge will not cause a migration compatibility problem when migrating the next release (which will contain that code) to/from the previous release. I'm leaving the jobs as manual for now because using an older QEMU in tests could hit bugs that were already fixed in the current development tree and we need to handle those case-by-case. Note: for user forks, the version tags need to be pushed to gitlab otherwise it won't be able to checkout a different version. Signed-off-by: Fabiano Rosas --- .gitlab-ci.d/buildtest.yml | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 91663946de..9a24eed666 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -167,6 +167,49 @@ build-system-centos: x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu MAKE_CHECK_ARGS: check-build =20 +build-previous-qemu: + extends: .native_build_job_template + artifacts: + when: on_success + expire_in: 2 days + paths: + - build-previous + exclude: + - build-previous/**/*.p + - build-previous/**/*.a.p + - build-previous/**/*.fa.p + - build-previous/**/*.c.o + - build-previous/**/*.c.o.d + - build-previous/**/*.fa + needs: + job: amd64-opensuse-leap-container + variables: + QEMU_JOB_OPTIONAL: 1 + IMAGE: opensuse-leap + TARGETS: x86_64-softmmu + before_script: + - export QEMU_PREV_VERSION=3D"$(sed 's/\([0-9.]*\)\.[0-9]*/v\1.0/' VER= SION)" + - git checkout $QEMU_PREV_VERSION + after_script: + - mv build build-previous + +check-migration-compat: + extends: .common_test_job_template + needs: + - job: build-previous-qemu + - job: build-system-opensuse + allow_failure: true + variables: + QEMU_JOB_OPTIONAL: 1 + IMAGE: opensuse-leap + MAKE_CHECK_ARGS: check-build + script: + - cd build + - QTEST_QEMU_BINARY_SRC=3D../build-previous/qemu-system-x86_64 + QTEST_QEMU_BINARY=3D./qemu-system-x86_64 ./tests/qtest/migration= -test + - QTEST_QEMU_BINARY_DST=3D../build-previous/qemu-system-x86_64 + QTEST_QEMU_BINARY=3D./qemu-system-x86_64 ./tests/qtest/migration= -test + check-system-centos: extends: .native_test_job_template needs: --=20 2.35.3 From nobody Wed Nov 27 00:43:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=suse.de Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701964768173894.39004687576; Thu, 7 Dec 2023 07:59:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBGlv-0000EI-5m; Thu, 07 Dec 2023 10:58:43 -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 1rBGln-0000Cx-6D for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:35 -0500 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBGli-0007PW-C5 for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:31 -0500 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 DD806220B8; Thu, 7 Dec 2023 15:58:28 +0000 (UTC) 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 6420D13B6A; Thu, 7 Dec 2023 15:58:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id IFARC6LrcWXDVgAAD6G6ig (envelope-from ); Thu, 07 Dec 2023 15:58:26 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Juan Quintela , Peter Xu , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 5/5] [NOT FOR MERGE] compat hack until 8.2 is out Date: Thu, 7 Dec 2023 12:58:09 -0300 Message-Id: <20231207155809.25673-6-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 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [11.78 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; 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)[]; R_SPF_SOFTFAIL(4.60)[~all:c]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[]; 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)[]; R_DKIM_NA(2.20)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.01)[45.04%]; DMARC_POLICY_SOFTFAIL(0.10)[suse.de : No valid SPF, No valid DKIM,none] X-Spamd-Bar: +++++++++++ Authentication-Results: smtp-out1.suse.de; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=suse.de (policy=none); spf=softfail (smtp-out1.suse.de: 2a07:de40:b281:104:10:150:64:97 is neither permitted nor denied by domain of farosas@suse.de) smtp.mailfrom=farosas@suse.de X-Rspamd-Server: rspamd1 X-Rspamd-Queue-Id: DD806220B8 X-Spam-Score: 11.78 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=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1701964770134100013 Content-Type: text/plain; charset="utf-8" In the 8.2 development cycle we added a new '-audio' command line option to QEMU which breaks the migration compatibility tests because older QEMUs don't know the option. Since we're just testing n vs. n-1 migration, it's easier if we just wait until 8.2 is released and it will become our n-1 and the problem will go away on its own. Signed-off-by: Fabiano Rosas --- tests/qtest/libqtest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 7cee68a834..031316390e 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -497,7 +497,6 @@ static QTestState *qtest_init_internal(const char *qemu= _bin, "-chardev socket,path=3D%s,id=3Dchar0 " "-mon chardev=3Dchar0,mode=3Dcontrol " "-display none " - "-audio none " "%s" " -accel qtest", socket_path, --=20 2.35.3