From nobody Sat Nov 23 20:01:53 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=1731527445; cv=none; d=zohomail.com; s=zohoarc; b=C/l6QCzuEXHOZZD1DUKidsPK0sNiyqdqFaQmr1GmRhBgsPsgPjZASf6HbBJliabH6bUPWIMVBmj/ozvnUa+iNFtESIEvMfcUHfbZiSRoHpsCSd5Ptsjmz11NU7uEHNhqlD9SWC9NUHh94Fyq3ntPP+IJvXYpRvd7xMH5h8uUjBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731527445; 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=ZT4TkMQ7Re9KRLueiPXFJT/PoUvSdR56WtHKMnA5xKA=; b=HwruvIAfcqiH5P7L3djtTwEvOY62AZHzrD6uiFqxYE8c4dHhbL+uyQ4eGs3vVgrTHvUjxp5SbpBfxHx9cU2YO1y1XSMaSHGu2AFwUxayhTjP6PtMoHRCZia8lfHtPiF49dhf81DtFREShC5Nub/y3OBSSLd/FzJaN0l77sujzPc= 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 1731527445409999.0830285755818; Wed, 13 Nov 2024 11:50:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBJKq-0006o8-QO; Wed, 13 Nov 2024 14:47:29 -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 1tBJKi-0006c3-8p for qemu-devel@nongnu.org; Wed, 13 Nov 2024 14:47:23 -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 1tBJKg-0003CH-Io for qemu-devel@nongnu.org; Wed, 13 Nov 2024 14:47:20 -0500 Received: from imap1.dmz-prg2.suse.org (unknown [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 4B93521111; Wed, 13 Nov 2024 19:47:17 +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 2FF8C13301; Wed, 13 Nov 2024 19:47:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id WD6tOUICNWfLcQAAD6G6ig (envelope-from ); Wed, 13 Nov 2024 19:47:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1731527237; 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=ZT4TkMQ7Re9KRLueiPXFJT/PoUvSdR56WtHKMnA5xKA=; b=uSfu5JoWc4UUn/qe1izEoSNbU7NiOqf8IJZ+LCsQ3NPYqIkj4IbyLCGy7NkgorNaf/Jk8x MKWTFZmGhMz0c4PnMuzW1dsmukyhzZdn7V3IZbjSNJxU1rAstAG00NyIqXHtRWrlJbC5mj YJvVgXpiXm5hqVoHwEwlikU2s8BpiBs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1731527237; 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=ZT4TkMQ7Re9KRLueiPXFJT/PoUvSdR56WtHKMnA5xKA=; b=zLhKZo4NFnDhAvG1OxsAphRkKjWgg4tX+vrloqUKqhme81SR0A18SQpHn3UT72oh1QTqXv 5oYfii4t7Oa1/FBg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1731527237; 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=ZT4TkMQ7Re9KRLueiPXFJT/PoUvSdR56WtHKMnA5xKA=; b=uSfu5JoWc4UUn/qe1izEoSNbU7NiOqf8IJZ+LCsQ3NPYqIkj4IbyLCGy7NkgorNaf/Jk8x MKWTFZmGhMz0c4PnMuzW1dsmukyhzZdn7V3IZbjSNJxU1rAstAG00NyIqXHtRWrlJbC5mj YJvVgXpiXm5hqVoHwEwlikU2s8BpiBs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1731527237; 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=ZT4TkMQ7Re9KRLueiPXFJT/PoUvSdR56WtHKMnA5xKA=; b=zLhKZo4NFnDhAvG1OxsAphRkKjWgg4tX+vrloqUKqhme81SR0A18SQpHn3UT72oh1QTqXv 5oYfii4t7Oa1/FBg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Paolo Bonzini Subject: [PATCH v2 17/22] tests/qtest/migration: Split CPR tests Date: Wed, 13 Nov 2024 16:46:25 -0300 Message-Id: <20241113194630.3385-18-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20241113194630.3385-1-farosas@suse.de> References: <20241113194630.3385-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1731527447543116600 Content-Type: text/plain; charset="utf-8" Move the mode/reboot test into a separate file to hold all the CPR tests. Currently there's just one test, but we're adding more CPR modes and the feature is different enough from live migration that it's worth it to have a separate file for it. Signed-off-by: Fabiano Rosas --- tests/qtest/meson.build | 1 + tests/qtest/migration-test.c | 34 +-------------- tests/qtest/migration/cpr-tests.c | 58 ++++++++++++++++++++++++++ tests/qtest/migration/test-framework.h | 1 + 4 files changed, 61 insertions(+), 33 deletions(-) create mode 100644 tests/qtest/migration/cpr-tests.c diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index c1dcc67363..05d0e33d78 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -336,6 +336,7 @@ migration_files =3D [files( 'migration/migration-qmp.c', 'migration/migration-util.c', 'migration/compression-tests.c', + 'migration/cpr-tests.c', 'migration/file-tests.c', 'migration/precopy-tests.c', 'migration/postcopy-tests.c', diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index fa2fd0c672..93f156f7af 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -145,31 +145,6 @@ static void test_ignore_shared(void) } #endif =20 -static void *test_mode_reboot_start(QTestState *from, QTestState *to) -{ - migrate_set_parameter_str(from, "mode", "cpr-reboot"); - migrate_set_parameter_str(to, "mode", "cpr-reboot"); - - migrate_set_capability(from, "x-ignore-shared", true); - migrate_set_capability(to, "x-ignore-shared", true); - - return NULL; -} - -static void test_mode_reboot(void) -{ - g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, - FILE_TEST_FILENAME); - MigrateCommon args =3D { - .start.use_shmem =3D true, - .connect_uri =3D uri, - .listen_uri =3D "defer", - .start_hook =3D test_mode_reboot_start - }; - - test_file_common(&args, true); -} - static void do_test_validate_uuid(MigrateStart *args, bool should_fail) { g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); @@ -308,20 +283,13 @@ int main(int argc, char **argv) migration_test_add_postcopy(env); migration_test_add_file(env); migration_test_add_precopy(env); + migration_test_add_cpr(env); =20 migration_test_add("/migration/bad_dest", test_baddest); #ifndef _WIN32 migration_test_add("/migration/analyze-script", test_analyze_script); #endif =20 - /* - * Our CI system has problems with shared memory. - * Don't run this test until we find a workaround. - */ - if (getenv("QEMU_TEST_FLAKY_TESTS")) { - migration_test_add("/migration/mode/reboot", test_mode_reboot); - } - /* migration_test_add("/migration/ignore_shared", test_ignore_shared);= */ =20 migration_test_add("/migration/validate_uuid", test_validate_uuid); diff --git a/tests/qtest/migration/cpr-tests.c b/tests/qtest/migration/cpr-= tests.c new file mode 100644 index 0000000000..92bd42e61a --- /dev/null +++ b/tests/qtest/migration/cpr-tests.c @@ -0,0 +1,58 @@ +/* + * QTest testcases for CPR + * + * Copyright (c) 2016-2018 Red Hat, Inc. and/or its affiliates + * based on the vhost-user-test.c that is: + * Copyright (c) 2014 Virtual Open Systems Sarl. + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "libqtest.h" +#include "migration/migration-qmp.h" +#include "migration/migration-util.h" +#include "migration/test-framework.h" + + +static char *tmpfs; + +static void *test_mode_reboot_start(QTestState *from, QTestState *to) +{ + migrate_set_parameter_str(from, "mode", "cpr-reboot"); + migrate_set_parameter_str(to, "mode", "cpr-reboot"); + + migrate_set_capability(from, "x-ignore-shared", true); + migrate_set_capability(to, "x-ignore-shared", true); + + return NULL; +} + +static void test_mode_reboot(void) +{ + g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, + FILE_TEST_FILENAME); + MigrateCommon args =3D { + .start.use_shmem =3D true, + .connect_uri =3D uri, + .listen_uri =3D "defer", + .start_hook =3D test_mode_reboot_start + }; + + test_file_common(&args, true); +} + +void migration_test_add_cpr(MigrationTestEnv *env) +{ + tmpfs =3D env->tmpfs; + + /* + * Our CI system has problems with shared memory. + * Don't run this test until we find a workaround. + */ + if (getenv("QEMU_TEST_FLAKY_TESTS")) { + migration_test_add("/migration/mode/reboot", test_mode_reboot); + } +} diff --git a/tests/qtest/migration/test-framework.h b/tests/qtest/migration= /test-framework.h index 4571326028..c1747a4e16 100644 --- a/tests/qtest/migration/test-framework.h +++ b/tests/qtest/migration/test-framework.h @@ -222,5 +222,6 @@ void migration_test_add_compression(MigrationTestEnv *e= nv); void migration_test_add_postcopy(MigrationTestEnv *env); void migration_test_add_file(MigrationTestEnv *env); void migration_test_add_precopy(MigrationTestEnv *env); +void migration_test_add_cpr(MigrationTestEnv *env); =20 #endif /* TEST_FRAMEWORK_H */ --=20 2.35.3