From patchwork Mon Aug 22 16:56:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 599187 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp1876087mae; Mon, 22 Aug 2022 11:31:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR4KfijAJf9eukAH59XgnSlO+cKVEZ7Rp9AzC4nyLpvfLA1dgoHUijd/zew2LKLVOA+9fiKr X-Received: by 2002:a0c:da87:0:b0:496:cc8f:c072 with SMTP id z7-20020a0cda87000000b00496cc8fc072mr10316577qvj.31.1661193099844; Mon, 22 Aug 2022 11:31:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661193099; cv=none; d=google.com; s=arc-20160816; b=VbKdlwJeeBUNP3NbKziVxd5spaBmfbXvDFVPqdheG4r7mENRSuHPOw94+gZlxF67sQ y2S9VHFqxy2qEqqwgmQI/zOFVT7zYgTSAVTiZHwtuuvbWtd4Z4I+Qd5EJcRnhITtn6Fn tpvytzBcjIEx8nNcue+po4GhfbSGiWcnv/CTN+KoybX5pzMOs7voXEbamxSzk67KmHa1 yfLFeYMXfG31h3jCJx3oraQlgEny3a8uzvK/IMnnNla3jZNEIMb6XA9jS7BlpAVOel3r S+9KQLN+vXLMkQYJhGVDu+uJrsKJPtJZ4y3nNYtOWmAKbGTUVRT9EsTc0TORq5cye57Y +EtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tH+S96YG7MrATd+UfWrcxHJyLkHS0vJjmDHxh+mEr/I=; b=DdNn5rgXhrDX3b9FU1M3mmpu0ztqYC5zCMLy1gjpfGJtLwAfoLT5GFCwBgENPmVxBN 3dZR02UsdFSUQ25SULZJ5FD2SowMrj+bDpZgSSr6CO1RYRB4UMvT1tfeshgHFYYgntKh xCTKwX0zapDcXsVqp8Q3Mt2e98CZfMj9C0hUIJq7XqLB8gPgWgiwzS3pth5emhH18iW2 RIDGhgfOYvdCunXiXoQXT28+bx1OSUHmmSx19+qsFIuc5IbA5U/bWKVQAOFSP5tQfqV3 0MnBx3q2OLNENO9VzvICA6ExJa8pOTsxud0oWZQyl8gVegwSjQDQI1N5PIcHRin0BK9S Ieww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ifwHtZOb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o8-20020ac84288000000b003437f000df0si5257170qtl.738.2022.08.22.11.31.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Aug 2022 11:31:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ifwHtZOb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQCD5-0004Ru-EU for patch@linaro.org; Mon, 22 Aug 2022 14:31:39 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Message-Id: <20220816133831.2166761-1-alex.bennee@linaro.org> Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- 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') class QemuBaseTest(avocado.Test): + + # default timeout for all tests, can be overridden + timeout = 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. """ - timeout = 900 distro = None username = 'root' password = 'password' From patchwork Mon Aug 22 16:56:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 599182 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp1870911mae; Mon, 22 Aug 2022 11:22:32 -0700 (PDT) X-Google-Smtp-Source: AA6agR75k/qRKV5fPREyUlg7PUzLhhdsO+98wxRYNn9Cw49UjRcqDUo6NWVUbheKn+ew5/PNQQ67 X-Received: by 2002:a05:622a:24c:b0:343:7d3b:4953 with SMTP id c12-20020a05622a024c00b003437d3b4953mr16347686qtx.562.1661192551960; Mon, 22 Aug 2022 11:22:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661192551; cv=none; d=google.com; s=arc-20160816; b=xDN/f9ZCrQQywBBRdDFggsGmK3tY2MnI6Xh1ATeXnQBoAk4u3swS04MxrU/M7PoQfh XbYjPXWlVMOQWfdr0QUdvsHHv7oR+j/2KlqZTVr2VS7u8xvsaXnFfo14ttBHe+6C16Cx FMZzgLdigW+GGRK1wcOYLwFkbfDobNjrIQQB9pkonVKnGBSXvpVuO9jbt7oleI83BOyN Am3CmfKdjIwLhJ4whILkXN1j76IS9OMH58lxoXFwe+KgvMkNkKpwW5RQd5n6o9dYlqtr s/rxPW4/rjhWlrF69Est29/3S8+SCA1RIu1/m4ga/NgsuwEA1T8SXEF/CmK/1bKTO6sa FxDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WyNPEcxZT+0dqh6qBfly/w3zPsNi3DOLgNMcDAo03+c=; b=wufdqTVFwqhKW+JSgIuBMu6fJrwrfviC9/DoQCb6iaA2NnAMBIoJp2yWCfSKa+u4Ns 8IpHlbpGGF/dAaVEI+6mvI6oIq4CTGRsCF3MZcFpImTdSILbrOkzMnFV83dUoScuLbQh 4MEZhQTnALV7kPMTYrN8OOyid6VNRMbqpt27ey2gcXiaadgVINmcK2RGvfgjAl2flxWP 2p16pfftIwVEAvYI3prdbWVVJg+Dl9GNN+V+GLEzoOI53M/u5+QpX0Bt7U4ocHWYIWBj 0FUYSBMPPyMpsnphlOQxlEeigt9W0lreNIbcdo6xSs7k07DjW/shN2x31+dBBuLsDY8s OvkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xp6Lvgda; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g5-20020a05620a40c500b006b5ead97164si5734744qko.599.2022.08.22.11.22.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Aug 2022 11:22:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xp6Lvgda; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQC4F-00036d-H5 for patch@linaro.org; Mon, 22 Aug 2022 14:22:31 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Dr . David Alan Gilbert" , =?utf-8?q?Alex_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée 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) } /* Wait for the first serial output from the source */ - wait_for_serial("src_serial"); + if (args->result == MIG_TEST_SUCCEED) { + wait_for_serial("src_serial"); + } if (!args->connect_uri) { g_autofree char *local_connect_uri = From patchwork Mon Aug 22 16:56:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 599196 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp1903424mae; Mon, 22 Aug 2022 12:17:20 -0700 (PDT) X-Google-Smtp-Source: AA6agR7vSbros3mJyiIhtNcVgPUbHcasK8YrpDPeigimQ4OJtL7eVuXMEhCff2QDR1xqzRK7jYZ5 X-Received: by 2002:a05:6214:27e4:b0:476:f199:40c with SMTP id jt4-20020a05621427e400b00476f199040cmr16624077qvb.118.1661195840781; Mon, 22 Aug 2022 12:17:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661195840; cv=none; d=google.com; s=arc-20160816; b=m60hjyo1R/7UY9ZqnAihZ//Low9InIt5R9sEI6o1ZpWRqebvg4FwI3vf/tccUzAAtg T7eWLQxxFWrooCeFDMimqmSjDPjtGMRVJNX+HvZqY3mbbsfVUNVoEGWCyszPLAQNQGxL hvqPU8LiM10ydAWDAg/ibD46QKnU2BPLJWqXeT5hy0L3ex/E319LIauB46cj0JtyEa2R Z7AbUWSuz/c+W1DXxoW5KSAXVPMkbaMDLf8HtAV7BVkUbeZEPnMIukdXF8LSqE5iAGN3 fNQeBv38ul1IzHdGYqMhyVrFTf/BzvdJRDDIwD1sXRe/8/qcpi3FvIdLsaH+9z6RJ5zT B/Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QjQUv7sIYW2ZLqYfMzD+9aob4dpIVdREF3LrFmbU6pU=; b=z+tD0LIEZrTRdCYyP5xYrmXwtG89vI4st9FK35JmV3xcaHOwEQpBb/LBgTw2QNHvtI 9Q20FrY0d1IWorwMRT2B5X/hciLfY7NrQEedJKueiGqoLbLIOJbp6SyhqjYD/FlfxHTr iPbLsotJOBgHIAIW7hKl4iQhbHbb/mpGBzeV8KkJgJR/cRdGRVCsLvq+8fZEt+c8HGYx gYM2pDpr3yTTOVvGJ3qVGXGW6qQBgC8dWQoN9zq6GmQkyc1rOPpJsALy8WmHJkWypaln oBnxf0GzMSL5N6J1NRSR9AbA9p4A3xHSXeged+B3v9K8YQjUWRmxlW6HEa7Q8uwAyAAU 3M8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=krH7RFoH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t21-20020a05620a451500b006bae7e78f96si5411373qkp.676.2022.08.22.12.17.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Aug 2022 12:17:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=krH7RFoH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQCvI-0004zJ-Bm for patch@linaro.org; Mon, 22 Aug 2022 15:17:20 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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é Message-Id: <20220819053802.296584-3-thuth@redhat.com> Signed-off-by: Alex Bennée --- 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[] = { 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] /* make sure QEMU user space can see consistent data as MMU is off */ @@ -64,7 +63,7 @@ innerloop: blt innerloop add w5, w5, #1 - and w5, w5, #0xff + and w5, w5, #0x1f cmp w5, #0 bne mainloop From patchwork Mon Aug 22 16:56:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 599191 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp1878823mae; Mon, 22 Aug 2022 11:36:48 -0700 (PDT) X-Google-Smtp-Source: AA6agR4ieTJYVVXOfYBiwWjuQn36pg7g0pDAL7layHuyIMxFaWWq+0p3060jkC4bZ6v+tSz+YTNt X-Received: by 2002:ac8:5d92:0:b0:344:6f74:4d17 with SMTP id d18-20020ac85d92000000b003446f744d17mr16366397qtx.227.1661193408578; Mon, 22 Aug 2022 11:36:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661193408; cv=none; d=google.com; s=arc-20160816; b=AIi5M/EpCBsM1MyusxVJsR1m0CTd0LJP50dprXyM2+OvPEpzQ0nHCZW8fPqOmfql9r TI559kFfOD+doNo5CdwD4xLboDw7qkYkStvZR2LAELQ67Wpy/rrg2e92c1RviOEEhp7e 8GdUJEsYkxV1UZkVZ54kISorujapTyP9a5o4cTk5DZsK+GJr/0vIXXboDRHzIxbzHWws E3ysEdieG2PPXh1KPVo3LuV3KSBZJ6iuFS9juNBQStdABEJQQgIOna4lXIxSmzFFsDwD K/a85HYCelTmoq9LQEBxrIvfBEpLclBz3IhodH00ylQnguk5aoTsZWDZGLU7v8eb9ghI Xu9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GVRb/7doUSSFkMj9m+LAbITgMHZXde61grtd9l+BnG4=; b=eK0Y44vCA4dZvK6qRp9hwvUgxiycu6Ox1GiAcW/dYipXnTRh0hVQ5A/OXpRu3sQnDj Qn43/Jj0RxXMy4oSEqIS+HEBRzvQPtZ427446y9Wp1GRXJwWopLIm602Y6ItdHODxFSu 1n3y2X0h/0RqDnZpibGv6gG4aMqI3rJoYH03G+wrUEyjYMonW1GaUYK2+gws20xuXHh7 MPzEdslMCEriK01IMi2PtBhr5ccLFx5lv17XLEK1mqYtLGMWccj5aRkvfIvgh5EPWzA6 D1o/eq09DWaRk3P/eg5VW4VSC2OpNgukctQAlvGgTcrSqRHjS3arT05YncAhEM8pM8G+ EHZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HF39GeIh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id mb10-20020a056214550a00b00473fc05df91si2044165qvb.298.2022.08.22.11.36.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Aug 2022 11:36:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HF39GeIh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQCI4-0001zv-4G for patch@linaro.org; Mon, 22 Aug 2022 14:36:48 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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é Message-Id: <20220819053802.296584-4-thuth@redhat.com> Signed-off-by: Alex Bennée --- 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[] = { - 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 inc %bl + andb $0x3f,%bl jnz mainloop mov $66,%ax From patchwork Mon Aug 22 16:56:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 599189 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp1877432mae; Mon, 22 Aug 2022 11:34:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR4uim/3nhjqUb73ATyllsGnkhOVfQVja5TOKybPVOLDtzaSakoelxywjVpp2hbxFc89sP8x X-Received: by 2002:ad4:5e8d:0:b0:496:d8cb:3f2c with SMTP id jl13-20020ad45e8d000000b00496d8cb3f2cmr7652206qvb.35.1661193247655; Mon, 22 Aug 2022 11:34:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661193247; cv=none; d=google.com; s=arc-20160816; b=VbFPC7vy53QfKNPBGfUfb1F8iymSEVQOZpsvD2UbxTTx+jNzIu5JMiQlAq55vVy069 8oLSwuX++IbTwWw2RsddGw1bCQyNQ3nx4XhdFlOz58OUmJpeEVLKUWZ56KxB2vh1YQUZ IO5mAbehczicT4Y69h6npvo+yyAkJAVzuDdhSIrnA2MI0EpSh7PUQ1LlNxRIhwZByNWM 34xtNGlM6UtdjrSvc4ZQisS4NPD8mnrZgr5YUXeyNDGlJprAgcry4+Sety5guDsM7jlh lG2b5LFcFjYdqLvgYQxrafEqA1naaZ7Ia7wsd41Lz7JW1pepZmusb199lJq7FJIFYWsP Wbmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LieCnn+iM2L6WoU2Lcvn6KPNMMaVm+8Sh/Nf1S623NE=; b=meF6LBsf6FfYu91c0hlR95ZMkzO6dcI/duXp0a0mymS3luUZfPYCVD47heIbTdRXU0 0oQbuS95I2uTroXiDBzJAYBZ7f9R9Feu9mxiFnqhhOv1rygL1tmoyvx4TmbiR/3iZ3GZ eQpA8IsDRykYv2SBwxcIrAngb950SNBu6Au24q+QnCjNyP/8x44ZCDleBshmRrILJlGi Z3j1qoB1vnJ/IJXKUvMQH4ttzS3hckxObqMoLSp94oZSqtEd3Kw2s8TZ9Bd5KuyamMoQ YoSwAJY9GCgLiI9AI6ZLtHlQk1StySGnpnF/Ex38saJKpHUfgL7q3ow8AqewAY1l9E5K mATg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="vlFtPd3/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cg12-20020a05622a408c00b00344584612c9si4952311qtb.625.2022.08.22.11.34.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Aug 2022 11:34:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="vlFtPd3/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQCFT-00077C-5I for patch@linaro.org; Mon, 22 Aug 2022 14:34:07 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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é Message-Id: <20220819053802.296584-5-thuth@redhat.com> Signed-off-by: Alex Bennée 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); 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); From patchwork Mon Aug 22 16:56:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 599185 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp1874324mae; Mon, 22 Aug 2022 11:28:50 -0700 (PDT) X-Google-Smtp-Source: AA6agR6bMm7oh2LhuJY+1I6OC6AsKI+0Id+4a8I3T4SBeB6PrIHi29ZteOjMyOI+ZV/FLzewYGsn X-Received: by 2002:a05:620a:f96:b0:6ba:e280:3adc with SMTP id b22-20020a05620a0f9600b006bae2803adcmr13346996qkn.435.1661192930392; Mon, 22 Aug 2022 11:28:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661192930; cv=none; d=google.com; s=arc-20160816; b=LwYHLp8+md04R0Ze5dfjdwGFG0PBvE3mHS30qlX8mVfjwoKPKvuoPcwSuEUMINx391 3noxI22AU4rbDvqC7J2o4lGamiwre9Kj7d+UJmWt+XYIinI1JCV6dDcnQ6Nl10zXoNRU SAEd5WiV+GYQ0TFETqfVXsGl0KwHTkwkLtwE21+eBUl5+AI2NedoPEJBDFIprwyALSM7 E4tKJa3xJdp721B69q57hi7ZaDoWxWQKlrO6bO++knqrgXAIU/D5qDPwlSHfSPLrSxQA Q3c9oVJDcOwhL1nfnySDTCwG60N/6mWKus/FlB3/29p2RMrsHO1LmU/6j8YjiyIgs46q wk9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tVX5rqmUAa9FyrPm9n6/GK4JRI7gAHoJ9NSzsZoKCbs=; b=XFgggjtrmeJkLNldwOgGw15y+Zyg3u6wvE/EMdjQDZIDSpm5B8Pz1m6UqeBf2EM9iV 1EWIlYwlqPk8hi8IK2NAdAu+W3YPT5AhE026LLCX1tYKDm0uq55u5AbwmjVWcIQF8IBz hSGXNKlNquf+xSpmkYF1mnSevTU/1U+Wdxxqhat9aVQSCrG5FqOWSEdq4eBCrfQmg2fE Niy+YEVwF65dLxOqvYY/m6i+wdrqMhOguLod8oLFsNCWvko3ZNVXL6dxCKNGDUAFPvK6 /UjGVoxJdqYOdcaJM1MOpF4jbVQPBTFT6f/GmjbbV+CRGujtwdIsimNM2sn3JFYIthPB ZqiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y18g8GyH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d18-20020a05620a167200b006babe290b65si4458105qko.397.2022.08.22.11.28.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Aug 2022 11:28:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y18g8GyH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQCAL-0000Qf-Uh for patch@linaro.org; Mon, 22 Aug 2022 14:28:49 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Kevin Wolf , =?utf-8?q?Daniel_P_=2E_Berrang=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Acked-by: Kevin Wolf Reviewed-by: Daniel P. Berrangé 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() DEFHEADING(Block device options:) +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)