From nobody Tue Nov 26 20:33:13 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=1704388773; cv=none; d=zohomail.com; s=zohoarc; b=HWns5Nztw/8QfTM0oqK2ENIn8sqIJgxGBRko4dbfSZ/ReMbH9gSi1YFFw32f4KdFvvzU5XcJ1QlEm9xNkiDJgvXTX8uWwKI6VDKJuYJP4ynRUT/xEHpR3wAPsHZlh4eXAjdKvoouYDuFjpziyX2/bqXGoW3kvGUj1IlA1E7W2/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704388773; 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=+WC4Ns4HQqIlxPawMb+rykLZgS/0WbKgHMArUTZEX1s=; b=CtxLBOa/X4z5BHdLsvBsPHElMpOW9VcPe+KFu19TRtSbidgDmEKbMA3Ny9GJnZW7S7AkePeoyM/ALT8cD++7AdDThYcXRHqS21NpD136mrMwCxrBLr8ecqLtWub0rLxULcqC9eU98K5GK7DZplh/wKct9hilFkLfLbPkKRi1YdA= 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 1704388772968579.8583974382655; Thu, 4 Jan 2024 09:19:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLRN8-00043j-KU; Thu, 04 Jan 2024 12:19:10 -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 1rLRN6-00043M-11 for qemu-devel@nongnu.org; Thu, 04 Jan 2024 12:19:08 -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 1rLRN4-0008LS-8C for qemu-devel@nongnu.org; Thu, 04 Jan 2024 12:19:07 -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 AA9DA220C0; Thu, 4 Jan 2024 17:19:04 +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 358CD13722; Thu, 4 Jan 2024 17:19:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id sDYVO4XolmUNbAAAD6G6ig (envelope-from ); Thu, 04 Jan 2024 17:19:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704388744; 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=+WC4Ns4HQqIlxPawMb+rykLZgS/0WbKgHMArUTZEX1s=; b=Jl6fd2LIsNrHBGDR6kL7cpHCEdLyAkw2ig2HaDLPQLCELM3hNP88Hc5jFXtAUrlI6+1ir3 UZedHzQuIr579g1VjYURVl25HoGq6QZATX8ffI6kco4ZWRL7NrXqwD6wcHlIyAWMJZagpd hgXWokHtH5UllUdf+wpb1vQFVubg7AE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704388744; 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=+WC4Ns4HQqIlxPawMb+rykLZgS/0WbKgHMArUTZEX1s=; b=tyO/SmIuskJOhjuTa0sEWfAx41mfuzO6wmsr8z6mnienPeK2Cs958DaC/jCLMLG693a3/c e2zT0/LCHzENpFDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704388744; 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=+WC4Ns4HQqIlxPawMb+rykLZgS/0WbKgHMArUTZEX1s=; b=Jl6fd2LIsNrHBGDR6kL7cpHCEdLyAkw2ig2HaDLPQLCELM3hNP88Hc5jFXtAUrlI6+1ir3 UZedHzQuIr579g1VjYURVl25HoGq6QZATX8ffI6kco4ZWRL7NrXqwD6wcHlIyAWMJZagpd hgXWokHtH5UllUdf+wpb1vQFVubg7AE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704388744; 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=+WC4Ns4HQqIlxPawMb+rykLZgS/0WbKgHMArUTZEX1s=; b=tyO/SmIuskJOhjuTa0sEWfAx41mfuzO6wmsr8z6mnienPeK2Cs958DaC/jCLMLG693a3/c e2zT0/LCHzENpFDg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH v2 1/4] tests/qtest: Add a helper to query the QEMU version Date: Thu, 4 Jan 2024 14:18:54 -0300 Message-Id: <20240104171857.20108-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240104171857.20108-1-farosas@suse.de> References: <20240104171857.20108-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.40 X-Rspamd-Queue-Id: AA9DA220C0 Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Jl6fd2LI; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="tyO/SmIu" X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Bar: / X-Spamd-Result: default: False [0.40 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(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]; URIBL_BLOCKED(0.00)[suse.de:email,suse.de:dkim]; BROKEN_CONTENT_TYPE(1.50)[]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; RCPT_COUNT_SEVEN(0.00)[7]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-2.09)[95.56%] 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: 1704388774831100003 Content-Type: text/plain; charset="utf-8" Reviewed-by: Thomas Huth Signed-off-by: Fabiano Rosas --- 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..af779a3248 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 *qts, int *major, int *minor, int *mic= ro) +{ + QDict *rsp, *version; + + rsp =3D qtest_qmp_assert_success_ref(qts, "{ '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 Tue Nov 26 20:33:13 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=1704388804; cv=none; d=zohomail.com; s=zohoarc; b=FQCwHIl2aHc8sMymaMRHOPny8iiDYeyWiVea98QoKk72OIORx7tSiYr4GfPOat3XkHa/fUhHvQlKZe84X1fXkgDImHqoRQm9MUammw506R3b+X4gdYA/68wxxo4ikaMcpAeFBE+mIR8MYu4cRYNNw1ERkJbcaLGGigmtr1Ek7Hs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704388804; 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=ghz63JcePdB1PlsEvBduKH2zaggOWQB1kSiUuWNed6s=; b=WFVbAadoM7M5jvvbKolt4oGj8/jUq9ZjfQnSOjRKN0WNeqxOHECdyWfhALUG5ab8BJ3hF8yhg+VKwdSv8mrzCEIZ4J2Eajj/nyuD+TFSTzwnSGLAQiCXofjuQAerAqOvpp8e6LAb68n0QNYx3sdDg3FWyExYYHqLmuP/wjgoojc= 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 1704388804067210.58000799262413; Thu, 4 Jan 2024 09:20:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLRNM-0004AQ-1T; Thu, 04 Jan 2024 12:19:24 -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 1rLRNF-00046L-IL for qemu-devel@nongnu.org; Thu, 04 Jan 2024 12:19:18 -0500 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLRN7-0008Lx-CE for qemu-devel@nongnu.org; Thu, 04 Jan 2024 12:19:15 -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 AB72A1F824; Thu, 4 Jan 2024 17:19:07 +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 2C61013722; Thu, 4 Jan 2024 17:19:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id IDu8OIjolmUNbAAAD6G6ig (envelope-from ); Thu, 04 Jan 2024 17:19:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704388747; 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=ghz63JcePdB1PlsEvBduKH2zaggOWQB1kSiUuWNed6s=; b=PgibKZ/xhZ4MGgI3ScaQ59dblUN1gL9BzzKwg8k+x6gm+JYUbgSBPq4mzKwQ/MMIEHE9jN ZzheIThWba8Lvb73lrB2yxIibOC17h0Fb447smDg1AWwVDkSzzZ5txrtdG/+aXwltYtvJk PQFBw9NuL1WCmldmaau2BRNeWkQZOEk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704388747; 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=ghz63JcePdB1PlsEvBduKH2zaggOWQB1kSiUuWNed6s=; b=107CWcSJZ2g6RMQDlF9nfIbDF6wJQ6L3tQIEHP1Ww/Gqz7Sk1PEKQ4Og/tDfgtDaQqrZoR 3h27l/Z/6pqOZRBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704388747; 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=ghz63JcePdB1PlsEvBduKH2zaggOWQB1kSiUuWNed6s=; b=PgibKZ/xhZ4MGgI3ScaQ59dblUN1gL9BzzKwg8k+x6gm+JYUbgSBPq4mzKwQ/MMIEHE9jN ZzheIThWba8Lvb73lrB2yxIibOC17h0Fb447smDg1AWwVDkSzzZ5txrtdG/+aXwltYtvJk PQFBw9NuL1WCmldmaau2BRNeWkQZOEk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704388747; 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=ghz63JcePdB1PlsEvBduKH2zaggOWQB1kSiUuWNed6s=; b=107CWcSJZ2g6RMQDlF9nfIbDF6wJQ6L3tQIEHP1Ww/Gqz7Sk1PEKQ4Og/tDfgtDaQqrZoR 3h27l/Z/6pqOZRBA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Laurent Vivier , Paolo Bonzini , Juan Quintela , Leonardo Bras Subject: [PATCH v2 2/4] tests/qtest/migration: Add infrastructure to skip tests on older QEMUs Date: Thu, 4 Jan 2024 14:18:55 -0300 Message-Id: <20240104171857.20108-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240104171857.20108-1-farosas@suse.de> References: <20240104171857.20108-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Authentication-Results: smtp-out2.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)[]; URIBL_BLOCKED(0.00)[suse.de:email]; 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:2; 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_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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: 1704388805048100001 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 | 29 +++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helper= s.c index 24fb7b3525..20220bfda0 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", 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 d520c587f7..001470238b 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,18 @@ 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); + qtest_quit(*from); + + 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 Tue Nov 26 20:33:13 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=1704388799; cv=none; d=zohomail.com; s=zohoarc; b=eADh5bIWfSrJ2N0+Xj3KLNdSgtX4DxFu2fuMAgaGZx3HQ2dlc/2xvNRKveTEriLZytesVIY2vVAsaVKGHs2WA3e9c8VFNsFk1IHj9gQ7BTjUXC6OZxyqw0SuZfcM3mQRmRKQOoPk4eqDRfw7EVGGT/ZhiA1mzG/zX+wEd4Tx+Bw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704388799; 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=x3vVGa2AZxjSaer2YaVgXXfdVtM95evtI47dKJOn8lw=; b=ZnwatRclmaIipexrz1PYICuxHdzhgNxPPHrij3Ih/hO4oWRHuuVN3n/6ZnwH8uTK8r/EFiTOQ1Ojhox1EQ/u9Xr8UK70Fb/rljD/3ZMYZFXuZmQ/WrmqZc4+RsAFtXNcT3OVeBgAWWC/W49VJojt5nhG6TWTHzzURwq6BTBKc9U= 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 1704388799354774.332223076213; Thu, 4 Jan 2024 09:19:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLRNJ-00049Z-3f; Thu, 04 Jan 2024 12:19:21 -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 1rLRNF-00046C-HN for qemu-devel@nongnu.org; Thu, 04 Jan 2024 12:19:18 -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 1rLRNA-0008M8-WA for qemu-devel@nongnu.org; Thu, 04 Jan 2024 12:19:15 -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 B4DD8220C0; Thu, 4 Jan 2024 17:19:10 +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 27F2C13722; Thu, 4 Jan 2024 17:19:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id oDi4N4volmUNbAAAD6G6ig (envelope-from ); Thu, 04 Jan 2024 17:19:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704388750; 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=x3vVGa2AZxjSaer2YaVgXXfdVtM95evtI47dKJOn8lw=; b=IUk4eIi+kSvoydDvbHpRbGkhLac28wxHfoG7WKYaGuORWqFvO5amzb704AySmhGrM72ka0 3LRLhxioD/7ZbpzJpGtlZboYtq9Seq6/l3FpDsS0dkuStJCvXRTaK5+4Gxmxk2qudD0z+v Ws4X8DLAmIOriA6JZZXEYRXKb4Fhdrg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704388750; 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=x3vVGa2AZxjSaer2YaVgXXfdVtM95evtI47dKJOn8lw=; b=B97rGjAjYIUzuHva47mJElCyp0nkYlribb+/3oeqici2CgTMT2Pfz6z+FS1vp2inky9pMv 8wx/z9pts+ouRJDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704388750; 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=x3vVGa2AZxjSaer2YaVgXXfdVtM95evtI47dKJOn8lw=; b=IUk4eIi+kSvoydDvbHpRbGkhLac28wxHfoG7WKYaGuORWqFvO5amzb704AySmhGrM72ka0 3LRLhxioD/7ZbpzJpGtlZboYtq9Seq6/l3FpDsS0dkuStJCvXRTaK5+4Gxmxk2qudD0z+v Ws4X8DLAmIOriA6JZZXEYRXKb4Fhdrg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704388750; 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=x3vVGa2AZxjSaer2YaVgXXfdVtM95evtI47dKJOn8lw=; b=B97rGjAjYIUzuHva47mJElCyp0nkYlribb+/3oeqici2CgTMT2Pfz6z+FS1vp2inky9pMv 8wx/z9pts+ouRJDw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Juan Quintela , Leonardo Bras , Laurent Vivier , Paolo Bonzini Subject: [PATCH v2 3/4] tests/qtest/migration: Adapt tests to use older QEMUs Date: Thu, 4 Jan 2024 14:18:56 -0300 Message-Id: <20240104171857.20108-4-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240104171857.20108-1-farosas@suse.de> References: <20240104171857.20108-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Authentication-Results: smtp-out1.suse.de; none X-Spam-Score: 2.39 X-Spamd-Result: default: False [2.39 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; URIBL_BLOCKED(0.00)[suse.de:email]; 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]; 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.31)[96.76%] 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: -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: 1704388800936100001 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 001470238b..599f51f978 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1338,14 +1338,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 @@ -1603,6 +1610,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); @@ -1665,6 +1675,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; @@ -2090,6 +2101,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); @@ -2134,6 +2148,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); @@ -2148,6 +2165,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 Tue Nov 26 20:33:13 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=1704388776; cv=none; d=zohomail.com; s=zohoarc; b=cH6yXZx6DrC9LwwBt/T3t4kgnPvFlQj/hpYpb2ZjNQSIhdRUZiWLiNN9W95lcr5ND3j+KFml5ToW0PukJ9xH0OpaOM0CqszcXhaeCvTAnIcynfucMjfmptII/8yZsZZdmD0WvKsk1r+CIiazCnBRifaeRUG0fX3DsdEjxPk0I2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704388776; 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=RXzhHM5Xsos+lZ8KeiisT11rEeM4li9bZ4VVFvCjCso=; b=G5aoDt+6dsSWDnrY0sAdMorDDiWMZ5ijUlr6KxAedygTTTjRnisvPybJOKk33h0Gl03rB0DvFj4cfHDbcGNGA2oVD1ySFBJ1IAr2x+hX0TyKRM7CrPbhOPK2vVS8Kh8loGN/K4I+MKChiFAmLFKR8A9wuxiYtzO2YndiiC5EQRI= 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 1704388776945286.06620794060984; Thu, 4 Jan 2024 09:19:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLRNJ-00049n-VM; Thu, 04 Jan 2024 12:19:22 -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 1rLRNH-00048U-LG for qemu-devel@nongnu.org; Thu, 04 Jan 2024 12:19:20 -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 1rLRNF-0008ME-8x for qemu-devel@nongnu.org; Thu, 04 Jan 2024 12:19:18 -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 6E7DA220C4; Thu, 4 Jan 2024 17:19:13 +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 2666413722; Thu, 4 Jan 2024 17:19:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id WB2AN47olmUNbAAAD6G6ig (envelope-from ); Thu, 04 Jan 2024 17:19:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704388753; 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=RXzhHM5Xsos+lZ8KeiisT11rEeM4li9bZ4VVFvCjCso=; b=iG5buSwWp6Fp7QGqkjidr8gHghu/KIBFpEeNSFoZpgg6dAC3cZCJhKAM63H2yas8yBaK/4 9u2eNiDZdaY8v+zjkNK/E/2kJmI4Hynz5J1w39U1KO+QDzubrwVdUQtBqmzTv8D4+l5Z1a P94vLtEcPlDYDiAXlKZmQ9s7pFHNiH8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704388753; 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=RXzhHM5Xsos+lZ8KeiisT11rEeM4li9bZ4VVFvCjCso=; b=szCprh7CB7f2wYkpr7unAVN6NFTJaPKkJ1FccUAT9+a6zsedljv44LE4yG8Cp6MRv3nF3G LmUtsXusfH6MHDDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704388753; 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=RXzhHM5Xsos+lZ8KeiisT11rEeM4li9bZ4VVFvCjCso=; b=iG5buSwWp6Fp7QGqkjidr8gHghu/KIBFpEeNSFoZpgg6dAC3cZCJhKAM63H2yas8yBaK/4 9u2eNiDZdaY8v+zjkNK/E/2kJmI4Hynz5J1w39U1KO+QDzubrwVdUQtBqmzTv8D4+l5Z1a P94vLtEcPlDYDiAXlKZmQ9s7pFHNiH8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704388753; 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=RXzhHM5Xsos+lZ8KeiisT11rEeM4li9bZ4VVFvCjCso=; b=szCprh7CB7f2wYkpr7unAVN6NFTJaPKkJ1FccUAT9+a6zsedljv44LE4yG8Cp6MRv3nF3G LmUtsXusfH6MHDDg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 4/4] ci: Add a migration compatibility test job Date: Thu, 4 Jan 2024 14:18:57 -0300 Message-Id: <20240104171857.20108-5-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240104171857.20108-1-farosas@suse.de> References: <20240104171857.20108-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.51 X-Rspamd-Queue-Id: 6E7DA220C4 Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=iG5buSwW; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=szCprh7C X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Bar: / X-Spamd-Result: default: False [-0.51 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; URIBL_BLOCKED(0.00)[suse.de:email,suse.de:dkim]; 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]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; BROKEN_CONTENT_TYPE(1.50)[]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; RCPT_COUNT_SEVEN(0.00)[8]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM_SHORT(-0.20)[-1.000]; 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=195.135.223.130; 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: 1704388778922100003 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 | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 91663946de..81163a3f6a 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -167,6 +167,59 @@ 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 aarch64-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 + +.migration-compat-common: + 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-${TARGET} + QTEST_QEMU_BINARY=3D./qemu-system-${TARGET} ./tests/qtest/migrat= ion-test + - QTEST_QEMU_BINARY_DST=3D../build-previous/qemu-system-${TARGET} + QTEST_QEMU_BINARY=3D./qemu-system-${TARGET} ./tests/qtest/migrat= ion-test + +migration-compat-aarch64: + extends: .migration-compat-common + variables: + TARGET: aarch64 + +migration-compat-x86_64: + extends: .migration-compat-common + variables: + TARGET: x86_64 + check-system-centos: extends: .native_test_job_template needs: --=20 2.35.3