From nobody Fri May 17 09:18:43 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=1661268696; cv=none; d=zohomail.com; s=zohoarc; b=S4V/LZrinuBOdUafL8L9uCqWzwtI+upnoH5KXZnND6aOLg8c9stabVzGHMMk7DRC/f7E7a8hsmGJHHQ/4LEWIt3zLnE1O7Pwjy1660srhL0aLhwKKivfdGS2z0y69nirj5e/qFRz0ZG8nrOZgszyIRZZ/aEGg7hxx9OUV/ZLbPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661268696; 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=3FO/jNrx9K5o/CpczuXoS1BiQEzozSQlVpBn8zveOaU=; b=KAqcvE8htc3oIFhRtiqnEY0fIVKN5a4sDfjTAiGpGWmsd4EKcTJtOPgA9A1czpEHWsiPk5O6+dTKnYZ8+tIYnYXg4tP0TddC/d6jWPXIN+wdtI85JdYUPvOw9kHpyica0z2vve319Djh2zCkuoNmvFpWGVv8OBu5oozcAJFgUuY= 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 1661268696721689.1770848701204; Tue, 23 Aug 2022 08:31:36 -0700 (PDT) Received: from localhost ([::1]:60136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQVsM-0000h4-KN for importer@patchew.org; Tue, 23 Aug 2022 11:31:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQVn5-000219-S2 for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:07 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:34714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQVn3-0000S4-1c for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:07 -0400 Received: by mail-wr1-x42d.google.com with SMTP id a4so17459789wrq.1 for ; Tue, 23 Aug 2022 08:26:03 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id z3-20020a05600c0a0300b003a5c2abc412sm25634670wmp.44.2022.08.23.08.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 08:25:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8A2E41FFB8; Tue, 23 Aug 2022 16:25:58 +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=3FO/jNrx9K5o/CpczuXoS1BiQEzozSQlVpBn8zveOaU=; b=JaEAKh9hgkV7P+l9nLA+LKaX9fwfTS1CKHIaKJdC+TJGlDhYsurCnzEjISxtOOSHgb oaHsK29FlVu3xN0RNY4XsyA+Eh7STQpwwPci+mps/C34Yi1RTU8SNzRb019KZjgnaohn jjOzXBHWQbamLEVdKnHsFVQLRTnI/xTXmSsMLD+Xp+5YoaZdP9MviLn3k9G5lpf8Krv3 EooDkHS00PnN4oYdt6abQSNUFI4FVpqZ1DRaBccTNFmKeaGJeQRHbgUvRThdgzutI4cI d4P59SiEWyn/uw9LfOY4IIVgZR+1FUAPSW4BzQhigJ8tkA6gwAQJOcRD6+AyruBwaW+4 SKRg== 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=3FO/jNrx9K5o/CpczuXoS1BiQEzozSQlVpBn8zveOaU=; b=X3CJQmMW+sia1k/CHnKLlIUVeqwYmd9TEg1hH5UZj5E1KPC1TYjkJ0RBkt9lhDUb0Y XoohaLGW2Cz9QZaXbSckkhSyG7Jgk/oswef41nECiCJqESMKh1UvuPiXyMRC2OlkXssA sP5RFSUYJjkOm7o+wzwd+T4ynef+87BQgZsLt+dHUYnRDfYRvuPttLLzkPL48KBruPgw 2utzQ1sDpmBml5QwTQfL5g7jEM6gWFhyfg6EbTXrqpT1fYzqDFStiQoDz50SymRNizaO CC1w44xMxWmxE6pSW7twaz+j5ZU5QnPb8+HM8H7iBldoDJUi2yxJA2By1o7fhbkZmnB9 9Hwg== X-Gm-Message-State: ACgBeo2SZMt1pgcjnS+ifXoUOrT6TFDduZ2ixvzg1WmaImfk3+ea6VKd 2zosBy/WdviBc2tOWf+rY41D/A== X-Google-Smtp-Source: AA6agR5cDDVHkjIpQR1VDuElftxSNwO+zG+9Y7oX62uAwMa/VUaj3FGaAnnTdhPu+se4jPhl0lrLjQ== X-Received: by 2002:a05:6000:1848:b0:225:586b:e64f with SMTP id c8-20020a056000184800b00225586be64fmr6369710wri.173.1661268362516; Tue, 23 Aug 2022 08:26:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 1/6] tests/avocado: push default timeout to QemuBaseTest Date: Tue, 23 Aug 2022 16:25:53 +0100 Message-Id: <20220823152558.301624-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220823152558.301624-1-alex.bennee@linaro.org> References: <20220823152558.301624-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::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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: 1661268698602100001 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 Reviewed-by: Richard Henderson Message-Id: <20220822165608.2980552-2-alex.bennee@linaro.org> 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 Fri May 17 09:18:43 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=1661268509; cv=none; d=zohomail.com; s=zohoarc; b=D7PrvY2H1WuE9iblu5f3pTm0arsHlClcCitFGGaWJs9SFuPrlwVbO2NtFr2SSnXb+uflL0XVGGPyokh4h6Gt6BO7c4Rb43tQnKR0H+jt7hyjUTfkW09R43JXYpLLrS6lpSQ5O5U7DV8qq4MIOW7CBZsI9n7kwRWicZMJWa3t0lY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661268509; 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=txbwSCFAF7nR6j5gec2vODGDsH6fbUsPSo0QWL6oB90=; b=bSVlEs39zjwzPnDxZY54aipRHWMbNG2m9ovOR814Jmjr6bZIPHkK/MKFh8hOW72PoR8ebiHdBS3VATDiU8XitVwNHEkojx4Lr+rSoLOv8ATf0RdZMqessdru6SNCF0CwiLWvcaY+kmgVn/RzQP3jXzj5ZYh/Qx30eGXvj2uCTX8= 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 1661268509920727.9544549114693; Tue, 23 Aug 2022 08:28:29 -0700 (PDT) Received: from localhost ([::1]:59496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQVpM-00049D-V4 for importer@patchew.org; Tue, 23 Aug 2022 11:28:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQVn4-0001yr-Ma for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:06 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:37871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQVn3-0000Rs-1w for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:06 -0400 Received: by mail-wr1-x434.google.com with SMTP id n7so17432616wrv.4 for ; Tue, 23 Aug 2022 08:26:01 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d24-20020adfa358000000b0021ea1bcc300sm15025213wrb.56.2022.08.23.08.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 08:25:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A28781FFBA; Tue, 23 Aug 2022 16:25:58 +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=txbwSCFAF7nR6j5gec2vODGDsH6fbUsPSo0QWL6oB90=; b=GjiN85M+OumKDYa8A9nuh8zv1p39tOEtL67OrILic8bCmfFGNdxGjBrZIrmP71vtVx b+T6G9OOPDwo/LB89O10zjTzomZIvEC+yyfIGeKPqZCm52L1kA7kbOc7i8DwzZ6nVTVp uV0ZMPNgReFxnoU8cIYtPn61LLWEiDctsK5cNCyu7Bw28CAJccUtZpaekRIw0HlRCK8V CxoLlkVnv1WXpWSX/cUjwOgFA1L5DWCfPK/LzYI8NbnjQo3K5WmGquJKnoNuvysiOcdI CVQ9vqIbuB6Wmcsj7VH1kRlusbhVrZe7lbwgywxuiGAGsSJAOxIBiXcPzrpZd2d1ZPwR uIpg== 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=txbwSCFAF7nR6j5gec2vODGDsH6fbUsPSo0QWL6oB90=; b=035rZhgfkXQ5FY6TmKG0fJ3MAaSKoUKjMlf/jgizaNzcEXq5Nd6FAYhp6gRJ2cnlxr uM+PB/XFpdhtzq04fWCAmoXFNmH3PMaxeDN31HMszwi/4mGXB9JZcYD/w0Jd3ckJCqv1 TLiuwqoq5c1d4XXuhlcYXo+UJCO6EjtPuND2uJPm0zvG1zMgjYo3L7s9pnIekJUoLDqF mEG39YudmtWYoFQiUNqpMea4r7iWz+6HhW/fdmG1vx7rbFZjp3YqOpn0P9If5kC/TB9g OX5kJAvuJM8hEkI+y9q6izEOKimRxBelUHPjGlvRlt2j4gJSh5Uor7bfemIGQSdmgaqQ Vq1Q== X-Gm-Message-State: ACgBeo35vA/tRN/33nsBiD7n/CxurFBgvqGsC+eFV5C6v4idMj6sq7Cu DPQHE4cus8jSI8cy2oBp9TRzig== X-Google-Smtp-Source: AA6agR7q1y7Y14MvQW2TcuamEs9dzRnJGpbYh+hsgmh8OkKD9guEsLtyIRXDmlSIt3WNxV+PDbL7Nw== X-Received: by 2002:a05:6000:242:b0:225:30e0:ced4 with SMTP id m2-20020a056000024200b0022530e0ced4mr13633409wrz.114.1661268360422; Tue, 23 Aug 2022 08:26:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Thomas Huth , "Dr . David Alan Gilbert" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , Laurent Vivier , Paolo Bonzini Subject: [PULL 2/6] tests/qtest/migration-test: Only wait for serial output where migration succeeds Date: Tue, 23 Aug 2022 16:25:54 +0100 Message-Id: <20220823152558.301624-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220823152558.301624-1-alex.bennee@linaro.org> References: <20220823152558.301624-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::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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: 1661268511577100002 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 Message-Id: <20220822165608.2980552-3-alex.bennee@linaro.org> 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 Fri May 17 09:18:43 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=1661269060; cv=none; d=zohomail.com; s=zohoarc; b=eLN1si/a9Vb6XEMkQA+0L0oZGhavcLr0Rh1S/I6jzWLm/dxHnigP5hvyxaJC/08uvH7ik9f9AlxTYrNrds9EXaPtA+KOVSEoRrxW1dMS0GxDdxfQzfXWGausYIvmixNdUVS+zjvSv550bb5NmqJvE/YHaNSd6Amt4doGk7dYGcw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661269060; 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=6N1AbX7MwqXmaA4EDQBfETBnTJE+/4pDYB8PrRAcvMo=; b=GU+RYtFsf6HE3Lr6AlgJgT7KIzK8D50oLFouomi+mcXCd5L9lFH2Gm/P6dhYNr8dZ6V2bBHvKPXPU9Pp/yvj1tMdGnQdpWufYZh5LAB3BsXKZDXNsgohMLG4lq4YWuP5Ku8rMesO2h7k/Th9Sc8yV0z8NsbDeBKSV+23g0aUxSU= 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 1661269060483310.03666404785065; Tue, 23 Aug 2022 08:37:40 -0700 (PDT) Received: from localhost ([::1]:40690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQVyE-0004hl-BJ for importer@patchew.org; Tue, 23 Aug 2022 11:37:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQVn6-00021Y-1u for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:08 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:47089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQVn3-0000S8-2K for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:07 -0400 Received: by mail-wr1-x42d.google.com with SMTP id e20so16933448wri.13 for ; Tue, 23 Aug 2022 08:26:03 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m30-20020a05600c3b1e00b003a6077384ecsm22610948wms.31.2022.08.23.08.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 08:25:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BCD661FFBB; Tue, 23 Aug 2022 16:25:58 +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=6N1AbX7MwqXmaA4EDQBfETBnTJE+/4pDYB8PrRAcvMo=; b=rjDlQF8oMDrcZ5X7PK3IRzoV1MYnu5wLXpjgJb488id9SRARTSQZxuQy39U0AN5EdV 5cFdWP97DMkpOPn9rlHSBUoakAC+H4FBPRehkhA12zlygZi3wumiFAO1hDR1D3qi6NtB 9zdbdDnvTmfKVu2afHeggomjMLGXIGU/u9UafnOCl5KvPusCuT+7WNUx0gBDOT+JClb4 nV3PbryLF4+BLJmmq+OZshsmGr9QqAXfQCyuSlYqw3BBrv1YzQR0k0nCBIm9DNIPcc0e id3koezN+zxnQNgijofagBEf7bmGBlMGhifZChYH4X5QuqVa5ugG9kFXVMioLb0K/6kL MHBA== 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=6N1AbX7MwqXmaA4EDQBfETBnTJE+/4pDYB8PrRAcvMo=; b=A42JftV99kVFSbJZKNhuG47SMWqUY8ieOwfeWULUYQ2vKXEENpAoqmQoPKgZA9F7Bn o+xtQ/4di3tCiWOig+QrmCIw3EMrzoHeYpYettv/gn+g6WNcX5SLc6t7997fLZm6n8NN AwTjsIR/Cs7JZE3cS6YH9ScP6sjHjnnC747MxpHs29TRgHvSYdDcC+IZy/L2T/5eoknX LT2VcrtIO0dWAGWDeShmmGwHXlvJvtCd0icBOBXb9tas49IWC7mzDWuC/WHLHhbN7hEC E4OTKq0UgJ2KWT/pIt13Hcz2rI+9nSbA84OFhjJWeNsmRRKR3wiC5G+KFWlb71ZyqMIi +vgQ== X-Gm-Message-State: ACgBeo3dWhNwBnHefPfAE/+cIakSqaXhgAyHsVN6l5AuzHJ2W1ldoupZ AkzOnFHTchE77IFtEHUu0ITdcA== X-Google-Smtp-Source: AA6agR5Aoesy63pooLVM/uw6HdC3zjtqTRkP3XJXPE52+QuTSL19QPAMjQBXiQI+X89vd2zlAT26rQ== X-Received: by 2002:a05:6000:1689:b0:220:8a04:69f6 with SMTP id y9-20020a056000168900b002208a0469f6mr14985031wrd.357.1661268363072; Tue, 23 Aug 2022 08:26:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, 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: [PULL 3/6] tests/migration/aarch64: Speed up the aarch64 migration test Date: Tue, 23 Aug 2022 16:25:55 +0100 Message-Id: <20220823152558.301624-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220823152558.301624-1-alex.bennee@linaro.org> References: <20220823152558.301624-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::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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: 1661269062587100001 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 Message-Id: <20220822165608.2980552-4-alex.bennee@linaro.org> 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 Fri May 17 09:18:43 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=1661269033; cv=none; d=zohomail.com; s=zohoarc; b=JMknGUIxx3n6Ny9MCFAfKyXMpit/ZEKaYBpCF2HTr2WCTPHtU0eeNVdg22Xj2wckyQEj2XUhlpaQD2jsam2LgyjeeYsNkj29XfRgLr/zwtCTivP5Wp4dPMMRhseeGMsE5FaEFY+us/lngK33PzKH7a5P72Y2Nq7vd0GsZxFg4U4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661269033; 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=2UiPIX+dYiJbGljmyLuAxazW0KQr7rKB0A3pyVRLY6U=; b=jMeSWi/06GwqZMkXktpvmJULFMUoyrx8uIzCbJCRMId0TogIV9HF5SKWIZ/EzZknM1DaWf4/s5fGexssdgLTQ2KggfVNDhYRToHDeUefQ08cP6pZRcPsEL4TjdDg76do43/xoXcFd2842hebMO/fHDHyW1CLkEBAcfM9XrcP4y0= 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 1661269033283938.8970648329138; Tue, 23 Aug 2022 08:37:13 -0700 (PDT) Received: from localhost ([::1]:52194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQVxn-0003xx-55 for importer@patchew.org; Tue, 23 Aug 2022 11:37:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQVn6-00021p-DF for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:08 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:39836) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQVn3-0000SE-Qi for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:07 -0400 Received: by mail-wr1-x430.google.com with SMTP id r16so17427183wrm.6 for ; Tue, 23 Aug 2022 08:26:05 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id i14-20020a5d438e000000b002253604bbefsm12809090wrq.75.2022.08.23.08.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 08:26:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D6DED1FFBC; Tue, 23 Aug 2022 16:25:58 +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=2UiPIX+dYiJbGljmyLuAxazW0KQr7rKB0A3pyVRLY6U=; b=zgVKv1j0au1B/yznbH1uxZ6uDYU7ODJKxvDeDZh5i1RTXyii5VK9k/PnBihfLq2t59 5olM0PQrI1sXDUkMcUgpxZj6/5CogezBhRpzwpkFgzNMsVuQPJbBZRjJR7+BcqgsdSQG tgtKeRZjfvvDcldooh0I6WudMAo8Z2xHaPb0lS7QhfQSJ5KlxluaUmENbAVTTBMYt5cl +rsfRULxH9IQLrSF4nK1KgjnDdnxgU3r31qvnbwkgXfyIr8Yf+BjBRvLO4+6cyAFIyzx ieFaqw+GRxdfgzVyMxX7Hb84EO0XnAlywrEZMikYySEqbVbCGYxpJWP8dvB+REmGqa7q fMAQ== 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=2UiPIX+dYiJbGljmyLuAxazW0KQr7rKB0A3pyVRLY6U=; b=DOM0SJ+5jW44ZX27CRWI9w/eIosJf/s7GYVY8SypzRciTmPdFezQAWyASYtapjgCg4 HHs41+JxSli23FIw1fsig3eE7+4cvpqP8164APQ+X4MGDMVXmvhYYg/HtBWdUqf++vvz /8yR+cE3AN3gPA1Xq6F0tTHgGfbUCJu6Sxc2Sh+pmeWDw5QN27irDUl6GjNQLebyjSt1 GkAisz0dLQ2JwgSCzWRGYvT3DgX+bX2DW5bAuIE26SMxMfyANdyNdQMOCQQNcHSOWraE g60nn8jwYqSwrTWxUbiBhkkADmFSZ/4UsJEnvnrB/2CpiIzwzfqMGYb24LtSiBD6dC/4 VD/w== X-Gm-Message-State: ACgBeo3Ne2B0zI2Umg0RrNlseSo2xZ42u8/6HtLov1KNDpTRDCqLbUPM gOeBHbmIL8TNWqOEFNXKZbRTTQ== X-Google-Smtp-Source: AA6agR5tuYbDXrW5UK/asvHBLMZejqgEBnGK+x2OmyUg61zDBvucBsF4C+/FQ0XBhK6zxM3ES9wk/g== X-Received: by 2002:a5d:620f:0:b0:225:32fc:cea3 with SMTP id y15-20020a5d620f000000b0022532fccea3mr13491447wru.270.1661268364204; Tue, 23 Aug 2022 08:26:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, 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: [PULL 4/6] tests/migration/i386: Speed up the i386 migration test (when using TCG) Date: Tue, 23 Aug 2022 16:25:56 +0100 Message-Id: <20220823152558.301624-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220823152558.301624-1-alex.bennee@linaro.org> References: <20220823152558.301624-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::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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: 1661269034389100001 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 Message-Id: <20220822165608.2980552-5-alex.bennee@linaro.org> 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 Fri May 17 09:18:43 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=1661268648; cv=none; d=zohomail.com; s=zohoarc; b=nXr7UJZzLGKsiii00gydF6GHJtnjzd30x1MMjmkzTjY9ACyJCTBWwPU56yKU3gO6NED1WRD2+wbrJJuKuaIVl0NWi/kQiIUTniMjH50uBJKrbtTBFaNACDVbfNuwIeQ/ftIRkZL1mx2RaK+jrAZySYfxAKcPocVKIsO/3s3JKxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661268648; 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=3fNSUwJiW7BbQBy9RsNgQK8fZTGXdhnAyu5t86LKQy4=; b=Ddcy6ncVD6qPv7zO7thXfj9fh8Z6JyJjDzURKnts6Mw1kPrb8xaplq+QM20QXpkZn4aB6FHO0pq5efVN+2h64ius56VUFQJAYM73kShmmIYLpMkMGHrtTaeRPT1etfURtSAIdUxCMoGA9bJ/sMTO0MmE1vYhXfT2EJNH0bfn50Q= 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 1661268648840289.0511835650982; Tue, 23 Aug 2022 08:30:48 -0700 (PDT) Received: from localhost ([::1]:45470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQVrb-000858-Nk for importer@patchew.org; Tue, 23 Aug 2022 11:30:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQVn6-00022P-99 for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:08 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33470) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQVn4-0000SO-No for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:07 -0400 Received: by mail-wr1-x430.google.com with SMTP id k9so17463055wri.0 for ; Tue, 23 Aug 2022 08:26:06 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m27-20020a056000181b00b0022549ac786asm9079816wrh.47.2022.08.23.08.26.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 08:26:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E39FF1FFBD; Tue, 23 Aug 2022 16:25:58 +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=3fNSUwJiW7BbQBy9RsNgQK8fZTGXdhnAyu5t86LKQy4=; b=dWtQdhnwjHKLOUkPJ+YXUTeD1VqSa9RLuHaHptuL71+C+TPyWQ9bhLGTiCRkkHOpGo CMQUCmNSZfVCVz/j6Lxa4y2UKRe0CT+yH2tnR0gmfbiterv4hE23mg+n6YwvntHDWsHY 3slVhYvPKQBb9RXLjdk597PftwwB9ZhhT17c0OywLrQCcgOdVyTJKkby3qzta5d89GNP IMSMESxSw3UU/sfNCqgxBLu8dKkDvrnl0PZ4yDOyw/f+Y464t1pfmDfw49DlvgT0lyUb AH33slbJ8k+iCQMpdStWPuSaB3mU/kxyRtg3m/5tGdaonPhrpPgChBGNE1S/vaEWwywz bClw== 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=3fNSUwJiW7BbQBy9RsNgQK8fZTGXdhnAyu5t86LKQy4=; b=NuCsJ5Qww8L7lof5uX+tkMUUV9zMytYu3B6sUIYRwQJMT5K9rTx1nwjw6nhfX5ltQo 4Nl32/aHDxJr/UQu17VUW/PTFgY/j8rYcPFO1G+wDJKNijqLYpdHsG1wtqerzsw1Jo/2 bzuFsUkWobLruXt+j+1y/6C9zjasUHUb2glZIjeI6h/dkDHPFh5tAGodF/LRTNHScoqt U0qh0xx4hgyReD7decZom4PsACHQBITbGZEa1enYwwvNd0e9vSlTsBPZmqyEbes4ykjI KbQjS8ZrCC97MJ13jWxaKfSA+sX3q5dBYNVcD37qjO+jAkI0UrEPToK56iUApbLedJpZ eMew== X-Gm-Message-State: ACgBeo01r+XjRFTMqsWnLAzjhHYs6Ctwg+7yguG5QT12PHlYwMVVtU62 2TuF/vtdoRnIx2Kv6cEOV0WsMA== X-Google-Smtp-Source: AA6agR6/E1K2VQkJY+qAQUfytdeGADUKcfdI1hpURfa7GbAZfRQMrHDr08nJlUTTH+Sghj5zGdQttQ== X-Received: by 2002:a05:6000:11c8:b0:225:3316:6957 with SMTP id i8-20020a05600011c800b0022533166957mr12551783wrx.218.1661268365377; Tue, 23 Aug 2022 08:26:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, 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: [PULL 5/6] tests/qtest/migration-test: Remove duplicated test_postcopy from the test plan Date: Tue, 23 Aug 2022 16:25:57 +0100 Message-Id: <20220823152558.301624-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220823152558.301624-1-alex.bennee@linaro.org> References: <20220823152558.301624-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::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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: 1661268650466100001 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 Message-Id: <20220822165608.2980552-6-alex.bennee@linaro.org> 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 Fri May 17 09:18:43 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=1661269204; cv=none; d=zohomail.com; s=zohoarc; b=BNtUsOYpqJMppph8F1BqjqJelnBBFrhP/znS64ucOOwlLkG2xdQ54LSwyO34vU9p9EbLhNOjYU8Gn9O5dNmSLMnmxvLRk5+cwy/362RCQLtDGEnXzfZVaOcZ7k70gD3aFy399swOE6L2ZBNGopM/+GVqrS221KU24U15rygIveQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661269204; 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=LsZpgMlG5k3/z4R/dGjpJ9j2VMDJig/kzVEqA19cmEE=; b=YnB4yFJ/spRizEX4HlgiVu/QduhUSszueOVpeyvMGuhtso9c0oc9XeNRoPeYTZXzsaw6AeAtB9u4YMSFV1xZN64uKDbhLhxxFNPtW9+IvbqzN8DMDpWtXfIBvzwc10aQPiBhnLT8Xh/EPuc5oGyEkdQpE8TP7P75qONKFCgcuAs= 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 1661269204338258.63637351407453; Tue, 23 Aug 2022 08:40:04 -0700 (PDT) Received: from localhost ([::1]:60302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQW0Z-00087D-8J for importer@patchew.org; Tue, 23 Aug 2022 11:40:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQVn7-000265-H9 for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:09 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:35633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQVn6-0000Sl-1O for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:09 -0400 Received: by mail-wm1-x332.google.com with SMTP id m17-20020a7bce11000000b003a5bedec07bso9820719wmc.0 for ; Tue, 23 Aug 2022 08:26:07 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q4-20020a1c4304000000b003a5c7a942edsm20924643wma.28.2022.08.23.08.26.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 08:26:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0789E1FFBE; Tue, 23 Aug 2022 16:25:59 +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=LsZpgMlG5k3/z4R/dGjpJ9j2VMDJig/kzVEqA19cmEE=; b=xHXNvAsC55oEXRYfmRrU6YA9nw6wu/8q/5aD/qvra/xlKD4RXoiQQyQbbn4809KWG/ Ii8i7XCh+r2ebU+DmIBo1/5gkSPQR431jX3NBrfSNp8ltmrwSqSDZVGP+MJ1S+n18xru 2MRclH4Pb7yHlTT5RR2HIoRLuX2b6f/UIiEmnKW6omv8c6JWwGG0y+fNWQ+WZPg15tpN 04ZVVnm1scloUHn1nvxQunpwAPFctrGyrSs7IJDC8/J2bsiWY+10z+06mYm0LgnoWAH0 6RTwAWJDKD0XrcFkFWHOagu0N7X3NhegDQsVywaRrRnAphXWsvxwESlhpHIbqIX41C6P JAmA== 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=LsZpgMlG5k3/z4R/dGjpJ9j2VMDJig/kzVEqA19cmEE=; b=ctJ3g1ZGD1+qHHehmjAlcey1xIksJH7cK64V2LNTYmunBsCb7Wy9t0pCw6E4s38orO aBwSKIElfwLqBIES2QaJjRz+2xgWbHpeV8OqG2kGusWnSBygeDBTBSxz5G6XpxHu5zyW IRP4UjCVGx8QklbWtP+zMmSxM283RjC/FUOPZCSPV32ob/dIQo0FNdtTTNtrY7agBcZI o2WPOUsN6oU94sRXRruHgcJEcYzwOK9hjuPhIxerE/sYPBIgkOCjAcCFgiEYKXTiP7Qk DkjZJGZiu+verIvEPxN3byb1nFMBf0oR7VFc3K99GMB+pnLmwp7Ip48wJQWjMAgCc7pb 3K1A== X-Gm-Message-State: ACgBeo3Y9dMsW4+cMtyyJ8HVDLbcJa4F8Chmy7M49B5o/bC725svQIhF qExZLGPfFxNQx/NtTv381khlDQ== X-Google-Smtp-Source: AA6agR5z6atS1fwqAI2aPqU6XMHWMeWn08bn8IxkuieYptdNI4jSVFRFGsG7xtn9USyQae6vz9kxog== X-Received: by 2002:a05:600c:348e:b0:3a5:fbcf:4c1a with SMTP id a14-20020a05600c348e00b003a5fbcf4c1amr2551264wmq.171.1661268366640; Tue, 23 Aug 2022 08:26:06 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?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: [PULL 6/6] qemu-options: try and clarify preferred block semantics Date: Tue, 23 Aug 2022 16:25:58 +0100 Message-Id: <20220823152558.301624-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220823152558.301624-1-alex.bennee@linaro.org> References: <20220823152558.301624-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::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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: 1661269205846100001 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 Message-Id: <20220822165608.2980552-7-alex.bennee@linaro.org> 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