From nobody Sun May 12 02:44: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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1661193178; cv=none; d=zohomail.com; s=zohoarc; b=cLoM14+CUhIXQkRl8vNK9ZOvRHUdGunKeFO8OSIe8l1KFiBgfxMEERwuvvIu7gLKubjZxQ9uhGY+HVkx6/MFu8meQvnPKvgO0mbbFMPpReQ4LAp0lobBxkEODYBIra5nIzvgZF0HNgl6681STN0AzVFdSaYxokTdCBbD4QrKdn8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661193178; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tH+S96YG7MrATd+UfWrcxHJyLkHS0vJjmDHxh+mEr/I=; b=OfFYihGaCmelhKbBluXzLiY5m4ru+F1yxjmSG/AgGSdLKVyeNf9mTeeOwdWD4p5zW1l8PPLq+ROZYigZtScRPJfDa6q1zsbdLoQqho9TZSWAYPT1y/q9lnVPRPllG/1c5xMnrswSla8ewnaoqwXrEeDnfSV7r8koz8QqaaYMZ6s= 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 1661193178762679.6921001468219; Mon, 22 Aug 2022 11:32:58 -0700 (PDT) Received: from localhost ([::1]:57404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQCEK-0007Pl-If for importer@patchew.org; Mon, 22 Aug 2022 14:32:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQAik-0008Hv-CV for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:14 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:33293) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQAih-0005zc-TN for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:14 -0400 Received: by mail-ej1-x62e.google.com with SMTP id j21so17064453ejs.0 for ; Mon, 22 Aug 2022 09:56:11 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k8-20020a17090632c800b0073cd7cc2c81sm5299260ejk.181.2022.08.22.09.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 09:56:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 01EFC1FFB8; Mon, 22 Aug 2022 17:56:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=tH+S96YG7MrATd+UfWrcxHJyLkHS0vJjmDHxh+mEr/I=; b=ifwHtZObLHcLmpfnF/mXSFlr+aMbNgRfGAm8vwQ66+kV+/oHgNUidrdt8zaxFqwu/K 42aMn9MPb93Eyl6alsc0drLI3gF23xSZ6kHbMa9i5Ob3BafEhxnd1hUURH6kHwFohyRE qKMpdMM+KsnmEqW4wH+O4GtWR6/8qKsiEnQHZv/uk0cNRj8RcEk1eToIU+8bjmcdBJAx avWDtUnoGOubJE17b/55p55/f2IqVK6ly+oDyTQeNiWe6XetPdFGngrAACW7bsOMWtoQ LbtMCYd5gZ8H3+g752GhMxU6ZVALykGEDafQRqkaDF11lJGe66BLJSbPZvhYtSfiV42T H4zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=tH+S96YG7MrATd+UfWrcxHJyLkHS0vJjmDHxh+mEr/I=; b=Qbeu60DgpURd+jwYXPZMrJJZQGPb330Hhw3RPefu3PuJozh7z6Z/tI9GFdgjPR2vT3 0cJcno+XoWyFaE/gzy00i4rd5pPMqlUVr7K0RU1nmEZr3JRJcU2LZPybk3GEYEkTGdLT lUEzfyPc1swUMFnd58jY5fPzL1mfyHsvUUjPqKUCUckxHlkwHuCNAfTMg6YMygnFBT14 rAWE1OXZxPOa4jdwRMhidkhoNoFyTpYHlC6smZeT84V/GAuH82xD+7PwyvYW74yCS3Z8 3wVkmtlL+0R1zGhJFR8sR5mqgzTEU+JZyRa6K2T/HF3RBJD0TYKKcc3VTzUYuycKNT0p 6r9A== X-Gm-Message-State: ACgBeo3bMXhV259STgKh6IrFLP2UiKDi/DJdamhVi8bKv5N1q4QfJyzG j1nzMnyUE55+ThHUC46NlArCnQ== X-Google-Smtp-Source: AA6agR69okBYbwzny+VziXLf3+FyW/zuRj+m7gChEqeS3xQ6oSlzssQWjwp71peUlGmspwoapmlT/g== X-Received: by 2002:a17:907:6d06:b0:731:5809:ec67 with SMTP id sa6-20020a1709076d0600b007315809ec67mr13505133ejc.195.1661187369840; Mon, 22 Aug 2022 09:56:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 1/6] tests/avocado: push default timeout to QemuBaseTest Date: Mon, 22 Aug 2022 17:56:03 +0100 Message-Id: <20220822165608.2980552-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220822165608.2980552-1-alex.bennee@linaro.org> References: <20220822165608.2980552-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1661193180661100001 All of the QEMU tests eventually end up derrived from this class. Move the default timeout from LinuxTest to ensure we catch them all. As 15 minutes is fairly excessive we drop the default down to 2 minutes which is a more reasonable target for tests to aim for. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220816133831.2166761-1-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- v2 - lower timeout to 2 minutes/120 seconds --- tests/avocado/avocado_qemu/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index ed4853c805..0efd2bd212 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -227,6 +227,10 @@ def exec_command_and_wait_for_pattern(test, command, _console_interaction(test, success_message, failure_message, command += '\r') =20 class QemuBaseTest(avocado.Test): + + # default timeout for all tests, can be overridden + timeout =3D 120 + def _get_unique_tag_val(self, tag_name): """ Gets a tag value, if unique for a key @@ -512,7 +516,6 @@ class LinuxTest(LinuxSSHMixIn, QemuSystemTest): to start with than the more vanilla `QemuSystemTest` class. """ =20 - timeout =3D 900 distro =3D None username =3D 'root' password =3D 'password' --=20 2.30.2 From nobody Sun May 12 02:44: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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1661192622; cv=none; d=zohomail.com; s=zohoarc; b=jJ4DLziCKu7dW6G0CFxCEubYWA1dhUdzzq5aKfISAg1LF/yO1tG6TCL3L+xSjq3HUjNYCGt53G3bSYZ9/d3beQGXH0jq4Pnf7Bh4UHH8FHlrw84dzTNxqQJV5XaB+lpTO+L0uCdQQ4AbDeHZQxeFURFGDST2Dfg4NXJOvKJ5qE4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661192622; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WyNPEcxZT+0dqh6qBfly/w3zPsNi3DOLgNMcDAo03+c=; b=SmBLcvGY24ypg6fDwxQdDybcN+EtGfY7REa2gaEXbrpfdbiSzNnPGK1NW/BEa+kQWFKSLgdS6J2dHTnWF42GpsAVd2c2AVLkqyD/4nMhIF3n8Fx4JAvF2MvUxbrnrFluKRRPgTaxHUWZvjscX6sCCkDfe2+adJcr/Zv8qyR52Qs= 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 1661192622177188.3281133664957; Mon, 22 Aug 2022 11:23:42 -0700 (PDT) Received: from localhost ([::1]:55922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQC5M-0005rY-6h for importer@patchew.org; Mon, 22 Aug 2022 14:23:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQAil-0008JQ-9I for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:15 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:33299) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQAii-0005zi-Kz for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:14 -0400 Received: by mail-ej1-x634.google.com with SMTP id j21so17064593ejs.0 for ; Mon, 22 Aug 2022 09:56:12 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id c15-20020a170906694f00b0073d6cfdc44dsm3095409ejs.115.2022.08.22.09.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 09:56:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 19A841FFBA; Mon, 22 Aug 2022 17:56:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=WyNPEcxZT+0dqh6qBfly/w3zPsNi3DOLgNMcDAo03+c=; b=xp6Lvgda1S5jVv91RNXM1Y9TWMqxk/95sKnoDb/YZqb84DuXEkbDCR1DI3qrz/L/5e lVr0GV2/UtY45KU3dnGsOp2RGUbyjndps3zFXtrR/xp0Dqol65eZSX5M5L7uzfI7uKcF p+C6A/YsVuSfFQ1bwMam2duDCJcdCyzMGlifK0zoVnEnIrbPSu+An++kSoXBxXIInoEh TjoKyr1cYIH/Hbnh7ET2jjSHVwtFoziMAXZIlHKyWP5aBBi1oBy57Q8MMCh8xo7mm6F7 7BWXr6VLw3E2AK0KIoiXtvxFxKUzS9rUiFCseGA0VgfrnujQt1AfHkMfIzt1PHauNWb0 qLNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=WyNPEcxZT+0dqh6qBfly/w3zPsNi3DOLgNMcDAo03+c=; b=gtsP21SSHLIowhBdQgI4jXEaaG1q5AmxPRGnS0eLFn8SCPlKGLy4Or3JnbrUbKP1oS hTtUVBMXAAuqGwJmqtJbSri06vV2Bu5H4jM1XIslax4CLEEHJchjEQ7gHOCVrTQOtsps gFaNNMt4stREm33mYgYgIxRfx/vsp7UBwnQ4cDvscJYLEBNpvPATxA7Hit16y2eXU+sQ IaUx2OUgcIssMyIJIY7wYcSfOcfAvIl8RLj0XaJxkVbHSyp/r1yWK0TWlGNb7Yc/IGoq sIfnamS3txL5wIDx4VSuVxdw9zJaq3LzYLNjMEMO94Q76jpWE7IkKGGLz1vIVD6OIfgJ q0mA== X-Gm-Message-State: ACgBeo1MNpL/A3IAQJEseJ+PN6FhCYQJ0OJ6iFD8cf7Uk9030LRYa37M S2Adx+wiIMzFpEOHAEt82tCReg== X-Google-Smtp-Source: AA6agR4tiy5BO8VJCzRreDgPS5zt7fEYGxvDl7wxMnSIaXCZc5+xOP++lD/48TTqOvfFZCCPxDa3UA== X-Received: by 2002:a17:907:2e01:b0:730:a098:7257 with SMTP id ig1-20020a1709072e0100b00730a0987257mr13969563ejc.705.1661187371286; Mon, 22 Aug 2022 09:56:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Dr . David Alan Gilbert" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 2/6] tests/qtest/migration-test: Only wait for serial output where migration succeeds Date: Mon, 22 Aug 2022 17:56:04 +0100 Message-Id: <20220822165608.2980552-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220822165608.2980552-1-alex.bennee@linaro.org> References: <20220822165608.2980552-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1661192624488100003 From: Thomas Huth Waiting for the serial output can take a couple of seconds - and since we're doing a lot of migration tests, this time easily sums up to multiple minutes. But if a test is supposed to fail, it does not make much sense to wait for the source to be in the right state first, so we can skip the waiting here. This way we can speed up all tests where the migration is supposed to fail. In the gitlab-CI gprov-gcov test, each of the migration-tests now run two minutes faster! Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Thomas Huth Message-Id: <20220819053802.296584-2-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Juan Quintela --- tests/qtest/migration-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 520a5f917c..7be321b62d 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1307,7 +1307,9 @@ static void test_precopy_common(MigrateCommon *args) } =20 /* Wait for the first serial output from the source */ - wait_for_serial("src_serial"); + if (args->result =3D=3D MIG_TEST_SUCCEED) { + wait_for_serial("src_serial"); + } =20 if (!args->connect_uri) { g_autofree char *local_connect_uri =3D --=20 2.30.2 From nobody Sun May 12 02:44: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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1661195900; cv=none; d=zohomail.com; s=zohoarc; b=FAPibQhpXpjflmi0eOfi6VQEj8kA4m2sZ/Osr5rNR92G4Znbqn/0xDcSK8RWe09aMfGNikV71fFsfu2LA25nOU0GkKQkSJYN0ib0sRs13zkwW9+VBe0sVbDuC5jb/eHuHC1hBl9qkBNGjm1AQM/yCMZnJ4gJMuj75PfUsujqwqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661195900; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QjQUv7sIYW2ZLqYfMzD+9aob4dpIVdREF3LrFmbU6pU=; b=Rkl7jaI/OQSw5gIYLIVwtTLaldDc8/noHHffdLZRuhU9V1GYFqcYsgiOkN970q68vv+mcFmq15GHQr8Qa1GDvar6vpms9EjSpPMPwYun8qv54egZpd5K7M9gLo8solUVx689LEJplg/qNzTSXInPlaNtU6hN7gZMVYymM+NH4tc= 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 1661195900742957.9646207043668; Mon, 22 Aug 2022 12:18:20 -0700 (PDT) Received: from localhost ([::1]:49602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQCwF-0006Sy-Bf for importer@patchew.org; Mon, 22 Aug 2022 15:18:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQAil-0008K9-Hd for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:15 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:38676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQAij-0005zp-MN for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:15 -0400 Received: by mail-ed1-x52c.google.com with SMTP id a22so14733236edj.5 for ; Mon, 22 Aug 2022 09:56:13 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j2-20020a17090623e200b00730bbd81646sm6417342ejg.87.2022.08.22.09.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 09:56:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 34F4B1FFBB; Mon, 22 Aug 2022 17:56:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=QjQUv7sIYW2ZLqYfMzD+9aob4dpIVdREF3LrFmbU6pU=; b=krH7RFoH5ZlPJCB7xbFT1asc8YC+ll2lWWC1EP0DYgpRt1/psURxHpjM+tMNfDZgX5 BAbZpZuMlAv+/Q16qOUZ/m91/cZ4UWQEz6AGZE1YcKvnbrNsOo3FOlTjJdaFizhv71k9 oO93yY/9aCkJIZqzlFjqJYVbv7WXAEC3CwfgX6ngOK6zNpTF7UYbi6jE6NHb8Vxb/7gc nV9SrCjrf8hEPhqvprfc0xZvm/IVIsWF/AM4JGYTLYJoNtHJcTqpz4MAGWkJZcTawynf q5blUzZ8nlECKMWU+UaYRHl/zV8SY5yEVs2BFHLyFCJQFSuL115LKonBaviTIFDg0PqB hClg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=QjQUv7sIYW2ZLqYfMzD+9aob4dpIVdREF3LrFmbU6pU=; b=BL2SGGv/fTBEmKTHW2bvMZwO68K277igUv+d6N4meiueBxJsdIikfNFKmMlp+jWRad iB0HRgKUb6/bBAfqeAqeDYv5FiW2R/i4ZHtQ4l+1P1YEdjPNTO56qeROD+wKjeke9xmq kTCpSa7Lr5o1XN257pfLgY62F8uz9kpThuVEH4rqbTDgtEJm4cHbaKqc15rcBjtKKFD3 efDTh+hEp0HB1ocRgrb4IPYjZpslfMEgR+Aj17RKPOD4uNe6Mm1YSBbElt4dz6XAhSGE cB25kYMJdwRBD3I7nqGy05UEypvEyxEdmkFNOid+XpwUi+lel0IuXZWepzYZWBit6ZSL i+cQ== X-Gm-Message-State: ACgBeo0Y8OqqRDECEwkctNa5Dx+P7gPqGmX/b56VVtF6NTSg7hFpt3ex hWWMP0iB8ad9fxk5D3mwPyrIpA== X-Google-Smtp-Source: AA6agR74C+G3k5R93zeeFJAlEjAl9bfgE1DQ0tPERI85WtnUGYeigUUkXCTVPd/vxNGor3kVwF+WcQ== X-Received: by 2002:a50:fe91:0:b0:43d:c97d:1b93 with SMTP id d17-20020a50fe91000000b0043dc97d1b93mr81285edt.67.1661187372207; Mon, 22 Aug 2022 09:56:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , "Dr. David Alan Gilbert" Subject: [PATCH v1 3/6] tests/migration/aarch64: Speed up the aarch64 migration test Date: Mon, 22 Aug 2022 17:56:05 +0100 Message-Id: <20220822165608.2980552-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220822165608.2980552-1-alex.bennee@linaro.org> References: <20220822165608.2980552-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1661195902608100001 From: Thomas Huth The migration tests spend a lot of time waiting for a sign of live of the guest on the serial console. The aarch64 migration code only outputs "B"s every couple of seconds (at least it takes more than 4 seconds between each characeter on my x86 laptop). There are a lot of migration tests, and if each test that checks for a successful migration waits for these characters before and after migration, the wait time sums up to multiple minutes! Let's use a shorter delay to speed things up. While we're at it, also remove a superfluous masking with 0xff - we're reading and storing bytes, so the upper bits of the register do not matter anyway. With these changes, the test runs twice as fast on my laptop, decreasing the total run time from approx. 8 minutes to only 4 minutes! Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20220819053802.296584-3-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/migration/aarch64/a-b-kernel.h | 10 +++++----- tests/migration/aarch64/a-b-kernel.S | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/migration/aarch64/a-b-kernel.h b/tests/migration/aarch64= /a-b-kernel.h index 0a9b01137e..34e518d061 100644 --- a/tests/migration/aarch64/a-b-kernel.h +++ b/tests/migration/aarch64/a-b-kernel.h @@ -10,9 +10,9 @@ unsigned char aarch64_kernel[] =3D { 0x03, 0x00, 0x80, 0x52, 0xe4, 0x03, 0x00, 0xaa, 0x83, 0x00, 0x00, 0x39, 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, 0xad, 0xff, 0xff, 0x54, 0x05, 0x00, 0x80, 0x52, 0xe4, 0x03, 0x00, 0xaa, 0x83, 0x00, 0x40, 0x39, - 0x63, 0x04, 0x00, 0x11, 0x63, 0x1c, 0x00, 0x12, 0x83, 0x00, 0x00, 0x39, - 0x24, 0x7e, 0x0b, 0xd5, 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, - 0x2b, 0xff, 0xff, 0x54, 0xa5, 0x04, 0x00, 0x11, 0xa5, 0x1c, 0x00, 0x12, - 0xbf, 0x00, 0x00, 0x71, 0x81, 0xfe, 0xff, 0x54, 0x43, 0x08, 0x80, 0x52, - 0x43, 0x00, 0x00, 0x39, 0xf1, 0xff, 0xff, 0x17 + 0x63, 0x04, 0x00, 0x11, 0x83, 0x00, 0x00, 0x39, 0x24, 0x7e, 0x0b, 0xd5, + 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, 0x4b, 0xff, 0xff, 0x54, + 0xa5, 0x04, 0x00, 0x11, 0xa5, 0x10, 0x00, 0x12, 0xbf, 0x00, 0x00, 0x71, + 0xa1, 0xfe, 0xff, 0x54, 0x43, 0x08, 0x80, 0x52, 0x43, 0x00, 0x00, 0x39, + 0xf2, 0xff, 0xff, 0x17 }; diff --git a/tests/migration/aarch64/a-b-kernel.S b/tests/migration/aarch64= /a-b-kernel.S index 0225945348..a4103ecb71 100644 --- a/tests/migration/aarch64/a-b-kernel.S +++ b/tests/migration/aarch64/a-b-kernel.S @@ -53,7 +53,6 @@ innerloop: /* increment the first byte of each page by 1 */ ldrb w3, [x4] add w3, w3, #1 - and w3, w3, #0xff strb w3, [x4] =20 /* make sure QEMU user space can see consistent data as MMU is off= */ @@ -64,7 +63,7 @@ innerloop: blt innerloop =20 add w5, w5, #1 - and w5, w5, #0xff + and w5, w5, #0x1f cmp w5, #0 bne mainloop =20 --=20 2.30.2 From nobody Sun May 12 02:44: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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1661193464; cv=none; d=zohomail.com; s=zohoarc; b=ecfYDzvKLvMcaNA6NCPQMojoEnox9hSIyF3lf43yHsgN4pD5/8NCtqNMi7/DSomdN2AstVdfWRmn1qYh6hf73/pDMVxzJMtzJ9PeKE5DONB5ioT+ztmXV1Lqj65x1ZceyoPD3ugp8NWRfwTuVRpinTagv07P3JapivAAVxLbvJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661193464; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GVRb/7doUSSFkMj9m+LAbITgMHZXde61grtd9l+BnG4=; b=WZqHhXiYnvqGtZy8QVHzFd22UsVrZl28uQnJ7qh0IeNY7U1tCr54x6Iz9oT5CJizSXyfTh2phqTYJjxumPImQNBvSzUuSD/WT8np6wJL4IzMcwC15Rxdf11E9n9jctvRkA4n8zXtD3YG1wrDaVbpCUQwyfoMCytxZP9KTfWhaCA= 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 1661193464818690.0161550203455; Mon, 22 Aug 2022 11:37:44 -0700 (PDT) Received: from localhost ([::1]:49870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQCIx-0004wE-Bc for importer@patchew.org; Mon, 22 Aug 2022 14:37:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQAim-0008NU-Lq for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:16 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:40881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQAik-000601-U9 for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:16 -0400 Received: by mail-ej1-x630.google.com with SMTP id w19so22462389ejc.7 for ; Mon, 22 Aug 2022 09:56:14 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e1-20020a17090618e100b0072ed9efc9dfsm6374998ejf.48.2022.08.22.09.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 09:56:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 456A31FFBC; Mon, 22 Aug 2022 17:56:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=GVRb/7doUSSFkMj9m+LAbITgMHZXde61grtd9l+BnG4=; b=HF39GeIhJXt1ItJO+L4g9SAWg5zuaAaLEoOyj3sfimiOI/Wc94XFfKQUhAOi+wvAZ2 v+fUHy7NjA5DotLq011Q8T4vK9GEN/PqpyLDPAqXz6THZ4AiitogTH49IvBEDshHSxS4 JtRkuUHJeD1Rd87QOU5Wx/NOuB0B4Ac8LPDYSx3OZ56bdkWiqy4t5Hegj+p+K7OpKnm/ +4oilLug+4ndj6qAkvbrHmFbOBSskn7rXx/Mrmxt8FeqOqMLPrVxzWDeFBQKfHNilsDk iSJpJjjSNRw8bxGjYdoDgTrmjzPY+F48nL/CvCW4JHrwvZHzOySYiUEj/BouZdv/U34h 7tmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=GVRb/7doUSSFkMj9m+LAbITgMHZXde61grtd9l+BnG4=; b=HQqoloTZpkMPk262biXrG+355dpo1VMdG1ZirAAslZ3wqIzjYtGRJjzHYQIE/dXgeP E0N2eUbG1z3E/kJYZCVH4+phT/4Ch82wi1cQMbUsAjFdM6is50amCNhP27Ra4gHh0BGQ e/NUc7zVDBjmVfNEvMcpxVNfKVHglHsZpPmYaOvOGU7jdlFFq3VC+jVPb1DozkILvz5m CEcPWZccUr7Zc1pl2DNnq3vz1wFKNFer9YXmqi0d2VFbdddcpLwpTdtQtnjPAkNWnomo lB4lq+AGVWc8JLvvtXvVa5+U/fhHx6Nppf/1Q508zpj6jGJUlvl6QzjAi/voJ+Mbt0tB DcQA== X-Gm-Message-State: ACgBeo3wNdxRrV20zMCo+3x7n2t2SJWR0xdkoXUVqW+F/xIOe1WeOR41 3/Fh94Cxvw6zGGHwgm/Gq9C8jw== X-Google-Smtp-Source: AA6agR69Q567wYpXm58hTci795oKbu9BjhidRM+zBhyEm4NBQndLg6WD/rII8/+J5JMMJf1FcK7/Jw== X-Received: by 2002:a17:906:9f2a:b0:730:bc30:da30 with SMTP id fy42-20020a1709069f2a00b00730bc30da30mr13756487ejc.763.1661187373350; Mon, 22 Aug 2022 09:56:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , "Dr. David Alan Gilbert" Subject: [PATCH v1 4/6] tests/migration/i386: Speed up the i386 migration test (when using TCG) Date: Mon, 22 Aug 2022 17:56:06 +0100 Message-Id: <20220822165608.2980552-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220822165608.2980552-1-alex.bennee@linaro.org> References: <20220822165608.2980552-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1661193465403100001 From: Thomas Huth When KVM is not available, the i386 migration test also runs in a rather slow fashion, since the guest code takes a couple of seconds to print the "B"s on the serial console, and the migration test has to wait for this each time. Let's increase the frequency here, too, so that the delays in the migration tests get smaller. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20220819053802.296584-4-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/migration/i386/a-b-bootblock.h | 12 ++++++------ tests/migration/i386/a-b-bootblock.S | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/migration/i386/a-b-bootblock.h b/tests/migration/i386/a-= b-bootblock.h index 7d459d4fde..b7b0fce2ee 100644 --- a/tests/migration/i386/a-b-bootblock.h +++ b/tests/migration/i386/a-b-bootblock.h @@ -4,17 +4,17 @@ * the header and the assembler differences in your patch submission. */ unsigned char x86_bootsect[] =3D { - 0xfa, 0x0f, 0x01, 0x16, 0x74, 0x7c, 0x66, 0xb8, 0x01, 0x00, 0x00, 0x00, + 0xfa, 0x0f, 0x01, 0x16, 0x78, 0x7c, 0x66, 0xb8, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x22, 0xc0, 0x66, 0xea, 0x20, 0x7c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x92, 0x0c, 0x02, 0xe6, 0x92, 0xb8, 0x10, 0x00, 0x00, 0x00, 0x8e, 0xd8, 0x66, 0xb8, 0x41, 0x00, 0x66, 0xba, 0xf8, 0x03, 0xee, 0xb3, 0x00, 0xb8, 0x00, 0x00, 0x10, 0x00, 0xfe, 0x00, 0x05, 0x00, 0x10, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x40, - 0x06, 0x7c, 0xf2, 0xfe, 0xc3, 0x75, 0xe9, 0x66, 0xb8, 0x42, 0x00, 0x66, - 0xba, 0xf8, 0x03, 0xee, 0xeb, 0xde, 0x66, 0x90, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x9a, 0xcf, 0x00, - 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0xcf, 0x00, 0x27, 0x00, 0x5c, 0x7c, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x06, 0x7c, 0xf2, 0xfe, 0xc3, 0x80, 0xe3, 0x3f, 0x75, 0xe6, 0x66, 0xb8, + 0x42, 0x00, 0x66, 0xba, 0xf8, 0x03, 0xee, 0xeb, 0xdb, 0x8d, 0x76, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, + 0x00, 0x9a, 0xcf, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0xcf, 0x00, + 0x27, 0x00, 0x60, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/tests/migration/i386/a-b-bootblock.S b/tests/migration/i386/a-= b-bootblock.S index 3f97f28023..3d464c7568 100644 --- a/tests/migration/i386/a-b-bootblock.S +++ b/tests/migration/i386/a-b-bootblock.S @@ -50,6 +50,7 @@ innerloop: jl innerloop =20 inc %bl + andb $0x3f,%bl jnz mainloop =20 mov $66,%ax --=20 2.30.2 From nobody Sun May 12 02:44: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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1661193333; cv=none; d=zohomail.com; s=zohoarc; b=mXgVUUnTW9aV2O8UFTG+IU1iGYea8panXk7m8vpx4abr75Fc6WEjZmhtN3RLi4qhLNsJj963TNF0RLAvLMYfNCrf0SEqVi2AxCbkKQeFwPAl8H2PtEaJzVxTdChHNC+UWz97KyK+xAjcH8GEfN19dyXHH0ARN6yozNH2RKTKxrs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661193333; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LieCnn+iM2L6WoU2Lcvn6KPNMMaVm+8Sh/Nf1S623NE=; b=YheGE+NenXUeAKSgh/co7q73uzM3qdBprQadkl7UVTR8zn42T7JkxWsCFjvJvrCqRiqE/KpaK2obqmn1/RG9yFuUsRowsL2/N3voxmVBgN4oQ9x6aOzfL3xMbZMpfHr6WtIwIP4IDl+Tuh0BKI9u/8N6FFrtMzTMHmltmDpO4Tw= 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 1661193333409735.6462724975106; Mon, 22 Aug 2022 11:35:33 -0700 (PDT) Received: from localhost ([::1]:56186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQCGq-0001Xz-AR for importer@patchew.org; Mon, 22 Aug 2022 14:35:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQAin-0008Qc-V4 for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:18 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:34462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQAil-00060R-Vr for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:17 -0400 Received: by mail-ej1-x630.google.com with SMTP id vw19so8797661ejb.1 for ; Mon, 22 Aug 2022 09:56:15 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t21-20020a170906a11500b0072af56103casm6411154ejy.220.2022.08.22.09.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 09:56:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5D5B11FFBD; Mon, 22 Aug 2022 17:56:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=LieCnn+iM2L6WoU2Lcvn6KPNMMaVm+8Sh/Nf1S623NE=; b=vlFtPd3/OiDx6JqbqbpDsQ53DMJaQvgNR3+UofvBX4g6/UKnID33U4ywXKkaxBscEq BLJSDpKwUhcWpkWXvzr1TpFhulFSz2SQj2vL3I52549/TGbbv2CtayvsPEMb2/SxGiOw NpqwfRyAUbkWrutXObgvtN0BeETWEtkKaaFxbjOdZptD7a5KHla/KdHbdrZiRPKJblwM iwjEO1z0p0AskqpgIbPdklsN9E1I6J07ks+soM4OaYuRbGJyTdQJKg81Sz+gKUdBMXQq Fgwa3Lefpuh6bEK3qGR65xT/gNWdZH8aoqQI/lUez6bsEgsuUhHLqq5y32aJ5O0t1DUa VEqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=LieCnn+iM2L6WoU2Lcvn6KPNMMaVm+8Sh/Nf1S623NE=; b=6Kt6WCLRNfJ1PbSD+ZEQyoOuddo38ALlOmMTiyUqHd/NMZlWV1ZPfCMY7WauQk8IeO AL5lwr69axjHqQ1NCGfse22d0JaBe+Gx++3RTtIddniGGYK9jDUwFn1t/VDgkrzWgUam WdC322epJ//fNniL8blktLtTl3wqA8mxoylmHloDOK5lcMLS5R9lvo3JpDsT8c9y/ZOu PyR7OBFlIVwX0B9Ep/rZOPv3srcV693jSGSF/fRyM2/bg2V6GVjSbG6ATjzlgTcfeSsv 2Kg8wtdIGJtjIU386UIch1wS9qV/OVLsjnxVpb3g9Bm+VM7Gg/56XdfuqffvJeuqwNua LeJA== X-Gm-Message-State: ACgBeo3f4CmQyeDoBSz2VyIZ7clrNesFMI/JJgf/RS5KdQWJDDb5kbNu cLti8Mcmu+PudHdybxiQcnO4s7Z7s/iI4Q== X-Google-Smtp-Source: AA6agR61pHGHkHS/iAWx0MAc8ZL1lB1iTNT5nRL0lpDtJdFcyICuuS3LfHoSsLK2x7Lt6Zy/TfW7Ig== X-Received: by 2002:a17:907:eaa:b0:730:c780:f71e with SMTP id ho42-20020a1709070eaa00b00730c780f71emr12809153ejc.770.1661187374665; Mon, 22 Aug 2022 09:56:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , "Dr. David Alan Gilbert" , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 5/6] tests/qtest/migration-test: Remove duplicated test_postcopy from the test plan Date: Mon, 22 Aug 2022 17:56:07 +0100 Message-Id: <20220822165608.2980552-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220822165608.2980552-1-alex.bennee@linaro.org> References: <20220822165608.2980552-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1661193334100100001 From: Thomas Huth test_postcopy() is currently run twice - which is just a waste of resources and time. The commit d1a27b169b2d that introduced the duplicate talked about renaming the "postcopy/unix" test, but apparently it forgot to remove the old entry. Let's do that now. Fixes: d1a27b169b ("tests: Add postcopy tls migration test") Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20220819053802.296584-5-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Juan Quintela --- tests/qtest/migration-test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 7be321b62d..f63edd0bc8 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -2461,7 +2461,6 @@ int main(int argc, char **argv) module_call_init(MODULE_INIT_QOM); =20 if (has_uffd) { - qtest_add_func("/migration/postcopy/unix", test_postcopy); qtest_add_func("/migration/postcopy/plain", test_postcopy); qtest_add_func("/migration/postcopy/recovery/plain", test_postcopy_recovery); --=20 2.30.2 From nobody Sun May 12 02:44: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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1661192973; cv=none; d=zohomail.com; s=zohoarc; b=IEjpPVuIUSNPOSsW8yBstTwwdQJzOhVRBt6Qq5h6krMSnT+ooSUOlCaVRm/Jhmewt/Qo8rorMp9D1hM4RxUPldx1g31jTViQSvpWy8OEs7C/HEfAjHWW7nBOZoprxq+RhZ2GvDAeo4TOkSREW3ZKd8OtSfo749zwKOpULdBgoTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661192973; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tVX5rqmUAa9FyrPm9n6/GK4JRI7gAHoJ9NSzsZoKCbs=; b=T/zAiRsTh61TiL6t+MmcKeGlve1ibssNtJWGh2PvFUrSe8w4hTsB1lE1zpNc0eslSOgxgRXEK+PG7QfCpQKfJkVLE7AlzWCtLqwrvr5LozuyP4yA3RbblXdnURch9JoenLdkcMVQZTXRAKmDoCq9aJmFFdn0yHfGCN8Wd+r2pB0= 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 1661192973828290.37024349097817; Mon, 22 Aug 2022 11:29:33 -0700 (PDT) Received: from localhost ([::1]:59684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQCB1-0003KZ-QQ for importer@patchew.org; Mon, 22 Aug 2022 14:29:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQAin-0008Nf-0M for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:17 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:33291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQAil-000608-8H for qemu-devel@nongnu.org; Mon, 22 Aug 2022 12:56:16 -0400 Received: by mail-ej1-x62b.google.com with SMTP id j21so17064789ejs.0 for ; Mon, 22 Aug 2022 09:56:14 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id w5-20020aa7cb45000000b00445b822005dsm21047edt.6.2022.08.22.09.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 09:56:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 697841FFBE; Mon, 22 Aug 2022 17:56:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=tVX5rqmUAa9FyrPm9n6/GK4JRI7gAHoJ9NSzsZoKCbs=; b=y18g8GyHZUdzN9ObTsFQ79DEYCWY89mQjDl5642QI2a1Q8PAJvKM7UoFwLXIUgpKFa GDcL47yg3GN8HvG9IBzWdVfGRzOYPwOqqUlNikSRlFQuohnHV8GbeTtRnn078IcGim4u dQbfneD5FB0r4O55sbCevi2sLU4AXQu7OKF4Wr4z7Q1ttcZJ/UMfd6qHayyxDjGgarLp C2Sdgei6+gdd+2hZiYp9Krwdr47NnBZSB7nDQBe3B4moxdTXw0UALu0/k4Dgee5vzMbz zxU6A17O0qK7od6GWYwVWvAl+8LaUz+bEGnVONUYWWw5owvMvOkjZz0xg7i0VJrik5iR +2/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=tVX5rqmUAa9FyrPm9n6/GK4JRI7gAHoJ9NSzsZoKCbs=; b=0RFT4Fza544Ujgbswzvdu1ZDBrVIq6CAXFC21xJZf/FZyZ42RyTcLI+o7c7dw/UecQ GovR6mn1upGhVFpcT5sW8nISFIcDAlqlgSqzy8RMR5TDRCgSyZNzIVFLdOe7tI//UMRw elrK7xjeKSqkcr2bnZWFot7pZEAKtsFu5ecVk/awFh4EfP3F/imamVpXLeva7t8gygD7 UnlMloBZAweCPSF1BkjxjzBwmvopX6/Y3YRxe6XyfRskZWf6SLJ1a7vkacKtPgmBERyI UqiZF4Czbnhz26so72qSIgHw6xnlSPKNxqjCD6FIh4bneyCSpxo0b0I98ll2JtZEgCVy PQJA== X-Gm-Message-State: ACgBeo2AVa0roTlUSL6gv6dIxRjmo71Tsms8RQKdZlXGHukNio2Aghg5 5E2vAbXszdDQbk2BQF1IpuVWFQ== X-Google-Smtp-Source: AA6agR48ejkmBLN+hvxAkv69vqrAgDWRTqr3dmYva91Pnm2l+KlEtT2gyNYys8WYOp2vt8ZufBNMCA== X-Received: by 2002:a17:907:a068:b0:73d:5d21:7ed3 with SMTP id ia8-20020a170907a06800b0073d5d217ed3mr8460483ejc.685.1661187373884; Mon, 22 Aug 2022 09:56:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Hanna Reitz , Thomas Huth Subject: [PATCH v1 6/6] qemu-options: try and clarify preferred block semantics Date: Mon, 22 Aug 2022 17:56:08 +0100 Message-Id: <20220822165608.2980552-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220822165608.2980552-1-alex.bennee@linaro.org> References: <20220822165608.2980552-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62b; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1661192975651100001 Try to correct any confusion about QEMU's Byzantine disk options by laying out the preferred "modern" options as-per: " (best: -device + -blockdev, 2nd obsolete syntax: -device + -drive, 3rd obsolete syntax: -drive, 4th obsolete syntax: -hdNN)" Signed-off-by: Alex Benn=C3=A9e Acked-by: Kevin Wolf Reviewed-by: Daniel P. Berrang=C3=A9 Cc: qemu-block@nongnu.org Cc: Kevin Wolf Cc: Hanna Reitz Cc: Thomas Huth --- v2 - minor punctuation and flow fixes --- qemu-options.hx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index 3f23a42fa8..31c04f7eea 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1105,6 +1105,19 @@ DEFHEADING() =20 DEFHEADING(Block device options:) =20 +SRST +The QEMU block device handling options have a long history and +have gone through several iterations as the feature set and complexity +of the block layer have grown. Many online guides to QEMU often +reference older and deprecated options, which can lead to confusion. + +The recommended modern way to describe disks is to use a combination of +``-device`` to specify the hardware device and ``-blockdev`` to +describe the backend. The device defines what the guest sees and the +backend describes how QEMU handles the data. + +ERST + DEF("fda", HAS_ARG, QEMU_OPTION_fda, "-fda/-fdb file use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL) DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL) --=20 2.30.2