From patchwork Thu May 9 16:58:49 2019 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: 163722 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1236107ilr; Thu, 9 May 2019 09:59:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqyhX0J64cdk3OvLolos9H8w+OgiW//dJLD8LWvb8sRZovOZ+37de9Yq5NPaLB/bg45CVeD7 X-Received: by 2002:a7b:cc01:: with SMTP id f1mr3608059wmh.78.1557421184459; Thu, 09 May 2019 09:59:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421184; cv=none; d=google.com; s=arc-20160816; b=KPRp3RcWpwctkF53VI4ZVFnS2E9dQL9yKi38L/Qp/Ng70w0U2dEZpuC9nsGP9kURWB giP6mICs1iPUZki/vDqFVXxPP8B8tD19Twos+468v9SnY6qJikx92XXQ+YiEtlcExGnt 8J5lmZChixRPTjXx4IKEiB3UE3ZuknbczHnXnxaqHh0eS2v7dTt30Z9NouGF83NaXj+1 dF2qvmfB4qwWSE8H6gO9AprgBIcNgZk82WoSPLN4n1FYB+dbsKdZVXl+HlFkFFMJ7hsR lu8xXjqzOEXawotKCDdVbGnF7s1jQgRqK2eu6Fkt/PCytut+e1Qb+R1WBD3Nx6+jbczm kj8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=GPWkl0UZnL+LwntGtFPT1SPNtCHAc7QYKT2apLIn060=; b=S9NLFDGWdTwdICB6o3bq0fSDX6I+Y6yhNuuGcQQUg6y9NsF5ziehUKc0f0z5enTvJe /2hbUp9eFt4Ylo2QocuKz/mFyqjmXqYmJgJV4VuJUkrs+dbPz7vCma1pLp4xlAhzemg0 yFMbem1BJ3hqP7PKJE/BRiZmh7XWE2KvJRAFHpQ5AoppmyCL3+O8qVgT4tETFhl+QoNS SIcGh0t7hFwIRVjNV/XoEgwSViaveaBVPfPZBAOA2zc/DHKpvJtVnct3ZllMlIyS1/l6 vEmifOxEAQXgX1II4Xp4t17PztR1zTlNHjNn1CngH0f9MMBJgDX65EN91054VxdvOx8R XfnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RkifXN5H; 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=fail (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 h8si2016414wrr.381.2019.05.09.09.59.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 09:59:44 -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=fail header.i=@linaro.org header.s=google header.b=RkifXN5H; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:57953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmOV-0006xn-Aj for patch@linaro.org; Thu, 09 May 2019 12:59:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmO4-0006w0-KO for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmO3-0004pm-K0 for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:16 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51419) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmO3-0004pI-CT for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:15 -0400 Received: by mail-wm1-x32c.google.com with SMTP id o189so4179425wmb.1 for ; Thu, 09 May 2019 09:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GPWkl0UZnL+LwntGtFPT1SPNtCHAc7QYKT2apLIn060=; b=RkifXN5H2o81L7Q9CxT0Xoqgl3MzoHci0nTItRsIciLS7azOnmr3X20Xt/KuPKBrUQ cxSspFNBCB6rEfrvEiKYPhbNkHO3bFnRcz9TaS987NbrKb38ar5vxV1akgUsuCgRgWGN Syq9EuqYWTrA5A/xeYQKEfN1t3qWxCxxHmaECqX5Dwy8Wow6AYKXVcp99SZw+7+dG6r4 qqq6qnb4EROqOhfK7P4cRydnJMj7VPk/vnHHsbLjY+0M4KTPp7YDg4AOoasU4Y9aiQ2z QgDVe8fvNGor7Hj9iiD2pFCefOBoUULtYCQxVbCx35z8lPLEZ0zp5rcsEt6V+JmoSgBS ofRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GPWkl0UZnL+LwntGtFPT1SPNtCHAc7QYKT2apLIn060=; b=jgbL6gw2zrLaisz7qGklbVtI3TlTEsP+vyVE5LT2/Tcv8HVBBgQ2cc/CBbLGC3SCPJ qhmgyIT7VgpOwfdF3dYlS93GC0Ce1gP/Um5HRV2pII/NB7wqrCeYHvpfcsY6WpO2ZvBV Sr3inScGP5aT3ri+c8mlVV0lXfsXJdLtEa92KHmKKznklsbouMLpjb7/9afibpPftYU8 ijChHTZKs5GeWDCjM0DTpbrKg6LnE8sasL+3QRm6oJTE8ZE5BDexZHznf4ztBsCiEySy dGsB5zTPA9u4r1tFHkjDRmMbJUhE78voJdBNIfoVL2MitMQEbCcqhKjLtiNXa0HWw0Z5 0ZQg== X-Gm-Message-State: APjAAAUzGREPRubEzAIpan7GyN3NMb9ARmsQbsMB04w0tv9Tbd7V3wxe WQh2uoYy5fTGoNaqQmMyr2q2Uw== X-Received: by 2002:a7b:c3da:: with SMTP id t26mr3875216wmj.40.1557421154104; Thu, 09 May 2019 09:59:14 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e16sm3494812wrw.24.2019.05.09.09.59.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:12 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1F4D41FF8C; Thu, 9 May 2019 17:59:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:49 +0100 Message-Id: <20190509165912.10512-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c Subject: [Qemu-devel] [PATCH v1 01/23] tests/docker: add ubuntu 18.04 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann Based on the ubuntu.docker file. Used to reproduce the build failure Peter was seeing. Others might find this useful too ;) Signed-off-by: Gerd Hoffmann Message-Id: <20190503070241.24786-1-kraxel@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/ubuntu1804.docker | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 tests/docker/dockerfiles/ubuntu1804.docker -- 2.20.1 Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker new file mode 100644 index 00000000000..2e2900150b0 --- /dev/null +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -0,0 +1,57 @@ +FROM ubuntu:18.04 +ENV PACKAGES flex bison \ + ccache \ + clang \ + gcc \ + gettext \ + git \ + glusterfs-common \ + libaio-dev \ + libattr1-dev \ + libbluetooth-dev \ + libbrlapi-dev \ + libbz2-dev \ + libcacard-dev \ + libcap-dev \ + libcap-ng-dev \ + libcurl4-gnutls-dev \ + libdrm-dev \ + libepoxy-dev \ + libfdt-dev \ + libgbm-dev \ + libgtk-3-dev \ + libibverbs-dev \ + libiscsi-dev \ + libjemalloc-dev \ + libjpeg-turbo8-dev \ + liblzo2-dev \ + libncurses5-dev \ + libncursesw5-dev \ + libnfs-dev \ + libnss3-dev \ + libnuma-dev \ + libpixman-1-dev \ + librados-dev \ + librbd-dev \ + librdmacm-dev \ + libsasl2-dev \ + libsdl2-dev \ + libseccomp-dev \ + libsnappy-dev \ + libspice-protocol-dev \ + libspice-server-dev \ + libssh2-1-dev \ + libusb-1.0-0-dev \ + libusbredirhost-dev \ + libvdeplug-dev \ + libvte-2.91-dev \ + libxen-dev \ + make \ + python-yaml \ + sparse \ + texinfo \ + xfslibs-dev +RUN apt-get update && \ + apt-get -y install $PACKAGES +RUN dpkg -l $PACKAGES | sort > /packages.txt +ENV FEATURES clang pyyaml sdl2 From patchwork Thu May 9 16:58:50 2019 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: 163726 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1244698ilr; Thu, 9 May 2019 10:05:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqxmNwTPA5RYIMQaJSGBDL68f3jVoV5Ga+p8ERvMoKME5ZYvveQlBI2H68GZDAcPZjx5fZRv X-Received: by 2002:a7b:c053:: with SMTP id u19mr3597344wmc.63.1557421555379; Thu, 09 May 2019 10:05:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421555; cv=none; d=google.com; s=arc-20160816; b=V+EpO05iAqP6m1EvgYa7WvqJNuNJnUAcWRzzfAkxKmyTocb/iUlMQtQmj4tFq07GfT B04xU3Xg9KDfXEYpaClCcH8eMTQJyvhfD5/OXZr1KHivHyHCCBzREJDkv5VNO9SsxYFl 1DKhJA5dYiASK9558DomGZCJOtnHgFt2uSIXZ8GemtKbi4jIGONTZ7fnNkajqc0u8q5s JXlYhJbe2KKIRzgiqlHvzpLG6YESHyBnP7AkS2Khhdl/cSkLw49KkC/oD5jLCttVH9vn GALISfBJTf0cTM5piI5Kk36sehCTtSeoKN7GtDolAug/0duJZdMMn5NRmDH50R7mT+dP 9AXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=bMInk10U9DPIdxrDVbgVpcIvGvM3TC9tcdyqpqFFzTY=; b=Qr1UAVAr+6XtE+G3lHi3Ew9yIGRlwIrFKjWXhSRQPnsjzhf9pKN4GskAmpLQQSm+/m 1gr1QX6hijT2Cky8/Xb4he8ZjKY1hd5JgFnWSQqlJ2MHi2kqYX/BsjxokgGh723zMR39 b5vO3K09U8Ryv1aZA2A8KTlFKrLLf0GZNTQgtwZLjgq7b8WgYaNFUZHmWv8DSagOGyuu PN5u1xelxGkgG42WrNYHpXwJ6H2g8flQO8V5BwDvcILxLkfvygl7xjiKoodkJCl9/E1l 9VmH8n05p3TbENeuysDAfw5ufI7f+U8KAEw5wAqZTI5aRSuKDEd1KHZ26S2E2kM25eIx RnOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZDfoYvFj; 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=fail (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 d12si2301399wrp.417.2019.05.09.10.05.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:05:55 -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=fail header.i=@linaro.org header.s=google header.b=ZDfoYvFj; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmUU-0004KF-AB for patch@linaro.org; Thu, 09 May 2019 13:05:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmO5-0006wO-9i for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmO4-0004qE-6F for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:17 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:44896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmO3-0004pU-Vj for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:16 -0400 Received: by mail-wr1-x42a.google.com with SMTP id c5so4014876wrs.11 for ; Thu, 09 May 2019 09:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bMInk10U9DPIdxrDVbgVpcIvGvM3TC9tcdyqpqFFzTY=; b=ZDfoYvFjwFGI+53DIh0UGgKquZ04X5GPXQ/2iQBEx/TaxptET+iCyTZ0kSD4LGNQix jgbWJxrhltyNHlppjJMAtUguXsVLA4hPWFaWWREDBI4Rkaea97gZP4uspnOdHI7OcB6Z 6n+GPtvjUXFpPmoIuGrjISk/NyE/fRWmPKkFDZAfHLJ+BmTLeu1jde8PZdfmlTorxml2 wuPboAekmv3YIAUF31EfabfqqqwTs04yx2+tUyh5V6rjYAJzRKCW3PfTTOAtENwlHucC UezInEfGzvncMj6k1vCBem4ahPbpO3DkpO0HFlHgAd01aQL4p3KfL3BeTYIn5eghhbbY z8WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bMInk10U9DPIdxrDVbgVpcIvGvM3TC9tcdyqpqFFzTY=; b=mjGJDVVpA1MQWgpQ5FG0ZoXxVKiMnG0chC9lUHYlc90CHbtMHgAOUXoxzVc60MXYv8 tl3BKHJGBIl0AWO2yLw1si/iiNTj9S0Py8RCTY9exMtNJAeLKRdmdfOgBU3hA3pFJB/8 7T0XsB8F0A/s5qY8xmGu0RYf5nz44HBPjn9cbc6r9quzSJ7OzZm4rqZXTNtKT+5Grxc1 CGGQYfDrfiTrTWcLG9jJzPcf6C9v845WcjPkDOIEuwsuJhwPb9WKZHs5GR8cLUiNZNej Mx3TwYdB8cKBqgqGGUKKjm/E/BiCEXkpcKhiNTyi45+q5LMRVXje/Yd/LdBKDRI3mS4J JEFQ== X-Gm-Message-State: APjAAAU7obqHf3LtcP6bTxCQRh85qGVasP8/MuMGGIhGfE+/ATYg+JN5 Yu1SH8yPIKE88M8KgGvamXmmqA== X-Received: by 2002:a5d:4704:: with SMTP id y4mr3849907wrq.86.1557421154902; Thu, 09 May 2019 09:59:14 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i127sm7871188wmg.21.2019.05.09.09.59.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3335B1FF8F; Thu, 9 May 2019 17:59:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:50 +0100 Message-Id: <20190509165912.10512-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PATCH v1 02/23] tests/docker: Test more components on the Fedora default image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Install optional dependencies of QEMU to get better coverage. The following components are now enabled: $ ./configure ... Multipath support yes VNC SASL support yes RDMA support yes PVRDMA support yes libiscsi support yes seccomp support yes libpmem support yes libudev yes Note: The udev-devel package is provided by systemd-devel. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190504055440.20406-1-philmd@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora.docker | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.20.1 Acked-by: Marcel Apfelbaum Reviewed-by: Richard Henderson diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 69d4a7f5d75..afbba29adaa 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -8,6 +8,7 @@ ENV PACKAGES \ bzip2-devel \ ccache \ clang \ + cyrus-sasl-devel \ device-mapper-multipath-devel \ findutils \ flex \ @@ -23,13 +24,17 @@ ENV PACKAGES \ libaio-devel \ libasan \ libattr-devel \ + libblockdev-mpath-devel \ libcap-devel \ libcap-ng-devel \ libcurl-devel \ libfdt-devel \ + libiscsi-devel \ libjpeg-devel \ + libpmem-devel \ libpng-devel \ librbd-devel \ + libseccomp-devel \ libssh2-devel \ libubsan \ libusbx-devel \ @@ -74,10 +79,12 @@ ENV PACKAGES \ pixman-devel \ python3 \ PyYAML \ + rdma-core-devel \ SDL2-devel \ snappy-devel \ sparse \ spice-server-devel \ + systemd-devel \ systemtap-sdt-devel \ tar \ usbredir-devel \ From patchwork Thu May 9 16:58:51 2019 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: 163727 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1244851ilr; Thu, 9 May 2019 10:06:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqwpN2EaA5yzCUU976gwDAQMQgUgu6d3acF47ezm4jcG/1TThiqd6sa/uKI4VkW9LEcMw2Po X-Received: by 2002:adf:e5cc:: with SMTP id a12mr4226724wrn.78.1557421562525; Thu, 09 May 2019 10:06:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421562; cv=none; d=google.com; s=arc-20160816; b=b8dcWd8ZbHP0HZ3wmZEdISt81OHy/X0OitVCihmY+tXv0FURh1IsFW4SXU3tW9s+E3 ecli46FWjF8ocdy2X1OK1CLPprnKZ9kyTNqSuLdQWQNOMFJRVLFSv/6NQJALfuYjhG7n i4rtTOmZ26faN9d2RJa75MVsn7zbDO+DBXtoSGj/I4I6sVWUlZDtvqn7j6rQ6ddMQUKd rr0/pNDNfy0RWR4FcZoZuyxcyPUFscmic+hqhNARVnXwX0gs3fNAbsXF9nqGKt5S9fZp U5nsVGZULXmHcxDosXR5GDnMcGf3XvB9iYMXU2e7kZps6ozh6iPFKRAGZXVw6J2DQB2l KRNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=fv7yjgipiPIa0iKuBxA7WsxKljcgZAsZBYR7nSKLcJ0=; b=K1s9iZsx6BZRg54ylGdrdFXw4eWpJhjKiWu+6KUL7H2pnxsI9KZypV5IlR8z/zvFAU OSCpoNYliEHvWqchk560HgY6T/yATulcyIdt6BK8ka+X0kht7+HvHtiDLw/qmJHDBmPe ltTvGrKBP6ISYgrncQ4BBLFZ29I0s22/bOr39nxj5pZNh5EFkjWmkWL7DonAeVnx6tLu 4+9ucHWPCBkvA24ZkaU0vc+1nV/OJR05p4GQNaW/DVlQ9ACvBrZ0taIj0ABgt3hd4mZo rCgHM2jRgqRrrqWRrGo+xwnct5gJ+Rekh9oy5fStsElWm1ZnZlecq2+slDSdT+1x5OI7 /DsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CfLiTxHX; 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=fail (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 a10si1908634wmb.136.2019.05.09.10.06.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:06:02 -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=fail header.i=@linaro.org header.s=google header.b=CfLiTxHX; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmUb-0004QJ-GO for patch@linaro.org; Thu, 09 May 2019 13:06:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmO6-0006wy-4y for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmO5-0004qt-1g for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:18 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:54249) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmO4-0004q2-Qm for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:16 -0400 Received: by mail-wm1-x341.google.com with SMTP id 198so4145961wme.3 for ; Thu, 09 May 2019 09:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fv7yjgipiPIa0iKuBxA7WsxKljcgZAsZBYR7nSKLcJ0=; b=CfLiTxHXQS09fZyR7C18+yYYk7t5LmtKTh/UDGhqLIdUJ/BB6YYVC6OgQNXHxchFqE u4c7EFzDLFEFMIC9G9jXA+kbK6O0nb3WLFkyGeIX1LHTW79BR1CpC2NHUndW6lVUb3p3 SYi4asNN4xGO6zgLK+i1KR3j2VZOgKWFWJSXjJCGQQkfxEyg3pG/ksj6kLfNRsBwvCoU b2teNuLGwy61PHFjMkLDigxgjqaUqyfJbQGUM1zIc3xYV/KNq0eUF7tPVSkCV2XMoqdd hyOiob5TaIcqvbz0QJLSQdNwRnUJbk/E8I1Z1+pbAxZZ2iQQWRUzQOJHf8hmeKZ9JOS0 K4vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fv7yjgipiPIa0iKuBxA7WsxKljcgZAsZBYR7nSKLcJ0=; b=q2g4YYT1ycFFzdeQIiO1yUNb8fBxdYwwMwNbVsuFuWmwz6MUK0A+uqkl7awitFT/co WeLCeQ59ZZkyOTr9FeFSyVRJiQY3aIc50HrvUF+s78sbQhv4DraIQDNHqiXB9kBkjaeV dstMe9ENhoZRgyIIleF1m2lhdXbcpw59cXEJ/33FRoZA305PWbFEOnBg6B/wcRnm4W2S fnagyVlxymqBQBMvA+KDpJraOUJw4h2xSvQzzuEaQNq91njXPPqa/wbefJzXj3zaq+fN VxgxOCHiovxkyZSI5CuHewUNRHqKyJpIzunNiiaDb/D24OrfKCrFNnCgockLMghAxm8a nGgQ== X-Gm-Message-State: APjAAAUqusazccLqmXrwAwkb6ptglOYJzkNv/GqmbhKqb364cklnSlU3 yb72i6o5ANOQ272WwWZat4YHB2qeW08= X-Received: by 2002:a1c:f207:: with SMTP id s7mr3808663wmc.137.1557421155677; Thu, 09 May 2019 09:59:15 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a9sm3360785wmm.48.2019.05.09.09.59.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 49CCF1FF90; Thu, 9 May 2019 17:59:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:51 +0100 Message-Id: <20190509165912.10512-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v1 03/23] tests/tcg/multiarch: add support for multiarch system tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can certainly support some common tests for system emulation that make use of our minimal defined boot.S support. It will still be up to individual architectures to ensure they build so we provide a MULTIARCH_TESTS variable that they can tack onto TESTS themselves. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/Makefile | 1 + tests/tcg/multiarch/system/Makefile.softmmu-target | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 tests/tcg/multiarch/system/Makefile.softmmu-target -- 2.20.1 diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 1cdd628e96f..6fa63cc8d53 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -96,6 +96,7 @@ else # build options for bare programs are usually pretty different. They # are expected to provide their own build recipes. -include $(SRC_PATH)/tests/tcg/minilib/Makefile.target +-include $(SRC_PATH)/tests/tcg/multiarch/system/Makefile.softmmu-target -include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.softmmu-target ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target diff --git a/tests/tcg/multiarch/system/Makefile.softmmu-target b/tests/tcg/multiarch/system/Makefile.softmmu-target new file mode 100644 index 00000000000..db4bbeda44c --- /dev/null +++ b/tests/tcg/multiarch/system/Makefile.softmmu-target @@ -0,0 +1,14 @@ +# -*- Mode: makefile -*- +# +# Multiarch system tests +# +# We just collect the tests together here and rely on the actual guest +# architecture to add to the test dependancies and deal with the +# complications of building. +# + +MULTIARCH_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/multiarch/system +VPATH+=$(MULTIARCH_SYSTEM_SRC) + +MULTIARCH_TEST_SRCS=$(wildcard $(MULTIARCH_SYSTEM_SRC)/*.c) +MULTIARCH_TESTS = $(patsubst $(MULTIARCH_SYSTEM_SRC)/%.c, %, $(MULTIARCH_TEST_SRCS)) From patchwork Thu May 9 16:58:52 2019 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: 163729 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1245925ilr; Thu, 9 May 2019 10:06:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqxMT7407yaRpgluooIZn+9VKcG7fz74/KbacD/2TZuCnAi2P04cy7tPHsLnk2Aincv7q+XM X-Received: by 2002:adf:c748:: with SMTP id b8mr4051900wrh.292.1557421616156; Thu, 09 May 2019 10:06:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421616; cv=none; d=google.com; s=arc-20160816; b=varx+SyiRkPTaM60waWu6b+wHep7XQ/aOCD0NhBRlnFlumfP7vrW1bKD3dj6hD9nG4 2NwoL7Gefp0zq9tyQompmOVJyu9KKchJ+W9i7DkbwoNaHHEioRY5NvTPzj2+LDgVGMWV 7ClXIWX7jqvNXtoki/5oKWmRpyzwTNR9WbmOwx/5TooSSDpK7Dg30DAMb1aImPljtxNt EWV9yQjPg9DHBtRBmWv5Vb6QAnzJ6Sn9uNuLTjv5vYR2SfOqNHBUsfm62EFoPFuB4LE0 nwkJryTDw08qGI1RUK0m/7F5+uAjEwF9uqpmTPmMuoD8o9s9kM72b+sSW+/mi7VHqonu XTlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=HYpRsvHEmUYvBYy6wQQpwlcDtNoNBQtfcPxm0CQghqY=; b=fIdk7PQ0Qr3GEmDgvjLLb69V0hPy/rjoeOim2xExksSdT9EPnDovN67RAsqHK3zcZN 7eRCrrg3/KIftdcw4X4+ipOTX+x2mAEOLjsq7IDRzQAvA2vutg+KaJTO80MM1PNjfnZr TZKvfUgGgIr/00cjoWsZI45/jRcNvWwTrrPYv9MFyqdMkprBsoacEtp0/rFcJNtev5X1 IpHG5EOzfjyFgicm95K2aZ+ZD70iORxgwUyz3fENExzSr6a6WkWteyYbjghTHIplmOzJ QY+x9wiAaeVK3ZgNQPef26j1w5Lc4bQ8W4ZvR2tqIY7ydDS1mQDoHa+3xhvgooIfPU0h UKPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=K5QXXnuq; 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=fail (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 i12si841056wrs.50.2019.05.09.10.06.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:06:56 -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=fail header.i=@linaro.org header.s=google header.b=K5QXXnuq; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmVT-0004rl-2p for patch@linaro.org; Thu, 09 May 2019 13:06:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmO6-0006xQ-QK for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmO5-0004rd-OK for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:18 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:38982) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmO5-0004qd-HZ for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:17 -0400 Received: by mail-wm1-x344.google.com with SMTP id n25so4038279wmk.4 for ; Thu, 09 May 2019 09:59:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HYpRsvHEmUYvBYy6wQQpwlcDtNoNBQtfcPxm0CQghqY=; b=K5QXXnuqpMpsblN5MWXxlJdH7hUHKZE0RVI1U+xGNC4t1l4uHqqElDSlYwJVQlB1mO 7wxQEoj8jDclS5b8s2iecgoFqTD8aPOI+/rWlZktKLu0XYJ1jVXcw1HPJEFhbuJPWwJq e7gy9q3vQdzQGDNIv8b6sSLGbzKRxD8IWibgKIEzjqwxjG9xNaLDnF6oAGhbX2vbn7mg Lu0ObcVlR6HVstFEp+Lzw9+xN8U+RpA3dRuKIxIZeErX6hDKf/2fiFeckwQmxxo7cHIJ fawt5lJC70NRSr9+7NeEqxEqSbHerxSIRkNywNci3+VXITNK2D+cWvTtYMeBk7vfg3GH c0ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HYpRsvHEmUYvBYy6wQQpwlcDtNoNBQtfcPxm0CQghqY=; b=Yb3AFfw3ud6yPmWQHh3bZP0nGib6vWGJ6RGnTu8toMY8jkZiOOh1jgG5QGoKZqVYZi vgj5bZ0tv60xPZ5uyNGAJbwZsyp/7mUWXqmbdp7qpe4fuS4Vi9VSHzrzu4KXzKa/NQlc VtlJJ5TJ47oarkF9jSRGToCfOe77gdNBUfEyZBS55sLe32vu2ZqXfMrcHMqgVxVcYWcx sxzNnREEM7V+Dg5zDwRDjtVtNKexlkSZGfby0GcaBYiBNlmK9YLpwer0EYHCRPWHVtk6 ewQUBVX7sQtQL0S0z1ORYFykuv+Aobihs5ZFxElranpej336RaIho2ez/7XhBM0ESXLo OTKw== X-Gm-Message-State: APjAAAVLkeV6VtgudG6KLhwvMvC2OzQgE0LKnc/L5CzXtEEpF5JnclXt B4LEokZxR8082QvbIE0BwEKMCw== X-Received: by 2002:a1c:f606:: with SMTP id w6mr3511639wmc.130.1557421156454; Thu, 09 May 2019 09:59:16 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o130sm1684973wmo.43.2019.05.09.09.59.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5DD361FF91; Thu, 9 May 2019 17:59:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:52 +0100 Message-Id: <20190509165912.10512-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v1 04/23] tests/tcg/multiarch: add hello world system test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is not really i386 only, we can have the same test for all architectures supporting system tests. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/i386/Makefile.softmmu-target | 2 +- tests/tcg/{i386 => multiarch}/system/hello.c | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/tcg/{i386 => multiarch}/system/hello.c (100%) -- 2.20.1 diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target index 53c9c5ece06..c31bbbf39a7 100644 --- a/tests/tcg/i386/Makefile.softmmu-target +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -27,7 +27,7 @@ CFLAGS+=-m32 LINK_SCRIPT=$(I386_SYSTEM_SRC)/kernel.ld LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_i386 # FIXME: move to common once x86_64 is bootstrapped -TESTS+=$(X86_TESTS) +TESTS+=$(X86_TESTS) $(MULTIARCH_TESTS) endif CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC) LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc diff --git a/tests/tcg/i386/system/hello.c b/tests/tcg/multiarch/system/hello.c similarity index 100% rename from tests/tcg/i386/system/hello.c rename to tests/tcg/multiarch/system/hello.c From patchwork Thu May 9 16:58:53 2019 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: 163728 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1244883ilr; Thu, 9 May 2019 10:06:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqyXTw0DcDxpWaUbqTysVES/AK4CKjMOARel5ZNIhoDCkn0MyAAGtJJxp08Y50j5KVUHyj49 X-Received: by 2002:a1c:4406:: with SMTP id r6mr3767652wma.130.1557421564258; Thu, 09 May 2019 10:06:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421564; cv=none; d=google.com; s=arc-20160816; b=1Gy1ZLNsT7lbHrlkci9u862tlFcuBaXySLpSNUzb+XI3oPj6hFMNxOhZXfBZKm5UZ0 ndY4Y/9QFE7DRuAndSLDyXB0gTJq+IYmufTGhP0fhxfFpc/RPyBTdMXge0HVnA6NWV9B UwzeTR1gko5Z8jlO7DRCdpwNzEBjUDaU095xZBvG/U3088c0+s6EfbSmKfnxHtacxVfz OKa5Qgu5QG1zS8J9pYdGnkBL/eYxqRqCZokMoqCBB4bP/xMjPTwz+TrcmRf7M0t/AZzU ckgSG1DzxmiNEP8URjzMwilrKODZPqYfcOMK0vLfcGg/KyMjONkHTZlc19UtVdMT8F4h yjMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=OpvEU2mddt+GIEBclmCB/up2u9bmndzrghYWbyOx7a4=; b=wEgEKx7kWnRg/d9oySQowocdoQ2040xjemKnrmVEgFBAIefkRhCrypcX3tUhSbWvzf YScJ9TO6LOQgpRygdGUF1l+tmDkQEcj99g51KkhzU6MuSQ+3bRx2rY1m9vZUsYbpqnBR qEqoNP2vYNStfchNcrGtDxuMfWIsNASCj7hRSeoAzHAxId3lwR5wX+qDlPrI7BBD3hhD zHmDOfQaexVARpBAKnWScF7nRslVD8lAQBCTSbgJjszwsjK+Oq8XFsW75bDpMP1upC/X U0tlrjnqo46tA78L3D4HrelXnHXFO6AdsYhrMAHrTBCjVyHaa18zRTpO9a5LwmyoZcz9 pvQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aiBWJLQZ; 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=fail (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 p23si1916196wma.55.2019.05.09.10.06.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:06:04 -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=fail header.i=@linaro.org header.s=google header.b=aiBWJLQZ; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58079 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmUd-0004Rd-5N for patch@linaro.org; Thu, 09 May 2019 13:06:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmO8-0006zP-H6 for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmO7-0004tA-0y for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:20 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmO6-0004s5-QP for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:18 -0400 Received: by mail-wm1-x343.google.com with SMTP id b203so4153637wmb.4 for ; Thu, 09 May 2019 09:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OpvEU2mddt+GIEBclmCB/up2u9bmndzrghYWbyOx7a4=; b=aiBWJLQZO3EkGYv6kP7hHdprELwVPbY0I2KN6yJXCAGigCqRp+8zJN6iqYkx7ykbX3 mfEau5E+UinD92HCzN/FsUai3ioTH9u0Je69LEg2veIiOLtXanuhwoBplRDc2rugqWEP ZuM89h+B+wObjJUxTZiooI7mWvGA58oeMSRnOMm4sR2srrzaAlV0ubgylpnhFnyU7o+G nH2EE0IkAx6pveSUov/H2IkLgd/EUdXwbrnhHBPK/TGJKKv8RQs4Qma80+dABE/FpSoN Wi9NSLDK0guWRUVRRuC9ReLLP4CzQcRDbb/l2ah45Ilpe7tg6XwbGAV7ltgxQ39EvC9i kb4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OpvEU2mddt+GIEBclmCB/up2u9bmndzrghYWbyOx7a4=; b=Rbeu6EVWmqMRT+8MgB5HKja8cRS27zKjpRSDCfcCofYM9zluAKFN2A/hbrlCUNw/kr ltRukK0eHaoyWkm8wRTu12gpAJC64XdYomJ1t6ROxWD3lB+SCkadwcG2nIaWySa1SC1I yPQ9AVQqh197en2NNigL91whhXsLf8Cv1gbKstGMl+udvpFJyum99FuCApjjpRMc4tNn IsrMYMNnmbpCJ7Cc1R9ZoxGDhaGTqgQdckBx1KrKUj2FIAfuL02usffckKL+HRhsohLR A+s+Vph594gGz2ucOOAO28APVhVX909wpxwKlD1napXUofx2M6xJqcZ2vLIAvg38HWOn DD5Q== X-Gm-Message-State: APjAAAXhq1w018xFmF5iRI8w+jPEyqwxOVdoURu2RqO3BuZIg62bwT9s +hU1UKL+s5DP+2QB/ee1FvPT2j/BUuE= X-Received: by 2002:a05:600c:d1:: with SMTP id u17mr3635272wmm.2.1557421157743; Thu, 09 May 2019 09:59:17 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u20sm24373wmu.34.2019.05.09.09.59.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 75EC81FF92; Thu, 9 May 2019 17:59:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:53 +0100 Message-Id: <20190509165912.10512-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v1 05/23] semihosting: enable chardev backed output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For running system tests we want to be able to re-direct output to a file like we do with serial output. This does the wiring to allow us to treat semihosting like just another character output device. Signed-off-by: Alex Bennée --- include/exec/semihost.h | 6 ++++++ qemu-options.hx | 6 ++++-- target/arm/arm-semi.c | 21 +++++++++++++++++++-- vl.c | 23 +++++++++++++++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/include/exec/semihost.h b/include/exec/semihost.h index 5980939c7b8..f5cc9ad2759 100644 --- a/include/exec/semihost.h +++ b/include/exec/semihost.h @@ -51,12 +51,18 @@ static inline const char *semihosting_get_cmdline(void) { return NULL; } + +static inline Chardev *semihosting_get_chardev(void) +{ + return NULL; +} #else bool semihosting_enabled(void); SemihostingTarget semihosting_get_target(void); const char *semihosting_get_arg(int i); int semihosting_get_argc(void); const char *semihosting_get_cmdline(void); +Chardev *semihosting_get_chardev(void); #endif #endif diff --git a/qemu-options.hx b/qemu-options.hx index 51802cbb266..6aa3a08c2fb 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3975,12 +3975,12 @@ STEXI Enable semihosting mode (ARM, M68K, Xtensa, MIPS, Nios II only). ETEXI DEF("semihosting-config", HAS_ARG, QEMU_OPTION_semihosting_config, - "-semihosting-config [enable=on|off][,target=native|gdb|auto][,arg=str[,...]]\n" \ + "-semihosting-config [enable=on|off][,target=native|gdb|auto][,chardev=id][,arg=str[,...]]\n" \ " semihosting configuration\n", QEMU_ARCH_ARM | QEMU_ARCH_M68K | QEMU_ARCH_XTENSA | QEMU_ARCH_LM32 | QEMU_ARCH_MIPS | QEMU_ARCH_NIOS2) STEXI -@item -semihosting-config [enable=on|off][,target=native|gdb|auto][,arg=str[,...]] +@item -semihosting-config [enable=on|off][,target=native|gdb|auto][,chardev=id][,arg=str[,...]] @findex -semihosting-config Enable and configure semihosting (ARM, M68K, Xtensa, MIPS, Nios II only). @table @option @@ -3988,6 +3988,8 @@ Enable and configure semihosting (ARM, M68K, Xtensa, MIPS, Nios II only). Defines where the semihosting calls will be addressed, to QEMU (@code{native}) or to GDB (@code{gdb}). The default is @code{auto}, which means @code{gdb} during debug sessions and @code{native} otherwise. +@item chardev=@var{str1} +Send the output to a chardev backend output for native or auto output when not in gdb @item arg=@var{str1},arg=@var{str2},... Allows the user to pass input arguments, and can be used multiple times to build up a list. The old-style @code{-kernel}/@code{-append} method of passing a diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c index 8b5fd7bc6e3..4c326fdc2fb 100644 --- a/target/arm/arm-semi.c +++ b/target/arm/arm-semi.c @@ -32,6 +32,7 @@ #include "hw/arm/arm.h" #include "qemu/cutils.h" #endif +#include "chardev/char.h" #define TARGET_SYS_OPEN 0x01 #define TARGET_SYS_CLOSE 0x02 @@ -310,7 +311,15 @@ target_ulong do_arm_semihosting(CPUARMState *env) if (use_gdb_syscalls()) { return arm_gdb_syscall(cpu, arm_semi_cb, "write,2,%x,1", args); } else { - return write(STDERR_FILENO, &c, 1); +#ifdef CONFIG_SOFTMMU + Chardev *chardev = semihosting_get_chardev(); + if (chardev) { + return qemu_chr_write_all(chardev, (uint8_t *) &c, 1); + } else +#endif + { + return write(STDERR_FILENO, &c, 1); + } } } case TARGET_SYS_WRITE0: @@ -322,7 +331,15 @@ target_ulong do_arm_semihosting(CPUARMState *env) return arm_gdb_syscall(cpu, arm_semi_cb, "write,2,%x,%x", args, len); } else { - ret = write(STDERR_FILENO, s, len); +#ifdef CONFIG_SOFTMMU + Chardev *chardev = semihosting_get_chardev(); + if (chardev) { + ret = qemu_chr_write_all(chardev, (uint8_t *) s, len); + } else +#endif + { + ret = write(STDERR_FILENO, s, len); + } } unlock_user(s, args, 0); return ret; diff --git a/vl.c b/vl.c index b6709514c1b..34bbb4df865 100644 --- a/vl.c +++ b/vl.c @@ -511,6 +511,9 @@ static QemuOptsList qemu_semihosting_config_opts = { }, { .name = "target", .type = QEMU_OPT_STRING, + }, { + .name = "chardev", + .type = QEMU_OPT_STRING, }, { .name = "arg", .type = QEMU_OPT_STRING, @@ -1356,6 +1359,7 @@ static void configure_msg(QemuOpts *opts) typedef struct SemihostingConfig { bool enabled; SemihostingTarget target; + Chardev *chardev; const char **argv; int argc; const char *cmdline; /* concatenated argv */ @@ -1386,6 +1390,11 @@ int semihosting_get_argc(void) return semihosting.argc; } +Chardev *semihosting_get_chardev(void) +{ + return semihosting.chardev; +} + const char *semihosting_get_cmdline(void) { if (semihosting.cmdline == NULL && semihosting.argc > 0) { @@ -3027,6 +3036,7 @@ int main(int argc, char **argv, char **envp) int display_remote = 0; const char *log_mask = NULL; const char *log_file = NULL; + const char *semihost_chardev = NULL; char *trace_file = NULL; ram_addr_t maxram_size; uint64_t ram_slots = 0; @@ -3744,6 +3754,8 @@ int main(int argc, char **argv, char **envp) semihosting.enabled = qemu_opt_get_bool(opts, "enable", true); const char *target = qemu_opt_get(opts, "target"); + /* setup of chardev is deferred until they are initialised */ + semihost_chardev = qemu_opt_get(opts, "chardev"); if (target != NULL) { if (strcmp("native", target) == 0) { semihosting.target = SEMIHOSTING_TARGET_NATIVE; @@ -4277,6 +4289,17 @@ int main(int argc, char **argv, char **envp) qemu_opts_foreach(qemu_find_opts("chardev"), chardev_init_func, NULL, &error_fatal); + /* We had to defer this until chardevs were created */ + if (semihost_chardev) { + Chardev *chr = qemu_chr_find(semihost_chardev); + if (chr == NULL) { + error_report("semihosting chardev '%s' not found", + semihost_chardev); + exit(1); + } + semihosting.chardev = chr; + } + #ifdef CONFIG_VIRTFS qemu_opts_foreach(qemu_find_opts("fsdev"), fsdev_init_func, NULL, &error_fatal); From patchwork Thu May 9 16:58:54 2019 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: 163724 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1240004ilr; Thu, 9 May 2019 10:02:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqzN2Y06tK/DEFjeoQzjvSzbZ+48pKwP1Uq6J1TTPrSc+W9PLkgVpUo7EAzi/GWpdfGfdN8S X-Received: by 2002:a1c:f205:: with SMTP id s5mr3828449wmc.124.1557421350437; Thu, 09 May 2019 10:02:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421350; cv=none; d=google.com; s=arc-20160816; b=b1M2lS2PK6rTi6vyGlrAarj5m6pVt/UgR8Y/YiAUnPNYrEQmGn/LLf10q6GFpRyN37 iOoTmK7xXe6AzXvXABs22134F3G0uP0yV/4v1YxGPP6KuamL3IDjcnmtjJxD0TNtOGWj QPILo7wQSk3K58NzUBDPCwbgq1W9lhbngkc1PhPZjhyHGrhNXG4AIy6wJdrpuLMO5EQv ikY2BTFqqKZfoLe7fp6st6nnOETpDtsGGLNasAnNe+qonbu4CNlY1g0wdlxPsnqrUVSG g+eqnvFiS7bZhBMXTrhzB6GBWf22o3wTu2nuc2VxAUPjNEwXISocC+I3n1h2TFMZBcJT uFEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=aFzzG2auF78ywEWte0MlDNULKwD0Ag6042JYL1TfabE=; b=ISuPUXiC9CFgthgZH91FVS7+HNGkQN8AEsGv/9PdbFLrC6C7mLpXelR2eFj67AerJ3 2jYxup1NpqgSoMBHiXSjfaYFvAtAu1FJTvc/x5jHpQ7cBQhgDp9lfKDfir5X1aACaQir jHE4dXxUTnbVmnP3FQbQhVK2bB2r3OgXhg/xCYpC9Uq9VSN/koa4ovW0Bl33biV4BJRE 6dLb/FAEwxIKFRKLHyEQcA0M/iCSQ5xWCKKCO1jGD+C5Ga9apRUZAUlqV58tfmzatrJO q1opGrNSQLgiI3vsK2KCUWRw0dNSBTNsFbXuD7cNUE1xIMx3NHz+6jQMmn9hU+mB0/iA xDvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LgMcDmdS; 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=fail (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 e11si2298435wrv.114.2019.05.09.10.02.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:02:30 -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=fail header.i=@linaro.org header.s=google header.b=LgMcDmdS; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmRB-0001gh-Ce for patch@linaro.org; Thu, 09 May 2019 13:02:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmO7-0006y7-Me for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmO6-0004sT-Ey for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:19 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:51814) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmO6-0004rS-9E for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:18 -0400 Received: by mail-wm1-x342.google.com with SMTP id o189so4179600wmb.1 for ; Thu, 09 May 2019 09:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aFzzG2auF78ywEWte0MlDNULKwD0Ag6042JYL1TfabE=; b=LgMcDmdS5px4u8Edm/5nbq69gWtrPO9scm/6E7lFOTW7TNceii628hCGTr8PPPgpk1 /82Mk43KXWx1erYG5ZEv7SrqoZF7HiVCf75Qm83HaWsK5go9FNZhe5OBDZBS1DwaEYrW jjLTBkKIfFQedR784PloXjJiXsonsLp4vRlTaAmUPiN9RojiVAZK+I4160SpM1cdqyUC owwGT5y6NpFuhKtradGHbxS+s1FzrfeTT0V5atBaQ99PrwmDtUbxwzenlp9kbUFo8S7N kCq5tNS05aC+QpFl5TlnFqplZpNqkkSn6yBMwflb5xuiHmv8wj7K/RAtiIrvqn8jbmhj liUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aFzzG2auF78ywEWte0MlDNULKwD0Ag6042JYL1TfabE=; b=VWUaHCwC7Q/rWR7wjo2TELzDCCDIztpEy7FgaEmjGXmvv1dodlugcCxfVZ2qNzshhy ZYzZkwOODUB2Cuw9owDo5S7cpT1IKy5NDx2PlIAiHadMVDNlDOkUdbyV9vlOGlnVpe2k 35ajLFYba2cFrKL0a3EWfYZx08DMBgknJwh0I09aWfM5tcvwUNXff6KVVwnJwC5Lbicd Lv9Mk2+yctQ5ggmgPs5JMBopKxtlNsEwj2XKW99kYh3EtxZ3gtQU74ubCXZX8hqks/n7 nocQsSAR34Dor8pAqOeclw8kPe5tdBzaWabJI/OjusKhD+1mYDxguW+tO7Lh7KIWPzRU Ud9Q== X-Gm-Message-State: APjAAAWTFQZMyKdUgcrtMvYWxLL6LjfJDFf+gV7V0zBPvv2PkWYwujjg 8YUFvaaUbhkiR5nVuoT2CK++0A== X-Received: by 2002:a1c:7e08:: with SMTP id z8mr3870168wmc.36.1557421157208; Thu, 09 May 2019 09:59:17 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h81sm8627276wmf.33.2019.05.09.09.59.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 87DF21FF93; Thu, 9 May 2019 17:59:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:54 +0100 Message-Id: <20190509165912.10512-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v1 06/23] editorconfig: add settings for .s/.S files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We are starting to add assembler foe tests/tcg so lets make sure we get the mode right. Signed-off-by: Alex Bennée --- .editorconfig | 5 +++++ 1 file changed, 5 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/.editorconfig b/.editorconfig index 15828833938..df6db65531d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,6 +26,11 @@ file_type_emacs = makefile indent_style = space indent_size = 4 +[*.{s,S}] +indent_style = tab +indent_size = 8 +file_type_emacs = asm + [*.{vert,frag}] file_type_emacs = glsl From patchwork Thu May 9 16:58:55 2019 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: 163733 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1250152ilr; Thu, 9 May 2019 10:10:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqySEC27DqQNIaWSV0IMlKHbh8Tc+R5f62MptJ31EzIoCYbXuEY6TataAldZVTd395UX0jAs X-Received: by 2002:a1c:ab09:: with SMTP id u9mr3545887wme.29.1557421827853; Thu, 09 May 2019 10:10:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421827; cv=none; d=google.com; s=arc-20160816; b=Qp8z7zRWeSTg6Cggiw102fL8wtkJxmhNN4+2BK271crVPbuXSHUvfnCLAC4tax/7ub uD43K8oLDJ2o5TDEC+0WVG8q0/ZUwEnBvnoLGbFXJpKFDt5TF9ZHDU0ogXBR+wbAZ9EG uvfT0SIN5CzcXNeu5YTA5BOP9zG7HULary6FY0m94fS2bUVg4r0o74Gn8oExwJIJzXnY YuQHvMpd8S8Txe9jh86JG2zwPMwixncSiT0+dcylmds8NZNx7gYZ+TV09rlyQhueQ4t/ MWOHxB9Anjl7TvTi4RQP7JhVCza5DmNIBKk0nTyEu8ha+U6/0I14ucujGStsd9lD+q+0 B8Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=r55nf64rXTYonXxnBwdRPnRpArKhgZe9MpWloO32Vxg=; b=LvxU222QoaitkHrBLy2YzVzBcQYPauhwdweCPEq5fJJJL1HmRZJyfw9egYg/+gS7Qr XTsUGWyqqnyaoIRpvJjD0gzFHQpkF5/B42rix5PhRu3hdUOeQWoiOnPlPvywvFtAnRXS RVt+g3AMBWegmX4G7mipWOZ28LLWCQmj2PA9vgfNtUTOSKwVapfishdJS4GdBipc+T36 rF08nLNECIZmZxMvggG0+qygLk7bCkc+ojR7SDTVplq7cu7MLNJJ0NxmJmKT+ueViqqi zAeuHeUmVMISgskSJQskOEY9jjwGbnv/8cHs4ToOqZgWoWspMLknTJOAGfgrfPtk61+3 s7fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Hhm0veeB; 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=fail (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 u9si2240219wri.332.2019.05.09.10.10.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:10:27 -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=fail header.i=@linaro.org header.s=google header.b=Hhm0veeB; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmYs-00087X-HZ for patch@linaro.org; Thu, 09 May 2019 13:10:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmOE-00075l-2e for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmOC-0004xL-8O for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:25 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:36389) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmOC-0004wY-1i for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:24 -0400 Received: by mail-wm1-x343.google.com with SMTP id j187so4086958wmj.1 for ; Thu, 09 May 2019 09:59:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r55nf64rXTYonXxnBwdRPnRpArKhgZe9MpWloO32Vxg=; b=Hhm0veeBIE/ZX5O9Xv0p8XloLTPr2TejMXnt2lGqWJBm4522NKGvWyU6JY9BBeGfiO IosZYRP6nKB48LfzFw0y5Of+AtK9jdzED3OveNSmX2XoUXlCnseQjPqyV22IIDqwvWJS /kIGcazT/hcgXlsEXoaLYJCy++BFPttUJddaR4r7CtwF0p5mf8hWMWYWd5OdVfn0Tmmw Rx25cgIMMltoMG4SUHm2P/YEWtS9LkjXX+Jgy3moBeXbsNFOx0SLp2n40pUPr1LmAQ0p DEfbVn4roowNPN0nDg7NB7lGxpFrzVTMk5cYEm0MrdkwHscMb0EbNhR+2z25S7uMkgQd JhrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r55nf64rXTYonXxnBwdRPnRpArKhgZe9MpWloO32Vxg=; b=GSkOVT+bmBhn6Am5CXfZtgrn8ansyijDHd9WBUBaSc0nQ0ab1b09GNhv8Pu4ydMmLt ugXIiNR318i3vKJUtZlHCtQOQEDhfszx74uTIb53VTbVo+x/Ka0mSCBjcDGY9a2W9l4I 4EdBzqwL0gper0uLYjClwgYgBf4JwHK7V15/J8YfUfZvTQnOyuHd89+8uZfKSFDTsUWG 0Va6kq0zzq+JRCLlLuV2hDaskIDoBAFpG+x8eW0WjqUorjM/1To+kSK27feUlj1WEFut p2MONjcxWfZAEEiE0tvNNyi2wjB4cStcviMhNHosNlmb040z/e5NrTLvoLOayLdk5g5w AK6g== X-Gm-Message-State: APjAAAUPSqhYT65QJnnw0QqH8WZMj/8Lv6DQW9rVKI5S9FkCWuyXbYsk JxBygQRNL/aUYFs+ukbTuzqgiw== X-Received: by 2002:a7b:c304:: with SMTP id k4mr3906011wmj.22.1557421162955; Thu, 09 May 2019 09:59:22 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a4sm4293424wmf.45.2019.05.09.09.59.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:17 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9EE0A1FF96; Thu, 9 May 2019 17:59:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:55 +0100 Message-Id: <20190509165912.10512-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v1 07/23] tests/tcg/aarch64: add system boot.S X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This provides the bootstrap and low level helper functions for an aarch64 kernel. We use semihosting to handle test output and exiting the emulation. semihosting's parameter passing is a little funky so we end up using the stack and pointing to that as the parameter block. Signed-off-by: Alex Bennée --- v2 - fix tabs - 2 stage table lookup with ro and nx sections - set stack to back - moar comments --- tests/tcg/aarch64/Makefile.softmmu-target | 32 +++ tests/tcg/aarch64/system/boot.S | 239 ++++++++++++++++++++++ tests/tcg/aarch64/system/kernel.ld | 24 +++ 3 files changed, 295 insertions(+) create mode 100644 tests/tcg/aarch64/Makefile.softmmu-target create mode 100644 tests/tcg/aarch64/system/boot.S create mode 100644 tests/tcg/aarch64/system/kernel.ld -- 2.20.1 diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target new file mode 100644 index 00000000000..cdb836f7e1e --- /dev/null +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -0,0 +1,32 @@ +# +# Aarch64 system tests +# + +AARCH64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/aarch64/system +VPATH+=$(AARCH64_SYSTEM_SRC) + +# These objects provide the basic boot code and helper functions for all tests +CRT_OBJS=boot.o + +AARCH64_TEST_SRCS=$(wildcard $(AARCH64_SYSTEM_SRC)/*.c) +AARCH64_TESTS = $(patsubst $(AARCH64_SYSTEM_SRC)/%.c, %, $(AARCH64_TEST_SRCS)) + +CRT_PATH=$(AARCH64_SYSTEM_SRC) +LINK_SCRIPT=$(AARCH64_SYSTEM_SRC)/kernel.ld +LDFLAGS=-Wl,-T$(LINK_SCRIPT) +TESTS+=$(AARCH64_TESTS) $(MULTIARCH_TESTS) +CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC) +LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc + +# building head blobs +.PRECIOUS: $(CRT_OBJS) + +%.o: $(CRT_PATH)/%.S + $(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@ + +# Build and link the tests +%: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) + $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + +# Running +QEMU_OPTS+=-M virt -cpu max -display none -semihosting-config enable=on,target=native,chardev=output -kernel diff --git a/tests/tcg/aarch64/system/boot.S b/tests/tcg/aarch64/system/boot.S new file mode 100644 index 00000000000..b14e94f332d --- /dev/null +++ b/tests/tcg/aarch64/system/boot.S @@ -0,0 +1,239 @@ +/* + * Minimal AArch64 system boot code. + * + * Copyright Linaro Ltd 2019 + * + * Loosely based on the newlib/libgloss setup stubs. Using semihosting + * for serial output and exit functions. + */ + +/* + * Semihosting interface on ARM AArch64 + * See "Semihosting for AArch32 and AArch64 Relase 2.0" by ARM + * w0 - semihosting call number + * x1 - semihosting parameter + */ +#define semihosting_call hlt 0xf000 +#define SYS_WRITEC 0x03 /* character to debug channel */ +#define SYS_WRITE0 0x04 /* string to debug channel */ +#define SYS_EXIT 0x18 + + .align 12 + + .macro ventry label + .align 7 + b \label + .endm + +vector_table: + /* Current EL with SP0. */ + ventry curr_sp0_sync /* Synchronous */ + ventry curr_sp0_irq /* Irq/vIRQ */ + ventry curr_sp0_fiq /* Fiq/vFIQ */ + ventry curr_sp0_serror /* SError/VSError */ + + /* Current EL with SPx. */ + ventry curr_spx_sync /* Synchronous */ + ventry curr_spx_irq /* IRQ/vIRQ */ + ventry curr_spx_fiq /* FIQ/vFIQ */ + ventry curr_spx_serror /* SError/VSError */ + + /* Lower EL using AArch64. */ + ventry lower_a64_sync /* Synchronous */ + ventry lower_a64_irq /* IRQ/vIRQ */ + ventry lower_a64_fiq /* FIQ/vFIQ */ + ventry lower_a64_serror /* SError/VSError */ + + /* Lower EL using AArch32. */ + ventry lower_a32_sync /* Synchronous */ + ventry lower_a32_irq /* IRQ/vIRQ */ + ventry lower_a32_fiq /* FIQ/vFIQ */ + ventry lower_a32_serror /* SError/VSError */ + + .text + .align 4 + + /* Common vector handling for now */ +curr_sp0_sync: +curr_sp0_irq: +curr_sp0_fiq: +curr_sp0_serror: +curr_spx_sync: +curr_spx_irq: +curr_spx_fiq: +curr_spx_serror: +lower_a64_sync: +lower_a64_irq: +lower_a64_fiq: +lower_a64_serror: +lower_a32_sync: +lower_a32_irq: +lower_a32_fiq: +lower_a32_serror: + mov x0, SYS_WRITE0 + adr x1, .error + semihosting_call + mov x0, SYS_EXIT + mov x1, 1 + semihosting_call + /* never returns */ + + .section .rodata +.error: + .string "Terminated by exception.\n" + + .text + .align 4 + .global __start +__start: + /* Installs a table of exception vectors to catch and handle all + exceptions by terminating the process with a diagnostic. */ + adr x0, vector_table + msr vbar_el1, x0 + + /* Page table setup (identity mapping). */ + adrp x0, ttb + add x0, x0, :lo12:ttb + msr ttbr0_el1, x0 + + /* + * Setup a flat address mapping page-tables. Stage one simply + * maps RAM to the first Gb. The stage2 tables have two 2mb + * translation block entries covering a series of adjacent + * 4k pages. + */ + + /* Stage 1 entry: indexed by IA[38:30] */ + adr x1, . /* phys address */ + bic x1, x1, #(1 << 30) - 1 /* 1GB alignment*/ + add x2, x0, x1, lsr #(30 - 3) /* offset in l1 page table */ + + /* point to stage 2 table [47:12] */ + adrp x0, ttb_stage2 + orr x1, x0, #3 /* ptr to stage 2 */ + str x1, [x2] + + /* Stage 2 entries: indexed by IA[29:21] */ + ldr x5, =(((1 << 9) - 1) << 21) + + /* First block: .text/RO/execute enabled */ + adr x1, . /* phys address */ + bic x1, x1, #(1 << 21) - 1 /* 2mb block alignment */ + and x4, x1, x5 /* IA[29:21] */ + add x2, x0, x4, lsr #(21 - 3) /* offset in l2 page table */ + ldr x3, =0x401 /* attr(AF, block) */ + orr x1, x1, x3 + str x1, [x2] /* 1st 2mb (.text & rodata) */ + + /* Second block: .data/RW/no execute */ + adrp x1, .data + add x1, x1, :lo12:.data + bic x1, x1, #(1 << 21) - 1 /* 2mb block alignment */ + and x4, x1, x5 /* IA[29:21] */ + add x2, x0, x4, lsr #(21 - 3) /* offset in l2 page table */ + ldr x3, =(3 << 53) | 0x401 /* attr(AF, NX, block) */ + orr x1, x1, x3 + str x1, [x2] /* 2nd 2mb (.data & .bss)*/ + + /* Setup/enable the MMU. */ + + /* + * TCR_EL1 - Translation Control Registers + * + * IPS[34:32] = 40-bit PA, 1TB + * TG0[14:15] = b00 => 4kb granuale + * ORGN0[11:10] = Outer: Normal, WB Read-Alloc No Write-Alloc Cacheable + * IRGN0[9:8] = Inner: Normal, WB Read-Alloc No Write-Alloc Cacheable + * T0SZ[5:0] = 2^(64 - 25) + * + * The size of T0SZ controls what the initial lookup level. It + * would be nice to start at level 2 but unfortunatly for a + * flat-mapping on the virt machine we need to handle IA's + * with at least 1gb range to see RAM. So we start with a + * level 1 lookup. + */ + ldr x0, = (2 << 32) | 25 | (3 << 10) | (3 << 8) + msr tcr_el1, x0 + + mov x0, #0xee /* Inner/outer cacheable WB */ + msr mair_el1, x0 + isb + + /* + * SCTLR_EL1 - System Control Register + * + * WXN[19] = 0 = no effect, Write does not imply XN (execute never) + * I[12] = Instruction cachability control + * SA[3] = SP alignment check + * C[2] = Data cachability control + * M[0] = 1, enable stage 1 address translation for EL0/1 + */ + mrs x0, sctlr_el1 + ldr x1, =0x100d /* bits I(12) SA(3) C(2) M(0) */ + bic x0, x0, #(1 << 1) /* clear bit A(1) */ + bic x0, x0, #(1 << 19) /* clear WXN */ + orr x0, x0, x1 /* set bits */ + + dsb sy + msr sctlr_el1, x0 + isb + + /* + * Enable FP registers. The standard C pre-amble will be + * saving these and A-profile compilers will use AdvSIMD + * registers unless we tell it not to. + */ + mrs x0, cpacr_el1 + orr x0, x0, #(3 << 20) + msr cpacr_el1, x0 + + /* Setup some stack space and enter the test code. + * Assume everthing except the return value is garbage when we + * return, we won't need it. + */ + adrp x0, stack_end + add x0, x0, :lo12:stack_end + mov sp, x0 + bl main + + /* pass return value to sys exit */ + mov x1, x0 + ldr x0, =0x20026 /* ADP_Stopped_ApplicationExit */ + stp x0, x1, [sp, #-16]! + mov x1, sp + mov x0, SYS_EXIT + semihosting_call + /* never returns */ + + /* + * Helper Functions + */ + + /* Output a single character to serial port */ + .global __sys_outc +__sys_outc: + stp x0, x1, [sp, #-16]! + /* pass address of c on stack */ + mov x1, sp + mov x0, SYS_WRITEC + semihosting_call + ldp x0, x1, [sp], #16 + ret + + .data + .align 12 + + /* Translation table + * @4k granuale: 9 bit lookup, 512 entries + */ +ttb: + .space 4096, 0 + + .align 12 +ttb_stage2: + .space 4096, 0 + + .align 12 +stack: + .space 65536, 0 +stack_end: diff --git a/tests/tcg/aarch64/system/kernel.ld b/tests/tcg/aarch64/system/kernel.ld new file mode 100644 index 00000000000..7b3a76dcbf3 --- /dev/null +++ b/tests/tcg/aarch64/system/kernel.ld @@ -0,0 +1,24 @@ +ENTRY(__start) + +SECTIONS +{ + /* virt machine, RAM starts at 1gb */ + . = (1 << 30); + .text : { + *(.text) + } + .rodata : { + *(.rodata) + } + /* align r/w section to next 2mb */ + . = ALIGN(1 << 21); + .data : { + *(.data) + } + .bss : { + *(.bss) + } + /DISCARD/ : { + *(.ARM.attributes) + } +} From patchwork Thu May 9 16:58:56 2019 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: 163736 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1255936ilr; Thu, 9 May 2019 10:15:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJQtfdEP60rOwL1eVfVlXNe2Fru8I9lwE10m4RF1riywehlQfB6JD1AgUe3uXevnNrrqPg X-Received: by 2002:a1c:98d0:: with SMTP id a199mr3414176wme.140.1557422115381; Thu, 09 May 2019 10:15:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422115; cv=none; d=google.com; s=arc-20160816; b=KY9Ma2Y41bfQSDVnabOTOECCPYip+MmpqlgK6aMrr2UXkUNr2pzmC5bT2N5onh+N/9 Dk6FKuU5NSkPhdpRZA1JESO0bnddIMkxp3xlNu0fhcPep7zq9meo3UqM2KYXaqWgmNOD JIgmRg/rwsOyfIaM5AYPIeGUKyP6qlVKlEeOgbJ3k+loWGa06rDyWgNXsejalS1coHR4 Osix0K/n8XyuX4OhNp3MDsF+APznNHAJcpXvelCWZnyFWrL1WG7AUbKj9XfEhnt4obce WDSVUpr/6Svi0XmcYD2DKiJUa9KWu0h/CyEI88L61G3/lQh9cHzZmakewmOup5De48JE To0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Cq0hWZXgOdvqzfyTAW4dZk0efyH3GC8saHgcK0H4+rE=; b=beIWHszthcVtbXASnssf76JucQbn1Lvj2G8LSfdDAeJAg8q8H9buOQYwPUNAh6xwHX TNYecoUNWqe4gj5R+GdcloHphmNthiFuevIrX0UQ0nIe3DHn+rAnurP7wrZoACSFfWU6 LeEmAwk8eYVLdDswiu3BUM/JocfCeIWVwXchxSmcIMwgu1ahTQq29vn4T/EfoKBNr2K+ pd4EFq6JidBr9lJekRvhb+l/n0sDXNKXX3UUmpiKNGODmWyIbBcVpxKkzRVZZPKq4cxy KKtr3bJ1fyUOzeqNjATe/oG1ReGFMlzz6ygP8/gIG/MPWYgp1wFHL+8KXPV8qOddxsWe pXVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dH2Scjvw; 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=fail (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 f17si1974894wmc.126.2019.05.09.10.15.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:15:15 -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=fail header.i=@linaro.org header.s=google header.b=dH2Scjvw; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmdW-0004R7-90 for patch@linaro.org; Thu, 09 May 2019 13:15:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmOB-00073l-PL for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmOA-0004vs-PE for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:23 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmOA-0004vZ-IJ for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:22 -0400 Received: by mail-wm1-x343.google.com with SMTP id 198so4146300wme.3 for ; Thu, 09 May 2019 09:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Cq0hWZXgOdvqzfyTAW4dZk0efyH3GC8saHgcK0H4+rE=; b=dH2ScjvwIaLM9oqnqdt8ADQvAPw3IjuFp4PzYnyT5VYP58hchyLO+Zg+oHd3yLeGis lB7IhLMICW6s5xuzh2KCmR+Gt5BnAQFIQz+MIvNuyGUCWRazq82Qkb0pm/+ke0k8TeFP ggfBBecjViB7/p6Gu09wXl5PZH8Q4t9qt7uYhHQvUUB7HtCO2LtTb42VbKYmjkC9ciAd YCXXTTnrvK0kovwREeSSCC8ngEkMFGNG9UaNjT4klelnA19CmqipeScQht19NMbzUyzN 8/SVGMykUok4RSO+wEOSOcSPc7mlhNyXMxY3yjCrAMVYFXyIt77HoQnS3GB9vKokIMdm hiqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cq0hWZXgOdvqzfyTAW4dZk0efyH3GC8saHgcK0H4+rE=; b=E0qK2WzOVeW4aLK+Uvx/18BOPY8a3q+qJlkT5twNBA3nQBgTHDX/5t2TbLuR12ZI+s zyOGRA/Tj92poQhY93dG1H0muCHL6TFv1P8gVodAQKWy29fSREyfpZ6ByirT2wdQKe/b Qq0OgEEq7vO2LNEHoVLitGiaYeI8E0JKEp90B/0yySPpDu+U7gs3f3zXCJgsv4dkpFII NHSM3qKgKcI/MLq8KMLmgowcVHo4qDndE8nbRXclVZL22RmKhbQmyyGobQjNbpnxONOL OkwxvmtuMkf1wr9Z3uF5cejNHQJHZcVcxkgSZHjCuGX58SP/HSqiXWGnscHWOh4pZaXd pFMQ== X-Gm-Message-State: APjAAAWbPNizmmrA+Mp/nlNc76APsL4LfjJwqJ0DK0eKoNZ8P+FMnD0m UVljgPPMD+MKBQDWXNucoAt6J08WuTw= X-Received: by 2002:a7b:c010:: with SMTP id c16mr3741346wmb.82.1557421161594; Thu, 09 May 2019 09:59:21 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u8sm1605915wmc.14.2019.05.09.09.59.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:17 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B0FDA1FF98; Thu, 9 May 2019 17:59:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:56 +0100 Message-Id: <20190509165912.10512-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v1 08/23] tests/tcg/multiarch: move the system memory test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There is nothing inherently architecture specific about the memory test although we may have to manage different restrictions of unaligned access across architectures. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/{i386 => multiarch}/system/memory.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/tcg/{i386 => multiarch}/system/memory.c (100%) -- 2.20.1 diff --git a/tests/tcg/i386/system/memory.c b/tests/tcg/multiarch/system/memory.c similarity index 100% rename from tests/tcg/i386/system/memory.c rename to tests/tcg/multiarch/system/memory.c From patchwork Thu May 9 16:58:57 2019 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: 163731 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1249098ilr; Thu, 9 May 2019 10:09:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqwJDJWfm4dIzZX0BDkn8JMju2XxD3Cu4v808bf8WsfsjCRynodz64H2AtuornuPCot9fYd+ X-Received: by 2002:adf:e5cb:: with SMTP id a11mr4236836wrn.128.1557421767591; Thu, 09 May 2019 10:09:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421767; cv=none; d=google.com; s=arc-20160816; b=WIMf2Q8UjCXJe6X3PVEbXFVi5HMHAZO7m76GSqcq67d1q4XQAEXDNLl6lmcRSRfa4D JJvFFRPZIfvCeiUPo7gVFoR2EMC8xo3MW2p/9c/kzEOpogm0tiJPAohecGaE4FGFp7oJ S29m/6ssI5Nhft+34HMZMU8TGLdquB9b7qxRhwq+tJYq0fp+EtysQFgyC2TRkSPWKdTy bUlzf2SzF8B4FXYEz/Bt7Ke7FlRW4H+tjByWSIMIjefNd1C88XpOcAZ3PZ8EDxNLCfxK 4oRigJBkS6xRJ8G6Cn1lmYZTBhKqP2XC8BOFVaIiWyWC8oY9gc0/YYN4YE+zzzWwuSKq Mj7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Tdq1lhooOg5isCiP/Tk4l5zr7fBDvEhDVLC+/j+f1ds=; b=yh8kC79UZ9D9VQM7SWBth34DMxc1XaR3chbsGUDJTxNw52SYU4CoEveGBZtYZAt7+j z4pshclaK7VRUATlT4YBwbbRHmkTsy7rFPs3iF+zRAjZ10Kn+FGSrcp9NdincpQgYIvw YsE6GJ3wWZJKHa8R1b4sdK4kPgxsw5LvYdnbUzQm+wg9DaxNUv2daf5I4bhWG2C+SD32 1ATNHoefo8nrY1xNztY/IGpynMfwdO2PJWHqrGn5DhBO4FS76PyBE0TZTEZ2AD29QZ08 CVwXY7k+JtjS5j/4c4VUVF5chIzPWdUUTertbyEupb04iilS/jS9NmixIspJxUzSALlv qqbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="IMDib/93"; 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=fail (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 v1si2247060wrn.409.2019.05.09.10.09.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:09:27 -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=fail header.i=@linaro.org header.s=google header.b="IMDib/93"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmXu-0007av-FP for patch@linaro.org; Thu, 09 May 2019 13:09:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmO9-00070y-Nd for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmO8-0004uJ-Qy for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:21 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:36387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmO8-0004tp-Jc for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:20 -0400 Received: by mail-wm1-x341.google.com with SMTP id j187so4086727wmj.1 for ; Thu, 09 May 2019 09:59:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Tdq1lhooOg5isCiP/Tk4l5zr7fBDvEhDVLC+/j+f1ds=; b=IMDib/93ol23iPrWyW/F7kO/9wH92f8u59c5iSKm7GANCOH8PgYrtqqnFVJP5ShVMt kZX3XY+26CQVpfqHLulQTHm13DB2g8rCUosF3oJ2o7HcZnGkTqPbH+ScvfX0PEN0R4t2 AqIZRSSj621U1EEJZoKEKFWoDJVZxq6/FphzrvoAyl4+zA2q93EHk+UVKoZXxIoiUs5b LVH01L/+Gapre4RFdvQQH7j1Ws32DETZnXChH8tfCSuB/2pqF/YZ88cM8vmEco7KloRz otQHv7bU8c8OHJEeofiz0uqz/C2fbiIU/o2YHb2dKawK8m2SSMxtPNYj98fPc4bDLD4L qyrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Tdq1lhooOg5isCiP/Tk4l5zr7fBDvEhDVLC+/j+f1ds=; b=LMQc3ad13ogCmPFB5ABO0CWVRj+Lssp/64uvGc4JY3g5bSdK7ynpPNsH1+9PA8j0AP 2zXfKbSTigac9TnZWGwhCo7+K/RVzsTL2EwQ+oOVgHDGDg8w8NAO9IyCmFcX/W4c4mpE Z7qDQwP+cm5L7bD+7fco/nKfWKbJymy9FRSb/E25iHa8tHuQm8XVxE/EG488CBAw11LU 74h0331L6BZhNpAmpUkPvVmrRaxjoNHbM2fAHEjnEbzjwZ7bj1P6vGWjn46BlnAiIVCR XHM4Jd1wrS10Dardq3qJlAmWwodm6ixoZwIMO5Up0KL0oLJ0LUlZgWiesQRXNXFYnRiO stgA== X-Gm-Message-State: APjAAAXpV5644VmalTo3zbdEEXOXIbQ9aSja/L5wl/TynjcBJNBIWttA eudevyUNVpIWmf7kOnbffBxzQg== X-Received: by 2002:a1c:b789:: with SMTP id h131mr3660096wmf.71.1557421159607; Thu, 09 May 2019 09:59:19 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o130sm1685061wmo.43.2019.05.09.09.59.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:17 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C3F791FF99; Thu, 9 May 2019 17:59:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:57 +0100 Message-Id: <20190509165912.10512-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v1 09/23] tests/tcg/minilib: support %c format char X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/minilib/printf.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.20.1 diff --git a/tests/tcg/minilib/printf.c b/tests/tcg/minilib/printf.c index 121620cb162..10472b4f585 100644 --- a/tests/tcg/minilib/printf.c +++ b/tests/tcg/minilib/printf.c @@ -119,6 +119,9 @@ void ml_printf(const char *fmt, ...) str = va_arg(ap, char*); print_str(str); break; + case 'c': + __sys_outc(va_arg(ap, int)); + break; case '%': __sys_outc(*fmt); break; From patchwork Thu May 9 16:58:58 2019 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: 163725 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1242475ilr; Thu, 9 May 2019 10:04:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqxcI9kVs5tnGeg7SyvooYpl6mByNM1wJ+vtv6xeI3z3cfLJHbohcifvtxsTDL2DWhS50rto X-Received: by 2002:a1c:f310:: with SMTP id q16mr3903296wmq.102.1557421457090; Thu, 09 May 2019 10:04:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421457; cv=none; d=google.com; s=arc-20160816; b=rYqW6jewonY5DBHcoRWdt/GBl4JiMhr/aEHhCIe81IJxeIcUiwws8GUv+6ncmPAsKc IWzOZmf++y0gGNYQM3JrgXVYDmXVV7bQtSEkNDTRxythSfCw4HvChowjrVg7t5ZsiJdh Z0bHLk9HyBY1Rk+WHwyvdIuGyk7Olk15pcotCGPYTeDt35Q1ES+7FEkG8M5fZ+xmlgeU luWKFC1lNteRLKvB3Aao/yfJzDJkD9mQTf5Cv3VCNhVGf/OAv08UslQysUN253jFEZjG ilP5e4wC9bzBVI1uacr30YWFJ30GsHbIzVVa3FJJXC0yzFGAKl8pPYCgSfSkVOmPn9tZ IMEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=U0zDg1s6WI9XoLsKBZxlXIwIvYOHnfoQr+jPvoURE9E=; b=G1lZG0rdHpcnHmq9mTkHj9MmXRbgnFX5P+qt+j4UOMbm37BNI9zHiaw5oqYRTvlMCU K3IBaxuUA5qGC7o99tV5hUhJdbHs8CYzmnnVsEIdlI86qo9V1t+uSMln04tqFBuoFWwI NgyLPyjMqi5+vYPePSi9OMFedPzfp24/Ot5mrRBnr/4SaCR3iUTnRCqH6l7dXmLZgHZk o5VRomSfzljCQpX8Bh2d0jNKRneOSEua7zfNQkUqDmfJ++8Z3vOhq1ZhZknAvzQGw+s9 1w5eKxR+DG9fBsyV5rvcX/khPNj1+YJNNQ+IWvLL6HEBBYvna4Aksn3zaAI1stw8V5wU 0W9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QMoy0VXg; 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=fail (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 f9si1975600wmm.153.2019.05.09.10.04.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:04:17 -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=fail header.i=@linaro.org header.s=google header.b=QMoy0VXg; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmSt-0002c7-Vl for patch@linaro.org; Thu, 09 May 2019 13:04:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmOB-00073m-Pd for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmO9-0004v7-NE for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:23 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:37868) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmO9-0004uF-Ce for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:21 -0400 Received: by mail-wr1-x444.google.com with SMTP id a12so4062276wrn.4 for ; Thu, 09 May 2019 09:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U0zDg1s6WI9XoLsKBZxlXIwIvYOHnfoQr+jPvoURE9E=; b=QMoy0VXgAW10XOFqmXNO8YWD9Fuw5MWdP4RI6leQTc9tpE0AHVMBlF2ObVEFmjDIkj QL3TLQH/Men11d4prvE87uYiYpsBZ8l8EIgJcDj84BxY1qgwhsk+2AB08T+nLgHjQn/R dRpU5/1qgQIjY7d4LK2k9+UkAi1hiG62WNCgjylqoYH5Ck3L0Yt9jbagDmdDYwRRD+r1 GvNSQ3cwk2ki1ipgF+gl4Usik2BxW1zoxIyilm7++oPA85v8PyNBYzuImtOVA+JVuM7y Xky5zuKr5qxNd6UCALymA88BmIHJvNEU0eJjYPJz64n9lNZsyG4NMwfoE+kx9dzoMAMk 3hWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U0zDg1s6WI9XoLsKBZxlXIwIvYOHnfoQr+jPvoURE9E=; b=PmLxUspSwaIR1X1aqbQsEcFp3IXnDBw/5TejHNWrTU1LBoriGPJTTbQ04H9OJjs1Zu qPolQPg7nuiAvg6H/GmnfF/LRr8j09yoDH12S1cjv2QTBlTOxftar1m10JXBHMNGNzlH nXFfBpxL6ZOlePY3kWrs2G1j0jhPuBYFExdiLzvk8/Th5uPoRxTRnW6sanq8lCBVBKmn xAOMLbSgDsH1F0YDqB8quJ9qlAzaj/BhgcXR4MftsdSrJdAIESIjlXJ87ClBbGHJSAG4 f95V/hgWTRKRoyGAprP4nIgo7ArGqttHwBF0Mot8kqUXHADRrf/alBEkOhjNt8PEmjTF zAxg== X-Gm-Message-State: APjAAAX8LozDH14u8dyOZcx2wSs0a/iaG0hI4qwRoWmAZ40i174pjbSN 1CBO2OLWBk7VI+nAB01MvzzpCHEWXgM= X-Received: by 2002:a5d:4111:: with SMTP id l17mr3947326wrp.242.1557421160137; Thu, 09 May 2019 09:59:20 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a21sm3042252wmm.8.2019.05.09.09.59.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:17 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DC36F1FF9A; Thu, 9 May 2019 17:59:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:58 +0100 Message-Id: <20190509165912.10512-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v1 10/23] tests/tcg/multiarch: expand system memory test to cover more X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Expand the memory test to cover move of the softmmu code. Specifically we: - improve commentary - add some helpers (for later BE support) - reduce boiler plate into helpers - add signed reads at various sizes/offsets Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/aarch64/Makefile.softmmu-target | 2 + tests/tcg/i386/Makefile.softmmu-target | 2 + tests/tcg/multiarch/system/memory.c | 346 +++++++++++++++++----- 3 files changed, 278 insertions(+), 72 deletions(-) -- 2.20.1 diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target index cdb836f7e1e..63d82f1bf41 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -28,5 +28,7 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) +memory: CFLAGS+=-DCHECK_UNALIGNED + # Running QEMU_OPTS+=-M virt -cpu max -display none -semihosting-config enable=on,target=native,chardev=output -kernel diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target index c31bbbf39a7..a0d8adf12cd 100644 --- a/tests/tcg/i386/Makefile.softmmu-target +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -42,5 +42,7 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) +memory: CFLAGS+=-DCHECK_UNALIGNED + # Running QEMU_OPTS+=-device isa-debugcon,chardev=output -device isa-debug-exit,iobase=0xf4,iosize=0x4 -kernel diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/system/memory.c index a7a0a8e9784..ccd1a9db7f5 100644 --- a/tests/tcg/multiarch/system/memory.c +++ b/tests/tcg/multiarch/system/memory.c @@ -5,18 +5,29 @@ * behave across normal and unaligned accesses across several pages. * We are not replicating memory tests for stuck bits and other * hardware level failures but looking for issues with different size - * accesses when: - + * accesses when access is: * + * - unaligned at various sizes (if -DCHECK_UNALIGNED set) + * - spanning a (softmmu) page + * - sign extension when loading */ #include +#include #include -#define TEST_SIZE (4096 * 4) /* 4 pages */ +#define PAGE_SIZE 4096 /* nominal 4k "pages" */ +#define TEST_SIZE (PAGE_SIZE * 4) /* 4 pages */ + +#define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0]))) +__attribute__((aligned(PAGE_SIZE))) static uint8_t test_data[TEST_SIZE]; +typedef void (*init_ufn) (int offset); +typedef bool (*read_ufn) (int offset); +typedef bool (*read_sfn) (int offset, bool nf); + static void pdot(int count) { if (count % 128 == 0) { @@ -24,17 +35,26 @@ static void pdot(int count) } } +/* + * Helper macros for shift/extract so we can keep our endian handling + * in one place. + */ +#define BYTE_SHIFT(b, pos) ((uint64_t)b << (pos * 8)) +#define BYTE_EXTRACT(b, pos) ((b >> (pos * 8)) & 0xff) /* - * Fill the data with ascending value bytes. As x86 is a LE machine we - * write in ascending order and then read and high byte should either - * be zero or higher than the lower bytes. + * Fill the data with ascending value bytes. + * + * Currently we only support Little Endian machines so write in + * ascending address order. When we read higher address bytes should + * either be zero or higher than the lower bytes. */ -static void init_test_data_u8(void) +static void init_test_data_u8(int unused_offset) { uint8_t count = 0, *ptr = &test_data[0]; int i; + (void)(unused_offset); ml_printf("Filling test area with u8:"); for (i = 0; i < TEST_SIZE; i++) { @@ -44,62 +64,112 @@ static void init_test_data_u8(void) ml_printf("done\n"); } +/* + * Full the data with alternating positive and negative bytes. This + * should mean for reads larger than a byte all subsequent reads will + * stay either negative or positive. We never write 0. + */ + +static inline uint8_t get_byte(int index, bool neg) +{ + return neg ? (0xff << (index % 7)) : (0xff >> ((index % 6) + 1)); +} + +static void init_test_data_s8(bool neg_first) +{ + uint8_t top, bottom, *ptr = &test_data[0]; + int i; + + ml_printf("Filling test area with s8 pairs (%s):", + neg_first ? "neg first" : "pos first"); + for (i = 0; i < TEST_SIZE / 2; i++) { + *ptr++ = get_byte(i, neg_first); + *ptr++ = get_byte(i, !neg_first); + pdot(i); + } + ml_printf("done\n"); +} + +/* + * Zero the first few bytes of the test data in preparation for + * new offset values. + */ +static void reset_start_data(int offset) +{ + uint32_t *ptr = (uint32_t *) &test_data[0]; + int i; + for (i = 0; i < offset; i++) { + *ptr++ = 0; + } +} + static void init_test_data_u16(int offset) { uint8_t count = 0; - uint16_t word, *ptr = (uint16_t *) &test_data[0]; + uint16_t word, *ptr = (uint16_t *) &test_data[offset]; const int max = (TEST_SIZE - offset) / sizeof(word); int i; - ml_printf("Filling test area with u16 (offset %d):", offset); + ml_printf("Filling test area with u16 (offset %d, %p):", offset, ptr); - /* Leading zeros */ - for (i = 0; i < offset; i++) { - *ptr = 0; - } + reset_start_data(offset); - ptr = (uint16_t *) &test_data[offset]; for (i = 0; i < max; i++) { - uint8_t high, low; - low = count++; - high = count++; - word = (high << 8) | low; + uint8_t low = count++, high = count++; + word = BYTE_SHIFT(high, 1) | BYTE_SHIFT(low, 0); *ptr++ = word; pdot(i); } - ml_printf("done\n"); + ml_printf("done @ %p\n", ptr); } static void init_test_data_u32(int offset) { uint8_t count = 0; - uint32_t word, *ptr = (uint32_t *) &test_data[0]; + uint32_t word, *ptr = (uint32_t *) &test_data[offset]; const int max = (TEST_SIZE - offset) / sizeof(word); int i; - ml_printf("Filling test area with u32 (offset %d):", offset); + ml_printf("Filling test area with u32 (offset %d, %p):", offset, ptr); - /* Leading zeros */ - for (i = 0; i < offset; i++) { - *ptr = 0; - } + reset_start_data(offset); - ptr = (uint32_t *) &test_data[offset]; for (i = 0; i < max; i++) { - uint8_t b1, b2, b3, b4; - b4 = count++; - b3 = count++; - b2 = count++; - b1 = count++; - word = (b1 << 24) | (b2 << 16) | (b3 << 8) | b4; + uint8_t b4 = count++, b3 = count++; + uint8_t b2 = count++, b1 = count++; + word = BYTE_SHIFT(b1, 3) | BYTE_SHIFT(b2, 2) | BYTE_SHIFT(b3, 1) | b4; *ptr++ = word; pdot(i); } - ml_printf("done\n"); + ml_printf("done @ %p\n", ptr); } +static void init_test_data_u64(int offset) +{ + uint8_t count = 0; + uint64_t word, *ptr = (uint64_t *) &test_data[offset]; + const int max = (TEST_SIZE - offset) / sizeof(word); + int i; + + ml_printf("Filling test area with u64 (offset %d, %p):", offset, ptr); + + reset_start_data(offset); -static int read_test_data_u16(int offset) + for (i = 0; i < max; i++) { + uint8_t b8 = count++, b7 = count++; + uint8_t b6 = count++, b5 = count++; + uint8_t b4 = count++, b3 = count++; + uint8_t b2 = count++, b1 = count++; + word = BYTE_SHIFT(b1, 7) | BYTE_SHIFT(b2, 6) | BYTE_SHIFT(b3, 5) | + BYTE_SHIFT(b4, 4) | BYTE_SHIFT(b5, 3) | BYTE_SHIFT(b6, 2) | + BYTE_SHIFT(b7, 1) | b8; + *ptr++ = word; + pdot(i); + } + ml_printf("done @ %p\n", ptr); +} + +static bool read_test_data_u16(int offset) { uint16_t word, *ptr = (uint16_t *)&test_data[offset]; int i; @@ -114,17 +184,17 @@ static int read_test_data_u16(int offset) low = word & 0xff; if (high < low && high != 0) { ml_printf("Error %d < %d\n", high, low); - return 1; + return false; } else { pdot(i); } } - ml_printf("done\n"); - return 0; + ml_printf("done @ %p\n", ptr); + return true; } -static int read_test_data_u32(int offset) +static bool read_test_data_u32(int offset) { uint32_t word, *ptr = (uint32_t *)&test_data[offset]; int i; @@ -145,16 +215,16 @@ static int read_test_data_u32(int offset) (b2 < b3 && b2 != 0) || (b3 < b4 && b3 != 0)) { ml_printf("Error %d, %d, %d, %d", b1, b2, b3, b4); - return 2; + return false; } else { pdot(i); } } - ml_printf("done\n"); - return 0; + ml_printf("done @ %p\n", ptr); + return true; } -static int read_test_data_u64(int offset) +static bool read_test_data_u64(int offset) { uint64_t word, *ptr = (uint64_t *)&test_data[offset]; int i; @@ -184,60 +254,192 @@ static int read_test_data_u64(int offset) (b7 < b8 && b7 != 0)) { ml_printf("Error %d, %d, %d, %d, %d, %d, %d, %d", b1, b2, b3, b4, b5, b6, b7, b8); - return 2; + return false; } else { pdot(i); } } - ml_printf("done\n"); - return 0; + ml_printf("done @ %p\n", ptr); + return true; } /* Read the test data and verify at various offsets */ -int do_reads(void) +read_ufn read_ufns[] = { read_test_data_u16, + read_test_data_u32, + read_test_data_u64 }; + +bool do_unsigned_reads(void) { - int r = 0; - int off = 0; + int i; + bool ok = true; - while (r == 0 && off < 8) { - r = read_test_data_u16(off); - r |= read_test_data_u32(off); - r |= read_test_data_u64(off); - off++; + for (i = 0; i < ARRAY_SIZE(read_ufns) && ok; i++) { +#ifdef CHECK_UNALIGNED + int off; + for (off = 0; off < 8 && ok; off++) { + ok = read_ufns[i](off); + } +#else + ok = read_ufns[i](0); +#endif } - return r; + return ok; } -int main(void) +static bool do_unsigned_test(init_ufn fn) { - int i, r = 0; +#ifdef CHECK_UNALIGNED + bool ok = true; + int i; + for (i = 0; i < 8 && ok; i++) { + fn(i); + ok = do_unsigned_reads(); + } +#else + fn(0); + return do_unsigned_reads(); +#endif +} + +/* + * We need to ensure signed data is read into a larger data type to + * ensure that sign extension is working properly. + */ + +static bool read_test_data_s8(int offset, bool neg_first) +{ + int8_t *ptr = (int8_t *)&test_data[offset]; + int i; + const int max = (TEST_SIZE - offset) / 2; + + ml_printf("Reading s8 pairs from %#lx (offset %d):", ptr, offset); + for (i = 0; i < max; i++) { + int16_t first, second; + bool ok; + first = *ptr++; + second = *ptr++; - init_test_data_u8(); - r = do_reads(); - if (r) { - return r; + if (neg_first && first < 0 && second > 0) { + pdot(i); + } else if (!neg_first && first > 0 && second < 0) { + pdot(i); + } else { + ml_printf("Error %d %c %d\n", first, neg_first ? '<' : '>', second); + return false; + } } + ml_printf("done @ %p\n", ptr); + return true; +} + +static bool read_test_data_s16(int offset, bool neg_first) +{ + int16_t *ptr = (int16_t *)&test_data[offset]; + int i; + const int max = (TEST_SIZE - offset) / (sizeof(*ptr)); - for (i = 0; i < 8; i++) { - init_test_data_u16(i); + ml_printf("Reading s16 from %#lx (offset %d, %s):", ptr, + offset, neg_first ? "neg" : "pos"); - r = do_reads(); - if (r) { - return r; + for (i = 0; i < max; i++) { + int32_t data = *ptr++; + + if (neg_first && data < 0) { + pdot(i); + } else if (data > 0) { + pdot(i); + } else { + ml_printf("Error %d %c 0\n", data, neg_first ? '<' : '>'); + return false; } } + ml_printf("done @ %p\n", ptr); + return true; +} - for (i = 0; i < 8; i++) { - init_test_data_u32(i); +static bool read_test_data_s32(int offset, bool neg_first) +{ + int32_t *ptr = (int32_t *)&test_data[offset]; + int i; + const int max = (TEST_SIZE - offset) / (sizeof(int32_t)); + + ml_printf("Reading s32 from %#lx (offset %d, %s):", + ptr, offset, neg_first ? "neg" : "pos"); - r = do_reads(); - if (r) { - return r; + for (i = 0; i < max; i++) { + int64_t data = *ptr++; + + if (neg_first && data < 0) { + pdot(i); + } else if (data > 0) { + pdot(i); + } else { + ml_printf("Error %d %c 0\n", data, neg_first ? '<' : '>'); + return false; + } + } + ml_printf("done @ %p\n", ptr); + return true; +} + +/* + * Read the test data and verify at various offsets + * + * For everything except bytes all our reads should be either positive + * or negative depending on what offset we are reading from. Currently + * we only handle LE systems. + */ +read_sfn read_sfns[] = { read_test_data_s8, + read_test_data_s16, + read_test_data_s32 }; + +bool do_signed_reads(bool neg_first) +{ + int i; + bool ok = true; + + for (i = 0; i < ARRAY_SIZE(read_sfns) && ok; i++) { +#ifdef CHECK_UNALIGNED + int off; + for (off = 0; off < 8 && ok; off++) { + bool nf = i == 0 ? neg_first ^ (off & 1) : !(neg_first ^ (off & 1)); + ok = read_sfns[i](off, nf); } +#else + ok = read_sfns[i](0, i == 0 ? neg_first : !neg_first); +#endif + } + + return ok; +} + +init_ufn init_ufns[] = { init_test_data_u8, + init_test_data_u16, + init_test_data_u32, + init_test_data_u64 }; + +int main(void) +{ + int i; + bool ok = true; + + /* Run through the unsigned tests first */ + for (i = 0; i < ARRAY_SIZE(init_ufns) && ok; i++) { + ok = do_unsigned_test(init_ufns[i]); + } + + if (ok) { + init_test_data_s8(false); + ok = do_signed_reads(false); + } + + if (ok) { + init_test_data_s8(true); + ok = do_signed_reads(true); } - ml_printf("Test complete: %s\n", r == 0 ? "PASSED" : "FAILED"); - return r; + ml_printf("Test complete: %s\n", ok ? "PASSED" : "FAILED"); + return ok ? 0 : -1; } From patchwork Thu May 9 16:58:59 2019 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: 163739 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1262361ilr; Thu, 9 May 2019 10:20:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqxCDyCGpeB6arD/6kSFC1J+FX/gXF2f4ouOKK0GzLxwGUDZQVpx26Nah9bvu3+xohxYN9Se X-Received: by 2002:a1c:1a47:: with SMTP id a68mr3945169wma.88.1557422439454; Thu, 09 May 2019 10:20:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422439; cv=none; d=google.com; s=arc-20160816; b=ud+aPfJBveOLojBng4Wk/r5wjWxGeBa4PPDUP9KIccbhW1wO8YASKEwpY/Ts4A5bgG 4AlJEqXE/r4VufUR989TSQNV1WT3UryH9TJtAFDUV1Ry9WaiIr9U1Uq+9dLj1Mymt4dh 2KQnsOIb6lpCKH7gkDFOFtjnX4AelgglytU2h5RnQEXWNObV+f/5UBrIrxqHBbrI/jVk LTo2WY6AwDRD1N1J/h9aK+WDhfHOu07R5Gkkt03Sjrl10HUcsWcxE5s3hgGCVIjqYoaz EzdpjNIrZ5IeDZnm/Eg1XmZDZf3UfHH5Y4OIZ+S2VSGw4wNg+OyZYjq6wf6ATy41O85K +JVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=0W5lFEBbQN5V71JfBX8VLSteAUPDP7NaBn3NYD4cBFM=; b=bRkf7bxeBS+KsRUZSjl1AWWZd6jnSEIc3RnFCgZQUne898kp8AdY+N4sV/wELJXAFZ XE50Ajdl9zbAujpt3l98yofqSpnwPDWxyaAZ4qM5uDhXhZTR1cNLZsMjGOnlTpqVU4v+ E1yDUJP0nIMLg2oe/CYFzWYoMXWkVBwej65MOPRq33FwfJZxKRni/f+i/FJG6ohblEVN qVO+KKw96EoIE8WefLQojgcf3JDNI0IOHcSw/76NXci3EUXF9BDBPI30VTEPQA51lT9F zGZScQZjrPj4kjGyhYgRJpjdfRv9iLxfBA0LRJa7PIJxm4SBzdDp0hA4ax9MYJbEJc41 ku8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lBDIngF2; 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=fail (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 t4si2178066wrn.321.2019.05.09.10.20.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:20: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=fail header.i=@linaro.org header.s=google header.b=lBDIngF2; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmik-0000bS-7O for patch@linaro.org; Thu, 09 May 2019 13:20:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmOD-00075G-RP for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmOB-0004x5-S2 for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:25 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:32891) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmOB-0004w3-Jl for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:23 -0400 Received: by mail-wm1-x331.google.com with SMTP id s18so4608401wmh.0 for ; Thu, 09 May 2019 09:59:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0W5lFEBbQN5V71JfBX8VLSteAUPDP7NaBn3NYD4cBFM=; b=lBDIngF23wPeN91FfRS7GArjauUSApA7dTzB9jk6fhv5DyzRPKJm/m9wtkwzJSByKW 28IhFK6My9wwZ98FkIfKToHDzdtN2eKsMix2clTAsKOIaNA2SoBHnuaW86iDyJth388e rI+KizawDIAnb3zAcEc0lzjDuygZThjVuzpVbpZAbWANOPc57npWYEn9z3CcFkezOth8 VIn1jXCsfg22jHZPh0fhuS27P9UTFdzAu6XyKjxbojs8/YQDkfcq/ClrexsFG9gUB1rA u2TRWyjHong3EfpeULCt/stGMw9Nmv0S72zlpxNi2QDPaQ9zajRpUqmrh2fBzPgTSV2u N2qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0W5lFEBbQN5V71JfBX8VLSteAUPDP7NaBn3NYD4cBFM=; b=nRVsUjr21VB+8VnL+dGnsY0cqTcmCybO3jomhjuuojJY2rn8iIaNxA0k8PsvEPzLH1 RAX5Sgy04izXXElc5xEjbzR8FT8CVSizXW0JZSm+krE9mYjMp9lP7QQdd0nkaV/P5UbF FsOAtcXQ+Wv/k0Ug+ybDngNzw8goT5j3Ee8peSb8F3JS/wMh48u3SwSEWDhh0gHINcu9 NaCqf/moOM7I4IfOrY6K+IE8azC6q/GtVA1oIcgMuI5fD1RXTltBhC6WLwxNmCtuYMQw KuHpHJhM1xVEb1ou80kHOq884b0jDqQTj+M0wflMrIhAFmqYR7kr8MBFe0R7+PEu43yn A8FQ== X-Gm-Message-State: APjAAAX6xRM5aA8sKwwILp88PPadPqxdKQBxAQDUYtrmDkW/deDNAHcy vUe25bSDVLZvZgFt2YQIOu2Fww== X-Received: by 2002:a7b:c38a:: with SMTP id s10mr3736521wmj.73.1557421162320; Thu, 09 May 2019 09:59:22 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r10sm1822250wml.10.2019.05.09.09.59.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:18 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 018251FF9B; Thu, 9 May 2019 17:59:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:58:59 +0100 Message-Id: <20190509165912.10512-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 Subject: [Qemu-devel] [PATCH v1 11/23] tests/tcg/alpha: add system boot.S X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This provides the bootstrap and low level helper functions for an alpha kernel. We use direct access to the DP264 serial port for test output, and hard machine halt to exit the emulation. Signed-off-by: Richard Henderson Message-Id: <20190501184306.15208-1-richard.henderson@linaro.org> Signed-off-by: Alex Bennée --- MAINTAINERS | 1 + tests/tcg/alpha/Makefile.softmmu-target | 32 ++ tests/tcg/alpha/system/boot.S | 511 ++++++++++++++++++++++++ tests/tcg/alpha/system/kernel.ld | 30 ++ 4 files changed, 574 insertions(+) create mode 100644 tests/tcg/alpha/Makefile.softmmu-target create mode 100644 tests/tcg/alpha/system/boot.S create mode 100644 tests/tcg/alpha/system/kernel.ld -- 2.20.1 diff --git a/MAINTAINERS b/MAINTAINERS index 66ddbda9c95..eb3058f8e76 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -470,6 +470,7 @@ M: Richard Henderson S: Maintained F: hw/alpha/ F: hw/isa/smc37c669-superio.c +F: tests/tcg/alpha/system/ ARM Machines ------------ diff --git a/tests/tcg/alpha/Makefile.softmmu-target b/tests/tcg/alpha/Makefile.softmmu-target new file mode 100644 index 00000000000..9f4b199258f --- /dev/null +++ b/tests/tcg/alpha/Makefile.softmmu-target @@ -0,0 +1,32 @@ +# +# Alpha system tests +# + +ALPHA_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/alpha/system +VPATH+=$(ALPHA_SYSTEM_SRC) + +# These objects provide the basic boot code and helper functions for all tests +CRT_OBJS=boot.o + +ALPHA_TEST_SRCS=$(wildcard $(ALPHA_SYSTEM_SRC)/*.c) +ALPHA_TESTS = $(patsubst $(ALPHA_SYSTEM_SRC)/%.c, %, $(ALPHA_TEST_SRCS)) + +CRT_PATH=$(ALPHA_SYSTEM_SRC) +LINK_SCRIPT=$(ALPHA_SYSTEM_SRC)/kernel.ld +LDFLAGS=-Wl,-T$(LINK_SCRIPT) +TESTS+=$(ALPHA_TESTS) $(MULTIARCH_TESTS) +CFLAGS+=-nostdlib -g -O1 -mcpu=ev6 $(MINILIB_INC) +LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc + +# building head blobs +.PRECIOUS: $(CRT_OBJS) + +%.o: $(CRT_PATH)/%.S + $(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@ + +# Build and link the tests +%: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) + $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + +# Running +QEMU_OPTS+=-serial chardev:output -kernel diff --git a/tests/tcg/alpha/system/boot.S b/tests/tcg/alpha/system/boot.S new file mode 100644 index 00000000000..9791b1ef7c8 --- /dev/null +++ b/tests/tcg/alpha/system/boot.S @@ -0,0 +1,511 @@ +/* + * Minimal Alpha system boot code. + * + * Copyright Linaro Ltd 2019 + */ + + .set noat + .set nomacro + .arch ev6 + .text + +.macro load_pci_io reg + /* For typhoon, this is + * 0xfffffc0000000000 -- kseg identity map + * + 0x10000000000 -- typhoon pio base + * + 0x1fc000000 -- typhoon pchip0 pci base + * = 0xfffffd01fc000000 + */ + ldah \reg, -3 /* ff..fd0000 */ + lda \reg, 0x1fc(\reg) /* ff..fd01fc */ + sll \reg, 24, \reg +.endm + +#define com1Rbr 0x3f8 +#define com1Thr 0x3f8 +#define com1Ier 0x3f9 +#define com1Iir 0x3fa +#define com1Lcr 0x3fb +#define com1Mcr 0x3fc +#define com1Lsr 0x3fd +#define com1Msr 0x3fe +#define com1Scr 0x3ff +#define com1Dll 0x3f8 +#define com1Dlm 0x3f9 + +#define PAL_halt 0 +#define PAL_wrent 52 +#define PAL_wrkgp 55 + + .text + .p2align 4 + .globl _start + .ent _start +_start: + br $gp, .+4 + ldah $gp, 0($gp) !gpdisp!1 + lda $gp, 0($gp) !gpdisp!1 + + ldah $sp, $stack_end($gp) !gprelhigh + lda $sp, $stack_end($sp) !gprellow + + /* Install kernel gp for exception handlers. */ + mov $gp, $16 + call_pal PAL_wrkgp + + /* Install exception handlers. */ + ldah $16, entInt($gp) !gprelhigh + lda $16, entInt($16) !gprellow + lda $17, 0 + call_pal PAL_wrent + + ldah $16, entArith($gp) !gprelhigh + lda $16, entArith($16) !gprellow + lda $17, 1 + call_pal PAL_wrent + + ldah $16, entMM($gp) !gprelhigh + lda $16, entMM($16) !gprellow + lda $17, 2 + call_pal PAL_wrent + + ldah $16, entIF($gp) !gprelhigh + lda $16, entIF($16) !gprellow + lda $17, 3 + call_pal PAL_wrent + + ldah $16, entUna($gp) !gprelhigh + lda $16, entUna($16) !gprellow + lda $17, 4 + call_pal PAL_wrent + + ldah $16, entSys($gp) !gprelhigh + lda $16, entSys($16) !gprellow + lda $17, 5 + call_pal PAL_wrent + + /* + * Initialize COM1. + */ + load_pci_io $1 + lda $2, 0x87 /* outb(0x87, com1Lcr); */ + stb $2, com1Lcr($1) + stb $31, com1Dlm($1) /* outb(0, com1Dlm); */ + lda $2, 3 /* baudconst 3 => 56000 */ + stb $2, com1Dll($1) /* outb(baudconst, com1Dll); */ + lda $2, 0x07 + stb $2, com1Lcr($1) /* outb(0x07, com1Lcr) */ + lda $2, 0x0f + stb $2, com1Mcr($1) /* outb(0x0f, com1Mcr) */ + + bsr $26, main !samegp + + /* fall through to _exit */ + .end _start + + .globl _exit + .ent _exit +_exit: + .frame $sp, 0, $26, 0 + .prologue 0 + + /* We cannot return an error code. */ + call_pal PAL_halt + .end _exit + +/* + * We have received an exception that we don't handle. Log and exit. + */ + .ent log_exit +log_exit: +entInt: +entArith: +entMM: +entIF: +entUna: +entSys: + ldah $16, $errormsg($gp) !gprelhigh + lda $16, $errormsg($16) !gprellow + bsr $26, __sys_outs !samegp + bsr $26, _exit !samegp + .end log_exit + + .section .rodata +$errormsg: + .string "Terminated by exception.\n" + .previous + + /* + * Helper Functions + */ + + /* Output a single character to serial port */ + .global __sys_outc + .ent __sys_outc +__sys_outc: + .frame $sp, 0, $26, 0 + .prologue 0 + + load_pci_io $1 + + /* + * while ((inb(com1Lsr) & 0x20) == 0) + * continue; + */ +1: ldbu $0, com1Lsr($1) + and $0, 0x20, $0 + beq $0, 1b + + /* outb(c, com1Thr); */ + stb $16, com1Thr($1) + ret + .end __sys_outc + + /* Output a nul-terminated string to serial port */ + .global __sys_outs + .ent __sys_outs +__sys_outs: + .frame $sp, 0, $26, 0 + .prologue 0 + + load_pci_io $1 + + ldbu $2, 0($16) + beq $2, 9f + + /* + * while ((inb(com1Lsr) & 0x20) == 0) + * continue; + */ +1: ldbu $0, com1Lsr($1) + and $0, 0x20, $0 + beq $0, 1b + + /* outb(c, com1Thr); */ + stb $2, com1Thr($1) + + addq $16, 1, $16 + ldbu $2, 0($16) + bne $2, 1b + +9: ret + .end __sys_outs + +/* + * Division routines that are normally in libc. + * + * These do not follow the C calling convention. Arguments are in $24+$25, + * the result is in $27. Register $28 may be clobbered; everything else + * must be saved. + * + * We store the remainder in $28, so that we can share code. + * + * We do not signal divide by zero. + */ + +/* + * Unsigned 64-bit division. + */ + + .globl __divqu + .ent __divqu +__divqu: + .frame $sp, 48, $23 + subq $sp, 48, $sp + stq $0, 0($sp) + stq $1, 8($sp) + stq $2, 16($sp) + stq $3, 24($sp) + stq $4, 32($sp) + .prologue 0 + +#define mask $0 +#define divisor $1 +#define compare $2 +#define tmp1 $3 +#define tmp2 $4 +#define quotient $27 +#define modulus $28 + + mov $24, modulus + mov $25, divisor + mov $31, quotient + mov 1, mask + beq $25, 9f + + /* Shift left until divisor >= modulus. */ +1: cmpult divisor, modulus, compare + blt divisor, 2f + addq divisor, divisor, divisor + addq mask, mask, mask + bne compare, 1b + +2: addq quotient, mask, tmp2 + srl mask, 1, mask + cmpule divisor, modulus, compare + subq modulus, divisor, tmp1 + cmovne compare, tmp2, quotient + srl divisor, 1, divisor + cmovne compare, tmp1, modulus + bne mask, 2b + +9: ldq $0, 0($sp) + ldq $1, 8($sp) + ldq $2, 16($sp) + ldq $3, 24($sp) + ldq $4, 32($sp) + addq $sp, 48, $sp + ret $31, ($23), 1 + +#undef mask +#undef divisor +#undef compare +#undef tmp1 +#undef tmp2 +#undef quotient +#undef modulus + + .end __divqu + +/* + * Unsigned 64-bit remainder. + * Note that __divqu above leaves the result in $28. + */ + + .globl __remqu + .ent __remqu +__remqu: + .frame $sp, 16, $23 + subq $sp, 16, $sp + stq $23, 0($sp) + .prologue 0 + + bsr $23, __divqu + + ldq $23, 0($sp) + mov $28, $27 + addq $sp, 16, $sp + ret $31, ($23), 1 + .end __remqu + +/* + * Signed 64-bit division. + */ + + .globl __divqs + .ent __divqs +__divqs: + .prologue 0 + + /* Common case: both arguments are positive. */ + bis $24, $25, $28 + bge $28, __divqu + + /* At least one argument is negative. */ + subq $sp, 32, $sp + stq $23, 0($sp) + stq $24, 8($sp) + stq $25, 16($sp) + + /* Compute absolute values. */ + subq $31, $24, $28 + cmovlt $24, $28, $24 + subq $31, $25, $28 + cmovlt $25, $28, $25 + + bsr $23, __divqu + + ldq $24, 8($sp) + ldq $25, 16($sp) + + /* -a / b = a / -b = -(a / b) */ + subq $31, $27, $23 + xor $24, $25, $28 + cmovlt $28, $23, $27 + + ldq $23, 0($sp) + addq $sp, 32, $sp + ret $31, ($23), 1 + .end __divqs + +/* + * Signed 64-bit remainder. + */ + + .globl __remqs + .ent __remqs +__remqs: + .prologue 0 + + /* Common case: both arguments are positive. */ + bis $24, $25, $28 + bge $28, __remqu + + /* At least one argument is negative. */ + subq $sp, 32, $sp + stq $23, 0($sp) + stq $24, 8($sp) + stq $25, 16($sp) + + /* Compute absolute values. */ + subq $31, $24, $28 + cmovlt $24, $28, $24 + subq $31, $25, $28 + cmovlt $25, $28, $25 + + bsr $23, __divqu + + ldq $23, 0($sp) + ldq $24, 8($sp) + ldq $25, 16($sp) + + /* -a % b = -(a % b); a % -b = a % b. */ + subq $31, $28, $27 + cmovge $24, $28, $27 + + addq $sp, 32, $sp + ret $31, ($23), 1 + .end __remqs + +/* + * Unsigned 32-bit division. + */ + + .globl __divlu + .ent __divlu +__divlu: + .frame $sp, 32, $23 + subq $sp, 32, $sp + stq $23, 0($sp) + stq $24, 8($sp) + stq $25, 16($sp) + .prologue 0 + + /* Zero extend and use the 64-bit routine. */ + zap $24, 0xf0, $24 + zap $25, 0xf0, $25 + bsr $23, __divqu + + addl $27, 0, $27 + ldq $23, 0($sp) + ldq $24, 8($sp) + ldq $25, 16($sp) + addq $sp, 32, $sp + ret $31, ($23), 1 + .end __divlu + +/* + * Unsigned 32-bit remainder. + */ + + .globl __remlu + .ent __remlu +__remlu: + .frame $sp, 32, $23 + subq $sp, 32, $sp + stq $23, 0($sp) + stq $24, 8($sp) + stq $25, 16($sp) + .prologue 0 + + /* Zero extend and use the 64-bit routine. */ + zap $24, 0xf0, $24 + zap $25, 0xf0, $25 + bsr $23, __divqu + + /* Recall that the remainder is returned in $28. */ + addl $28, 0, $27 + ldq $23, 0($sp) + ldq $24, 8($sp) + ldq $25, 16($sp) + addq $sp, 32, $sp + ret $31, ($23), 1 + .end __remlu + +/* + * Signed 32-bit division. + */ + + .globl __divls + .ent __divls +__divls: + .frame $sp, 32, $23 + subq $sp, 32, $sp + stq $23, 0($sp) + stq $24, 8($sp) + stq $25, 16($sp) + .prologue 0 + + /* Sign extend. */ + addl $24, 0, $24 + addl $25, 0, $25 + + /* Compute absolute values. */ + subq $31, $24, $28 + cmovlt $24, $28, $24 + subq $31, $25, $28 + cmovlt $25, $28, $25 + + bsr $23, __divqu + + ldq $24, 8($sp) + ldq $25, 16($sp) + + /* Negate the unsigned result, if necessary. */ + xor $24, $25, $28 + subl $31, $27, $23 + addl $27, 0, $27 + addl $28, 0, $28 + cmovlt $28, $23, $27 + + ldq $23, 0($sp) + addq $sp, 32, $sp + ret $31, ($23), 1 + .end __divls + +/* + * Signed 32-bit remainder. + */ + + .globl __remls + .ent __remls +__remls: + .frame $sp, 32, $23 + subq $sp, 32, $sp + stq $23, 0($sp) + stq $24, 8($sp) + stq $25, 16($sp) + .prologue 0 + + /* Sign extend. */ + addl $24, 0, $24 + addl $25, 0, $25 + + /* Compute absolute values. */ + subq $31, $24, $28 + cmovlt $24, $28, $24 + subq $31, $25, $28 + cmovlt $25, $28, $25 + + bsr $23, __divqu + + ldq $23, 0($sp) + ldq $24, 8($sp) + ldq $25, 16($sp) + + /* Negate the unsigned result, if necessary. */ + subl $31, $28, $27 + addl $28, 0, $28 + cmovge $24, $28, $27 + + addq $sp, 32, $sp + ret $31, ($23), 1 + .end __remls + + .data + .p2align 4 +stack: + .skip 65536 +$stack_end: + .type stack,@object + .size stack, . - stack diff --git a/tests/tcg/alpha/system/kernel.ld b/tests/tcg/alpha/system/kernel.ld new file mode 100644 index 00000000000..d2ac6ecfeb8 --- /dev/null +++ b/tests/tcg/alpha/system/kernel.ld @@ -0,0 +1,30 @@ +ENTRY(_start) + +SECTIONS +{ + /* Linux kernel legacy start address. */ + . = 0xfffffc0000310000; + _text = .; + .text : { + *(.text) + } + .rodata : { + *(.rodata) + } + _etext = .; + + . = ALIGN(8192); + _data = .; + .got : { + *(.got) + } + .data : { + *(.sdata) + *(.data) + } + _edata = .; + .bss : { + *(.bss) + } + _end = .; +} From patchwork Thu May 9 16:59:00 2019 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: 163734 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1254843ilr; Thu, 9 May 2019 10:14:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqw+0Q7gmi0vYkO501AvXgdQhVSgf5CeVOlhsDwg2qqKo0VRCJkIMWPnqApLHl/eo/LdG3Ro X-Received: by 2002:a5d:688a:: with SMTP id h10mr3833488wru.211.1557422059218; Thu, 09 May 2019 10:14:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422059; cv=none; d=google.com; s=arc-20160816; b=xC+uyXdSQIBNnybg7ZbbG8O1T24Brr1RBxwIuw/AGJcwIJzelUXOcYG+BIV0bb/oC9 i0eq2UPghxjxgMJU2j1oqazunkFQh59M9g/kGLwkTQ/wxYr/brOG4KKoN7D92bHMEtzV t8U6X5L5qS3hTz2CQqIvuSSdmjcutQWxslALum3AsGh/sfRKRuP8LHzP+dh5iRleqY79 d0mr4DC8J5F3TCPeIkPb2Im93EsyxAM9kPw92Ncu6Ai2vggLbKCzbhU5sf+vi4wM9h4V ZCa/pcM7PlI/wJPE5bSdhmmcqirL5hxyEYLpFnw9S+ZOJEjHrnkXTs8gHLg0miDSrJ8M yogQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Llj5a15rxb/inXIkUK7P8QxmrenFf2cH6bC9uvAV0fk=; b=Vd+PAxcj1mstfr10EEHkZ5xYvYt6oY4WB4/s632Q49ne90d3VZ2p7XZP8MnwN68p2A SaGnF9c5XhJOkwCHrigkY0nxaqKaWVR0ORsIljqq9zlLS2PFsJLCotigD/X13Ta8ktbm Fj46YbHuHSjc+yFKnbHycA3LVRWD1ZTJWIQj5ETVAGRS00XQBf3En6wcXFFhd4ndkJkt k2CAJ/xUhu1iMNcLXxfGX9RwlVj61+BgrTadOCO/PQJ+FSkWUlmAi6F4SINLbTa8KZDB bZB7iEsoef8beOY+zU/6LqsRcjdgbd3lQoGyFuW7SVhzKiCLj9NzjK17P08gd0s67FQ5 pimA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nSQluwCY; 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=fail (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 t12si2125066wru.197.2019.05.09.10.14.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:14:19 -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=fail header.i=@linaro.org header.s=google header.b=nSQluwCY; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmcc-0003Gt-4I for patch@linaro.org; Thu, 09 May 2019 13:14:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmU5-0003n8-2H for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmU4-0008Aq-0I for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:28 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:45714) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmU3-00087X-P4 for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:27 -0400 Received: by mail-wr1-x443.google.com with SMTP id s15so4034283wra.12 for ; Thu, 09 May 2019 10:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Llj5a15rxb/inXIkUK7P8QxmrenFf2cH6bC9uvAV0fk=; b=nSQluwCYcvQEr/MQNBK0KuM817Rs8FOFo5o/savJuTjGaWC4Y1N25A2k1zMnr4lYVx Pgj2t6jArIOARMOui8ADODwchbh7Jvz9KhK9bs8vbe4JihOPr/xkhEBmSRafIpWBC+3R hTykfpNFj+WTh5gsuBKEXHq37gYSzLkXntfC4AaaznEux7rBFml3qQDaeZrgIQFVXP1L qlAKbA74a4JxGMaQq6nw3EsUor0cvVOIoBjvtPfDwrt0cTx73Zpec7kdPZSsI8OdE4O6 QUBID2lgCsIZ20gqzxwKThMJXUFPfLZmdl/td4Fu+W3F3YQkBBiCAgxunRj/Ij5GfVGc DMMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Llj5a15rxb/inXIkUK7P8QxmrenFf2cH6bC9uvAV0fk=; b=HIKc+WMMuVyLrXA/SxEKR/yLL7EzstbE0Upx6AvDKjos1XeJEOp1YC20GP3no2xXzV wBBTAmR3+48GPpkyn6dKDGXY/PH1QOtHFAl4ZjQ4oB+9Mqx1ZsH57yX+e+EX8xMenSSE pvn/tg7L3AimjYttk1AfuaXZV3MoMNggrEX554Y1Ie7F2rTZS53L74B82aEPCj412uOL nXyqBmL5zh1xjbOHqn17rlkvPZ+7Xt+ClA6wo2QwQXGdpE2XY1mowwaVlsp+AxMK61RT d1ivP7IfZFR/iABSml6LvxlsFX1s83db0qx/O9uaTMnOSNeZwd7gnfStb3hKdVwNcwfl Hcmw== X-Gm-Message-State: APjAAAWm8At9oVi/21FDGNYkzQVCJa1rynyUnoJFOZQEM4X9VrzfRbja NOV/IpcTWFXULiHyt2mc4nekGQ== X-Received: by 2002:a5d:528d:: with SMTP id c13mr125004wrv.264.1557421522978; Thu, 09 May 2019 10:05:22 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o8sm5064911wra.4.2019.05.09.10.05.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 10:05:21 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 146611FF9C; Thu, 9 May 2019 17:59:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:00 +0100 Message-Id: <20190509165912.10512-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v1 12/23] .travis.yml: enable aarch64-softmmu and alpha-softmmu tcg tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/.travis.yml b/.travis.yml index 66448d99d64..8ba571b88a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -283,5 +283,5 @@ matrix: # Run check-tcg against softmmu targets - env: - - CONFIG="--target-list=xtensa-softmmu,arm-softmmu" + - CONFIG="--target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - TEST_CMD="make -j3 check-tcg V=1" From patchwork Thu May 9 16:59:01 2019 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: 163732 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1249861ilr; Thu, 9 May 2019 10:10:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqxw1NMmU++CirCoap6RctQN90sVAprB96qRGpQq49V26hmkPoofiqnn9lEQ1lnD875RsRSl X-Received: by 2002:a1c:4602:: with SMTP id t2mr3686777wma.120.1557421812585; Thu, 09 May 2019 10:10:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421812; cv=none; d=google.com; s=arc-20160816; b=Y1lDrjSwR/T/F3dNfgzGouZZouQUuegpikGQ7ZcMdu7gorPKW5PukXhL+iI0XYYOVK +5OtfW2UnjpO1Xz3Nk44MNv1H9KjGV+GhY6IzbDhQZUK7lv0kuWE+/Z4NV9d1w4S6kJK CUit1iDZjoQ3gTO7xLObjEj1iXRwM021nUbp7vW0LfT/UGXX3FDCGTJccJj9RQ7L5VpC OGU2RV4o6Hoyb4YFtJKXJ9c3XVpdM97KW13RYn/WQtN+UG0wGQCOq6DVtqbgQGHf9KWO vs8aF1fVN2JqdmJBQSU8UOVUVv17kBvx3N136xwK6zd+FU4apmKtX73L2iiyOPZhv3Fw SiEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=6WJJoU9/+ULEvlFfrODWtYDGLHuXZHxFQnWAN9OdsAc=; b=o/tDOqYlV3x5cvPUu0JE/yKJOs6/R0+tIS6Qoul+z7CMKKmKvxU3H06e+6LWAP09Bo GDghuwsu20Sx0uRERrxhKCRKyCxZ0Uvi3wHhQepXsx69cCM4DA2CAwkuMbJFnYBF9mqF P5ZJPZb+1F2xPbVN7jwRP8KOFMWUzR0p/BfQvbJoir4uBcv1yhNUv2e8/HhHb36CKPxw j2SpeRnUkgIIjpACcPTvpO+dI4iYnOeUX7GdbD+DTBJU+ce62V49qA56M9bH3rz0w+LH qbMoBj4XwH11SBx3sToTFvN6K5e7n6C3bpHCpQp6F6ghbIT3Pw8TEmXToyn+xrpZw0ge rHdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=o3XgOo58; 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=fail (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 w7si1995423wmc.15.2019.05.09.10.10.12 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:10:12 -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=fail header.i=@linaro.org header.s=google header.b=o3XgOo58; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmYd-0007vi-GK for patch@linaro.org; Thu, 09 May 2019 13:10:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmOA-00072Y-Tu for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmOA-0004vU-0L for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:22 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:38821) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmO9-0004ug-R2 for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:21 -0400 Received: by mail-wm1-x342.google.com with SMTP id f2so4079102wmj.3 for ; Thu, 09 May 2019 09:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6WJJoU9/+ULEvlFfrODWtYDGLHuXZHxFQnWAN9OdsAc=; b=o3XgOo58XEAWsXpoq8h3BLhNl2S1ydFFj3N+eCM8OqMuaRrfBsy6hwxkB1tsEqdTMJ cDN4VyUQAB8Z/Kn7Qb0YAW1ZKohB6FjNwnkj43tqhJUsmiwLs+22gfNhXD6aXgbcCN1B 4rfAK7tV5cHUkbaduJu7RL32tx/2BeYybqmSG858i4YmfrXAzJsrJ///TJ/DgnlPueBB m9I5hlAOSxwP7Ljeq9o08i2r+aQfrnCzBkwCZ7q2MDno7v0KaY+YmoLADcEnrsd420Jz OhCrJpvsAwRcITlZeuH8qbXn4lCRgsCstWr1Dii4LIyvgNINtzS3t/wK1KW+ltNKV4Cy jWYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6WJJoU9/+ULEvlFfrODWtYDGLHuXZHxFQnWAN9OdsAc=; b=SZslaSAwk5FFxE+vJnsAZ7PLud4htEX2N8pRlAd4rDwcVznFdiREdJpRga0gkfJGGN 25oUKfkE3L+q5EOL8SsIBXWeS6h237w0msX0pJaEMiDC4mtD58HGA8LwfAnHsONefN/C 2sQUN0GJqElE9LgjnyCBHrtEu7POfnnOBcWFuzeBGrIrqTpAzLLocBV9xcrhaVLRlq/U iN0Tz0Fr/Qzs3DmyNbNlqKCm7JRUlSnlaNVbI2uMGnUp3sYKvXJrhIHDBl6Xpy4QgS5/ Tkg0H6KaayXa9qjLyiTMmoUeFLWpWIpnHS7ht40nTbpEKF85C771ntOrp8r+e7y/LneR C1Gg== X-Gm-Message-State: APjAAAVgnoqU6Fjv5lT4lPzR+B2cz4mWjkIfKowWTXbPvzjoO8T6A7xj 3wAF9ltSWLbI2/8HEdToic0FAw== X-Received: by 2002:a1c:1941:: with SMTP id 62mr3610037wmz.100.1557421160779; Thu, 09 May 2019 09:59:20 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z5sm7894192wre.70.2019.05.09.09.59.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:18 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 26F8E1FF9D; Thu, 9 May 2019 17:59:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:01 +0100 Message-Id: <20190509165912.10512-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v1 13/23] Makefile: fix coverage-report reference to BUILD_DIR X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Commit 337f2311f actually claimed to do this in the commit log but didn't actually. Oops. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/Makefile b/Makefile index a971247cac8..78d83244849 100644 --- a/Makefile +++ b/Makefile @@ -995,7 +995,7 @@ $(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl %/coverage-report.html: @mkdir -p $* $(call quiet-command,\ - gcovr -r $(SRC_PATH) --object-directory $(BUILD_PATH) \ + gcovr -r $(SRC_PATH) --object-directory $(BUILD_DIR) \ -p --html --html-details -o $@, \ "GEN", "coverage-report.html") From patchwork Thu May 9 16:59:02 2019 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: 163743 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1268266ilr; Thu, 9 May 2019 10:26:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqyu3nB4z5ajIJjPRzEYRAKxDHtrGXkLK9rJVOvQArMdILkHMt3+RQHnOyytXS+7fl8v4PZV X-Received: by 2002:adf:f788:: with SMTP id q8mr4155909wrp.181.1557422766974; Thu, 09 May 2019 10:26:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422766; cv=none; d=google.com; s=arc-20160816; b=pm1SDA9kSpifJdTYOrB/fxssaQaYm3Tdxdl4Bju1bYTOq0wMVz81L1FBB3cFQUhMux JGvYP7sCOmvFdBE5nfVTEdFmVME20o3ksoax/XYKjndz1ncNEfq2pO/1ZtT9PN/P7xPF FKyknvTZj3MhbMv3j4/m89ZOoHiiaBzsrDBTJgFl/+AbU5NMPUEp3itd8JLNzma5RkHk z6myfS9xiJrcRcffLYA0NAjX+wOs4JwJ+P53fvL9gjDG82ndSMttmQ1CNxrRb0fIjkXV NdZOsf2kDPZDKA4HH36ugdEnL7LP12P7lj+w65v4GZw11hMr/C+irrsKBIOLrEWUe6Oc uGhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=3OsvAqRpGCpyIsZPwRA2TrRs2ee15ZUjq1ExWCyXpJs=; b=xTBSvOFAT5FuP6ltom7I2eJRmFwSeTYFKO6mBj/9Vcq0Bj9aX5bscUKzWQ0HrtE8As 6oVshzGUVwJpImOC0RJg82xPmY8qrmPwORJBUEcIn1CrtH5fkcYTrDRrrq+SbGnbHhgB WVZ1IdSO3Kjxc893pZt6h1c/XSnJFhCm8jPsq+iLpyJk3YqaOeh3R/k5wbX3N0ExgF2n n9Sp0KodihWu24aTzh71Ea+25ncLl4kPmAX/6PgqavE9wBC+aT5VNeVuEc3hZ0QdUhHB e/x9mMY6buhMPivA50JIkY3XvS9SBiXlPgXdvR5TVoU8+ZSqFZNFRjACUMvHvOxUdYlF 6R3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ibiMJ0eA; 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=fail (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 j190si2056174wmj.115.2019.05.09.10.26.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:26:06 -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=fail header.i=@linaro.org header.s=google header.b=ibiMJ0eA; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmo1-00059a-BR for patch@linaro.org; Thu, 09 May 2019 13:26:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmU5-0003nN-Ji for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmU4-0008BA-3v for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:29 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:50286) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmU3-00088H-RW for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:27 -0400 Received: by mail-wm1-x342.google.com with SMTP id y17so3237912wmj.0 for ; Thu, 09 May 2019 10:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3OsvAqRpGCpyIsZPwRA2TrRs2ee15ZUjq1ExWCyXpJs=; b=ibiMJ0eAd6Rc8gH7ufafmwKVLWzWEnig8fbShtf9FiNsWFKRJFaxe6jFZ788hjpmzG iDZ/V/D6E0thUxiFRNsoHO/ca+ZL8abITKpxiZlFTD0hFRAdDCSBtIl7YGlPwQARUZlK S4d0905179gJHMTSvYHNLFvLcBisUasWHGIWzfGWr8wLlXJjD3Pw38xCq2KozwRC8a6Y jBrtkrg8w/nUOiuqt6vC9vFpz86TEafDv71ja//34asZSadzbXuaddk4+jkfReONi3Ah YpkmSQjS+2nGwDzqb3xngsdNOCVIDsah3b8zdn+W7IILt9Wm+kKXaDtJ9ltgWHvKneYf 883g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3OsvAqRpGCpyIsZPwRA2TrRs2ee15ZUjq1ExWCyXpJs=; b=LXWha3sSy3oWhCHz7wlV2QhwFXfNkLg0oGJvuSWOTf6hOcnx85HUc/xN8U/PVNFyGo KDXXCbw2SfpZYShxPExBY0ugU+5HHoOQGuZRY9ZhvHAt2cowGVS8GcrY58CCo7u/5uAZ DW6j8zM5rxX7N/D1EtU/1pGPNSyekr788YfSmwUVxiwxfAwDKsSyNSJmUojS/RLKDJ8W D/qScvoIsGPcZR/ZHpNOnvISwCKaY/PhVu7vzb4YEFf9rADlp7PnRo5sVBGbxxuBME1T RuKit2+rf19GPXPK6ho/+Q4mVQTyfIuwBB2nOlX/EfYu18+b6vl9fU6nXDJe2lS4BOhy a35g== X-Gm-Message-State: APjAAAWkcMCzIFlUf6tGFTMNZtsxF0suleZO/bbrTL8r7fOyhA2XES/g cWz8GSc49nYiIKmFS/XhqHvY7Zhuz0I= X-Received: by 2002:a7b:c053:: with SMTP id u19mr3595551wmc.63.1557421523804; Thu, 09 May 2019 10:05:23 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h24sm4458598wmb.40.2019.05.09.10.05.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 10:05:21 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 395F41FF9E; Thu, 9 May 2019 17:59:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:02 +0100 Message-Id: <20190509165912.10512-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v1 14/23] Makefile: include per-target build directories in coverage report X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/Makefile b/Makefile index 78d83244849..a1c844eb87a 100644 --- a/Makefile +++ b/Makefile @@ -995,7 +995,9 @@ $(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl %/coverage-report.html: @mkdir -p $* $(call quiet-command,\ - gcovr -r $(SRC_PATH) --object-directory $(BUILD_DIR) \ + gcovr -r $(SRC_PATH) \ + $(foreach t, $(TARGET_DIRS), --object-directory $(BUILD_DIR)/$(t)) \ + --object-directory $(BUILD_DIR) \ -p --html --html-details -o $@, \ "GEN", "coverage-report.html") From patchwork Thu May 9 16:59:03 2019 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: 163742 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1265810ilr; Thu, 9 May 2019 10:23:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyBt7UGasrtNBmL5BUu7rWyrUyMeIhKnGKrwofI/lsnfY4TPykK/qcIk3JfDKrpUmPkwcgP X-Received: by 2002:adf:f70a:: with SMTP id r10mr3992278wrp.96.1557422627673; Thu, 09 May 2019 10:23:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422627; cv=none; d=google.com; s=arc-20160816; b=v8aX+bTV76dVkC9Vc/eYkXB228wrn+gb+RXdSSxiIBx5bgZhQEPc0NaTIYrX+KQStc R4YXdsrniR7c+e628br/WYc+8Xp6DyeniqW6Pjs0CishEJAEcl6qrK5IsIhHfJwksH+Z IY3iP1FGJyfVETpl7VATKI+phseF2JWIKT55EPdQRThFXgQ/4kTNQsc4Twg8bj4oLnqy FKx/+gyn1vfIO1vrqmsD3pkOB5zsxzdHZHUsbO/5ORl0+HYloeltui1h+tagl9KT7iql ZpK6quhfUgrvx1ehvoV4YisuQGUiIwtSwVptvvQmLP5Coufi1sTIgboC1P0HYJx8w42I 3Z7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=lgZfPbopRUJXrj/AngwFpop/a9mtHOqlBcsdu25DOWg=; b=zDJ4qrP6YJb3qEKk14b3fqkwSsdkflWUTbA+Aj2jVk2sGYjZ0IMdDuZvXmSRBt0zA8 6L8qFEGKkvAdP5yVgqvx8WHrlXhRUuhOn4ijS6EUpl6P2PHVplu33c6UvxHpd6DoeJRQ MbuEpdcFqKWyLSXfeU4nooDNAdSyKyVPw3oAT9p3xjlqlFSXj3+XhdOruIRSKZ0YYS5D fCeUkCWykNwYfxwrvECQcAbgYafNXtOfxYuJSDWbkQlypNrptqJpcpWYghvJ9guPsKBB muMkc2yJFr6tSyGJ7aRjkH3gSE+YjLOYVUM10bms0M6eL1cd5rjIZOTa87T9dC25wb83 qRxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NFg8fjAv; 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=fail (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 h5si2324140wrv.125.2019.05.09.10.23.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:23:47 -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=fail header.i=@linaro.org header.s=google header.b=NFg8fjAv; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmlm-0002mW-Ke for patch@linaro.org; Thu, 09 May 2019 13:23:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmU5-0003ne-Ul for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmU4-0008Bk-D1 for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:29 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40709) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmU4-000890-4N for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:28 -0400 Received: by mail-wr1-x444.google.com with SMTP id h4so4064055wre.7 for ; Thu, 09 May 2019 10:05:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lgZfPbopRUJXrj/AngwFpop/a9mtHOqlBcsdu25DOWg=; b=NFg8fjAvpDRy2r5DC+OveaTtXK+YXnZFT5NHQizoJWoqnFBAxtGPtOLJwuGXNhuonX ql1WyRUMnN0vSlpUUYSqGCudMeDOC+E9tc33wPMbsFGqQpuprDhIVpf7fB2nIMTsn8qQ Pqx6FdK9D/keacrqxX9PuDY8w+dpwM8QOYcx2tjnH3CxEnRMTo5FoR0GCW3VgBgDYpX5 n5dkWEwsW90GufyewAe1H9P4l73V6I5Nprz/FWralka9Iz6Uua0fxQTqneP3d9Eim7sb 1GdjHp7OVw05ZrWGugAD34eHd9FqDP/j6L+SdzH3JC4SX/bIfcD0uvgPPcR0ICDWWNjy UhDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lgZfPbopRUJXrj/AngwFpop/a9mtHOqlBcsdu25DOWg=; b=g4dwqU134Fbm7h2zg2//iSZ9d+zia1Ftnw7E3n8z3FfHTcRpVOjvbiXTzVvtb8dvPe JnNNheFFQJwwoBOWWWBf4su3hLggVsmZHYffz9buiMYb+wWL9IxyhTxR3a2RnqaNyTZc cAPU5zHlGs6YTEFSY+wVc/wyDX3mOONwOSzJZs/VFQxM3TG6b3t5e4zLlxTkFDb6u1Q4 2OKBf0xxNECI+84JCCZTxVYGW4BaylGU6ENXfzw2bqtmGq3D5e0m4bDpeN322pI0M4MZ 59Q91OoBykz5QLXNODIAamuR97fqFyOw38JQoFPLSjsz4cWTOkKysbqCHSPIk64cNHUg UCFw== X-Gm-Message-State: APjAAAUD9uS8kHyj+lEn3optXpn5JRWL4u8/1czMReHV6G3G6PkcmUi8 GtsfIk68SYIdx5kNJ1tc2jlgUA== X-Received: by 2002:a5d:6a46:: with SMTP id t6mr3894461wrw.210.1557421525366; Thu, 09 May 2019 10:05:25 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v5sm5463369wra.83.2019.05.09.10.05.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 10:05:23 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4C1221FF9F; Thu, 9 May 2019 17:59:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:03 +0100 Message-Id: <20190509165912.10512-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v1 15/23] Makefile.target: support per-target coverage reports X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add support for generating a single targets coverage report. Execute: make coverage-report In the target build directory. This coverage report only cares about target specific blobs so only searches the target build subdirectory. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- Makefile.target | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.20.1 diff --git a/Makefile.target b/Makefile.target index ae02495951d..aa5d9d6ba66 100644 --- a/Makefile.target +++ b/Makefile.target @@ -238,3 +238,19 @@ endif GENERATED_FILES += config-target.h Makefile: $(GENERATED_FILES) + +# Reports/Analysis +# +# The target specific coverage report only cares about target specific +# blobs and not the shared code. +# + +%/coverage-report.html: + @mkdir -p $* + $(call quiet-command,\ + gcovr -r $(SRC_PATH) --object-directory $(CURDIR) \ + -p --html --html-details -o $@, \ + "GEN", "coverage-report.html") + +.PHONY: coverage-report +coverage-report: $(CURDIR)/reports/coverage/coverage-report.html From patchwork Thu May 9 16:59:04 2019 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: 163737 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1258972ilr; Thu, 9 May 2019 10:17:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqxn821UHaihATGIiVZevp2oxNhcYuWqljhohhNUDz9KzfSEZOT2Pf97HucNeoqprNVEe386 X-Received: by 2002:adf:fcc8:: with SMTP id f8mr4023603wrs.250.1557422269319; Thu, 09 May 2019 10:17:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422269; cv=none; d=google.com; s=arc-20160816; b=MvdOQ/56UaPwmV7gTIjMAYsNtyiL0LRAo01sePhBT+j0uaX8LIFjZGC2ISddPEZGO8 OPjN4pQ64nc+MqfXpGEVt12K3ZjP/zAukQZg9PsVO2Mum9dPIH8wU6rl2+3BaDlOMhwP f/Vj2ls58ZAXRCd8h4QKmmsz/NxwsdCdf0z4fa3OmbYXA45O4p/0Oc5SbGEUd1Izwpvl +mBtbBgvuFlLbd3LaGyIJJ5K1q5oKEXwK9wucoaRLBzb16Qax6HcLZj5d5uZ4H+GpVmO FybyiOC/vwFGFvD19esxdmZOwIup6LRKpBFHLUPGFpfprIpu6UvXjwUM7I/a4uqh7xDp 5luA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=muJ0lhsFZDTe5BSnwOJzWaWmbULUUdO9c3pN21PKLLc=; b=P7nFWj+QN/ojePhUa7TgRt0gEaKHRZy4Odz+pz/I1Inf7N9+7VFIDgzY+z4N/uChWh acofhXPlre+fCUQteYUE4DSbatsE9dJjee0thAQMa9eVWtCMIwMzGsiwJOGgm2FmQyom DkPzVEMguGhFuEhStDzclefCkaxvFM+QDyEmrE6zablrmFDQNRV5r/wm05bygimzvbgu XqEmE2Wh/PxXFmF3HkxUo+JkrnhcuD6vEj9AXFbek3Kr8Oz/g7xSCwY8LT3pfKAQ7huF QvceNCKPuDDtgSUKiV3j3de7Q+IEnukASX+xeguzvVpP3DcQcQY6RGXtlX/CmaGVeHwS bp8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zeaxHLxx; 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=fail (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 e3si2175115wrx.47.2019.05.09.10.17.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:17:49 -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=fail header.i=@linaro.org header.s=google header.b=zeaxHLxx; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58294 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmg0-0006ae-8I for patch@linaro.org; Thu, 09 May 2019 13:17:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmU6-0003oV-T5 for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmU4-0008Ci-LU for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:30 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:56074) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmU4-00086D-B5 for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:28 -0400 Received: by mail-wm1-x32c.google.com with SMTP id y2so4152735wmi.5 for ; Thu, 09 May 2019 10:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=muJ0lhsFZDTe5BSnwOJzWaWmbULUUdO9c3pN21PKLLc=; b=zeaxHLxxcJQveWOqTBef0MWfX70Bj7Y1sFIH5+gmKF3irTA9bmFTKeNHKbKrBC5Dym OTwYpa10ks0jhN0KHt5p+htPZVJIXyj7pdLAi5n5fvd0GoWhnozmD37SdayOESID47gj yzpuhulsGC8IQ+1F/19VZsuUGnxfSJIw/iV1fwZrR76WmKnH0v8b/AKAYxTeKz50l9b2 cZSd4nO1ZWx2k1twx/Yc+2YgXfMPF2h4NjMm0VTm9bhlkT+oVwkI6sM5DGCylC0jzaIU 3ZtL7AMbyOInLJJ8AE3TAHqEUV5LVSiSD9inSe5oL37vx8VedSmPXp6wYA1p+lFAwdfM K9sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=muJ0lhsFZDTe5BSnwOJzWaWmbULUUdO9c3pN21PKLLc=; b=GqCvU8c6e/fWRpUsgpKJQ8sT+jZrOGKRtCPJ5o32MwPXQq1vtDnOuB0GZmqNaVPB/W DezxH2Wh2VELqGcchlsYK3IfwyDIi6WaDefFuy/eQR8bNn3sY4NyfmjFyWLp4khX7Wxh 5DVnBVmXlU7bjcSCC3FwUoE63cOwDpIsp9Up3ZVUkbzv1aMt/oJtbebxX9cFZOT+8GxJ 2n+jEuPG7aqBx8bt4Q5Vi1z6R8oV3mcAtsdXMJ6qa3YCtCsXYj3DXwzozQOb0nAKky/3 73jcH7O2Icphj3Jror/AaLPEmEu/xBHpzVjf9iX1jvSejvjNsWu7HJYmhF9P6tplSlCU T+BA== X-Gm-Message-State: APjAAAUAIYaPoQFexBy3k/mV+fy6NZVPApP8iQHECkbzaOxARcergGNE HnNXHPvw1XQofBXgHc1aafeibw== X-Received: by 2002:a05:600c:552:: with SMTP id k18mr3743590wmc.67.1557421521849; Thu, 09 May 2019 10:05:21 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a184sm3939204wmh.36.2019.05.09.10.05.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 10:05:20 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 609E41FFA3; Thu, 9 May 2019 17:59:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:04 +0100 Message-Id: <20190509165912.10512-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c Subject: [Qemu-devel] [PATCH v1 16/23] tests/qemu-iotests/005: Add a sanity check for large sparse file support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , "open list:Block layer core" , Max Reitz , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth "check -raw 005" fails when running on certain filesystems - these do not support such large sparse files. Use the same check as in test 220 to skip the test in this case. Suggested-by: Eric Blake Reviewed-by: Eric Blake Signed-off-by: Thomas Huth Message-Id: <20190502084506.8009-2-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/qemu-iotests/005 | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 index 2fef63af882..9c7681c19bc 100755 --- a/tests/qemu-iotests/005 +++ b/tests/qemu-iotests/005 @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then _notrun "image protocol $IMGPROTO does not support large image sizes" fi +# Sanity check: For raw, we require a file system that permits the creation +# of a HUGE (but very sparse) file. Check we can create it before continuing. +if [ "$IMGFMT" = "raw" ]; then + if ! truncate --size=5T "$TEST_IMG"; then + _notrun "file system on $TEST_DIR does not support large enough files" + fi + rm "$TEST_IMG" +fi + echo echo "creating large image" _make_test_img 5000G From patchwork Thu May 9 16:59:05 2019 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: 163730 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1246700ilr; Thu, 9 May 2019 10:07:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5/qqNIUiOAhqqJjITLT0RZP1oDH1ce4P0H41OYK7tU8E1ya5GSzgwXfrAEmDYGuZymbTr X-Received: by 2002:a1c:cc18:: with SMTP id h24mr3653203wmb.13.1557421651710; Thu, 09 May 2019 10:07:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421651; cv=none; d=google.com; s=arc-20160816; b=v1RhyYxVDKlxhYiNpRUkOsJpti/y5rYIsDdtC+FYX+r3qTNv4SCuKfKWMnkO8CAtZ/ 4Fvd7NLQgKPPJdykkXb3oeuN+E/YUlPnAVdqhieJRSYX8D303AgZKS2F+lzkD7QihODg mKkGbnNYTtavfN+R8YORWVdYObzqctwWBzoaIH3poLK9Qo9iHhooNhGTv/PvOHNmMak0 Iv4jRZI0n9LAD/ZidjcPB9m7ugj6FR6tqNSg5WCHInDeUESCsejVE4zXfZT6BrbeICY/ ZPeOXzAaYujWT6LaY4z+VW1mbhcKdNhq/IGpCksFWRAYe9BDHS1DgunilZsovtENwuq5 k6hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=BruQFJSmyR8ZsEhlY42Yrz/6o7DH3AvksulnhVRaQWU=; b=axbUJBPcT2C0IBwQA2E046u8e5i8cCJLaM4XjW1uCDIHoe2AqrQ5XerUbPmBM8P+i2 foqGLvfvkCeESZFjN+rdgDLDlyGxO0zse4zz4Ui6UOP1ufDu4C8fjFaSKvDfAMa8dQoJ 7rsp+y91fSfzOrKAIeUCWjQj0aEfrQnnc92SjYruqiUjU1ibq5rl9t3i9T21C390DVey okSC/TY2YFICJxeqc+mXAodgyszbWNWOXN78dyxOBDs6gfDla1v9sFlny5j/r78cXy55 AYHCIeemGe6z19JwgxE+Eo8eoCHsv7H+Jc7l4Hpe/ql4EA23qJQE72plzIxhGmk06+Oj dT/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aXYaB+vk; 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=fail (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 z142si2015863wmc.9.2019.05.09.10.07.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:07: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=fail header.i=@linaro.org header.s=google header.b=aXYaB+vk; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmW2-0005YY-Hj for patch@linaro.org; Thu, 09 May 2019 13:07:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmOE-00075n-2z for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmOD-0004xl-0C for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:26 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45063) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmOC-0004xD-Nn for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:24 -0400 Received: by mail-wr1-x42d.google.com with SMTP id s15so4009522wra.12 for ; Thu, 09 May 2019 09:59:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BruQFJSmyR8ZsEhlY42Yrz/6o7DH3AvksulnhVRaQWU=; b=aXYaB+vktXvYqhzIAlcqMSfT3UIKylD4W5gN16cnli8OURj0OJJyRmSor8Sj9emZX5 bClYOyiRXpv4dUFnGmrIroJuV4hRkk5tJN3OY3NxYdQyoT7l76jgjZl4apJ2uF2Zbmp8 /xB6CXqlYcNb3EUo4VeTMoPeckhJzCRIGRpgO1wE+6ThS4KCjMZ2jBfPxY/wXtE8YNjJ vRvUhtXq01KtB7VsiKqaUW+g4ihnuxNfFMMlzOAwfYCuojcYQxBO8NFmDvwa+OJhzNoE b0iI1eUb9iiuW3C1iOzSKgGwl/KtVItZgoOeXLQHOG8idI6gmw51qmiCyzrdnGYTnHoC 0uTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BruQFJSmyR8ZsEhlY42Yrz/6o7DH3AvksulnhVRaQWU=; b=KbR7CRBELovGbD7mEn8H89pBBFquURuMJIywabjj4s6d20/hhEfIVJmDNHF2HnuG7e 6Lgk9zIaoDgj+6g48Ml95HF9WA95odMQ5tOhkSfVr1wVOiJgKZj36CYhzrTgh3hQkApG Wv+bzrOeh5KTZnNHsZ57vU4LlJnPJEcV/cEcXN/WAbo3v83ilxXiWon5ZqlwjsTytWr7 V0zJJg8W/xHCkpcA5l6jeQBU4xHQQlvcMCUmmAfetvVo+z1RUguGirsiqKkCvJIjKF1K C0i2XxqkSwc+kxxkU7E08drgdVRu9++5/mWjrQJp8ZPQDOrhxLfoVGkKGw/aPLtNr1Sl hX7g== X-Gm-Message-State: APjAAAWzIpTXxinAq89+T3ApsVYM/GDDZRyzPga24ijV1UrgNahIjqB7 MkVBCtoi5ArAYy0XNgQTaVcERQ== X-Received: by 2002:a5d:458e:: with SMTP id p14mr4043359wrq.318.1557421163682; Thu, 09 May 2019 09:59:23 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z17sm3625846wrm.33.2019.05.09.09.59.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:22 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7423D1FF87; Thu, 9 May 2019 17:59:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:05 +0100 Message-Id: <20190509165912.10512-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PATCH v1 17/23] tests/qemu-iotests/check: Pick a default machine if necessary X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , "open list:Block layer core" , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , Max Reitz , Christian Borntraeger , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have a default machine, so when running the qemu-iotests with such a binary, lots of tests are failing. Fix it by picking a default machine in the "check" script instead. Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Acked-by: Christian Borntraeger Signed-off-by: Thomas Huth Message-Id: <20190502084506.8009-3-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/qemu-iotests/check | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index f9c24b6753c..922c5d1d3d3 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -130,7 +130,6 @@ export CACHEMODE="writeback" export QEMU_IO_OPTIONS="" export QEMU_IO_OPTIONS_NO_FMT="" export CACHEMODE_IS_DEFAULT=true -export QEMU_OPTIONS="-nodefaults -machine accel=qtest" export VALGRIND_QEMU= export IMGKEYSECRET= export IMGOPTSSYNTAX=false @@ -564,6 +563,18 @@ then fi export QEMU_PROG="$(type -p "$QEMU_PROG")" +case "$QEMU_PROG" in + *qemu-system-arm|*qemu-system-aarch64) + export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest" + ;; + *qemu-system-tricore) + export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest" + ;; + *) + export QEMU_OPTIONS="-nodefaults -machine accel=qtest" + ;; +esac + if [ -z "$QEMU_IMG_PROG" ]; then if [ -x "$build_iotests/qemu-img" ]; then export QEMU_IMG_PROG="$build_iotests/qemu-img" From patchwork Thu May 9 16:59:06 2019 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: 163741 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1264887ilr; Thu, 9 May 2019 10:22:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqzhHDtW/xNZdUZxdwVKdAzRWqoK3lSV97NdAorR8nP1Qwo0l5L/lKYs2y5ccu7YwZXuehu2 X-Received: by 2002:a1c:20d2:: with SMTP id g201mr3727202wmg.148.1557422575947; Thu, 09 May 2019 10:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422575; cv=none; d=google.com; s=arc-20160816; b=T6QyKahpx57+9vmfQ8QqWBmOOoLha0mSweCbiQDoE83zwd9sEKRABnSNkIQIJKXa0S 5Q3CP8RcOzfegVtMLRqXR266osZXoziEQjTOAmuL1jrG5MITyrXAd3PXO0JpY6qBtYlR MFMJZu2vkqpXbYf0wzlQDhH7+ZIOAW4hGbLYxGEh6FVZYvTg/gNr+h1hKVJIgfEvhBiI G5gYuyCnLi/iWa0uHj3IXojnFT7kUxizF3LvZ0iwMQm1/+75UrhoGEkvVms/9Eifptx5 PA1e8Nm3p0xJekj8j1cEP8gTtGLywRF2qS1WQHcEepd2g7v4D2ntnXCQK/1OXTtacc3I YSxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=MBe7Kc2gJyZ/SuxEH+RJihcvFjAFUPDJsCo1R8ybthc=; b=VtmpH5tW/S9HPJS+bBlGWJZNMwLYrA2fAUe5iiI6aYulK06+ZV87DW4DyW7mpCw/3w EB5r2/4uecC86+nZjpDI0g7NIPD227vB9QfuRw+lN+DGRx/QFfhbhC53Mu8F6/70QIo3 t/C1jXy6md5nm+CQPHowLYVcu1P/bgA5FVlMzanroXbYXoWWr5FGsYdg6fClzEHtPSZQ iFmNWfaAz/OsmrEHEj/EDwc5jn7/hraqNxvJmrnXH0zF0taWYMvGPpjZUtRCwVZwPwwa dqgES7jz7XYv1idlh7nJ+arjYDuu558aapqAU8buIqITIf0jCrhmVJOzFacEjagKWZd3 4oEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="QO/9ph0A"; 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=fail (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 f12si1958420wmh.21.2019.05.09.10.22.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:22:55 -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=fail header.i=@linaro.org header.s=google header.b="QO/9ph0A"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmkw-0002PW-Rj for patch@linaro.org; Thu, 09 May 2019 13:22:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmU8-0003pm-G8 for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmU5-0008Ef-J2 for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:32 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41886) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmU5-0008C2-99 for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:29 -0400 Received: by mail-wr1-x441.google.com with SMTP id d12so4053897wrm.8 for ; Thu, 09 May 2019 10:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MBe7Kc2gJyZ/SuxEH+RJihcvFjAFUPDJsCo1R8ybthc=; b=QO/9ph0A12agL9W5ZQrEfa2lomWMpn6I9o25/epjdrOlgqacqHlS4HT4lk6rKAsOqj M+EHTAM5QJJMdzXETT8bo7oh1z26kH7HC1i+Usak6pcImy1DCCLTMZmjdBw9cjAGHpwh 20DLkTW7KapaVQ3HwPB8+1U2L/DFpVhAcoi83wiZymWmtTdkXUSkpThXtc7bNlYVQz32 +ZWz/L5ymPzC/eJKOyE2jTdfzCals+SaOmwS5KIGWsDC1/2FYEAzjRiYWLHe2dwpGtvs mALgrbjIjARAnCgOojfm8alZKwjIq0FeZYAipl9IqwsTT0ZXsZruL1r4gD9GAmtCwsc9 DA2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MBe7Kc2gJyZ/SuxEH+RJihcvFjAFUPDJsCo1R8ybthc=; b=oAcsFDxANv0IbydNem5qhn+yG1kAIL5WXxHQD4h8ZB4qPPyAa67/xPLHymtC+zwBtq rerAXsEpQw0lKrHYgkzqA7ayoiYFtDCl0SfwkjzTIhzfr0Mr2GKB3eDGArvLSzy1cB4b EH3YIykiVRA8SZTYo/WmpJhgmwZeQghH6DouiIkXz/NDFhdGOLK8tCst8ICDQK1H7SB8 MD5V9dawG/cy+LE+Nz8DwUP4Nzwof3j9h2su0GZE5ZrBkQ3U/p0nZ9DjLpSU1mYI+U+w Rr2bz5uyTwAk7b6QTlesYdYK/T7+fTJ5+WdxgEuxkigCnszR+c9tMggD+zCkzDORzzI/ yiQg== X-Gm-Message-State: APjAAAWskH4Y6X2k8QOZjwR5qMdPe/6CdWzvGSsYPBSM2zRe0FoYGQ25 7zC8L6Owevb0bpU5iBMCS/N3LA== X-Received: by 2002:adf:f0ce:: with SMTP id x14mr4034064wro.121.1557421528049; Thu, 09 May 2019 10:05:28 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g10sm3400523wrw.80.2019.05.09.10.05.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 10:05:24 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8F13C1FFA5; Thu, 9 May 2019 17:59:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:06 +0100 Message-Id: <20190509165912.10512-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v1 18/23] tests/qemu-iotests: Do not hard-code the path to bash X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , "open list:Block layer core" , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Max Reitz , Christian Borntraeger , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth bash is installed in a different directory on non-Linux systems like FreeBSD. Do not hard-code /bin/bash here so that the tests can run there, too. Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Acked-by: Christian Borntraeger Signed-off-by: Thomas Huth Message-Id: <20190502084506.8009-4-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/qemu-iotests/239 | 2 +- tests/qemu-iotests/240 | 2 +- tests/qemu-iotests/241 | 2 +- tests/qemu-iotests/243 | 2 +- tests/qemu-iotests/244 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/tests/qemu-iotests/239 b/tests/qemu-iotests/239 index 6f085d573da..b0991ffe594 100755 --- a/tests/qemu-iotests/239 +++ b/tests/qemu-iotests/239 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Test case for dmg # diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240 index 65cc3b39b13..d3e663ed65c 100755 --- a/tests/qemu-iotests/240 +++ b/tests/qemu-iotests/240 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Test hot plugging and unplugging with iothreads # diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241 index 017a736aaba..58b64ebf41f 100755 --- a/tests/qemu-iotests/241 +++ b/tests/qemu-iotests/241 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Test qemu-nbd vs. unaligned images # diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243 index 5838c6e89cb..e563761307d 100755 --- a/tests/qemu-iotests/243 +++ b/tests/qemu-iotests/243 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Test qcow2 preallocation # diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244 index d8e71223058..13978f93d24 100755 --- a/tests/qemu-iotests/244 +++ b/tests/qemu-iotests/244 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Test qcow2 with external data files # From patchwork Thu May 9 16:59:07 2019 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: 163738 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1260000ilr; Thu, 9 May 2019 10:18:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYmzRlm+p/CtMU4FIHQl5CmvYhJjSQiATexsDne4xSsYADGr4vmJq+6zg9EbyzWdcN9PEZ X-Received: by 2002:a05:600c:22c5:: with SMTP id 5mr3612189wmg.129.1557422323764; Thu, 09 May 2019 10:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422323; cv=none; d=google.com; s=arc-20160816; b=rJv0BKIWukxmMJ8Xp82+41Ra+RaCX1JrzpwCRDG/hKNmfSKzEd30WAPcwk0R56OSGV IDJDKnuAffl7c/EE3r2op2FOAAWlMKf4zGtFbYKR0SMU6TrXR6TvqQeA/lqSR1iQxO4J o7zw6wkDG3Mst7Op6eBylnaSS5ifZYuAvZLSaUPCx7z45+4+B1eZP5RtPDjAqS+iVl/0 Q/IY2QrUachuB15P+Hnwu0gxAZK5XamMmwu7Vhv8My9pJXUB/P6PC3YirtFTU2ujbrVb IfWRdLp1JL3fXRXQ7ULeDnFOCiN14rTnvrmrjYloa+PBgH7YHtLSxK4LcsT/04W/ABO0 PynA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=zGueEXNbToGx5hE14DEDnOdyHE8+wvuGNK1SwxHKnFs=; b=RKqt3hf++Y6WYxN70nxet0pvnud88pRBNCxiOz7qGpoXleDGxu3AvXDJmCocnJwLNa Xc3Jbcm/nFDXUK4sjwLEP1ap5PHbxAaMxLfAZRwaLvvcFbLut4znp4cGRckSSCKRkSKV AsMvsVWqwWJyVPqIZQGjXpwGFe2H9ZJSPJ5st3Ml3y91hscft9okb1UwUoZ9MxgGomjF QZBQGg0W36l7jnPo1+B3XDNyeHFT2SsiJYPaI1rgUtPjQXF9/9MbBb41qr+rGrgexlH4 /t+uA+l2Wq+hh9Bshk1v+SxlAC/JFx97rXoDkPtnMImnIKzT9XjgmqKVhqAahSjkWA+Q Y+dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ouujw737; 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=fail (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 e27si2640094wrc.424.2019.05.09.10.18.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:18:43 -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=fail header.i=@linaro.org header.s=google header.b=ouujw737; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmgs-0007as-Lt for patch@linaro.org; Thu, 09 May 2019 13:18:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmU5-0003nE-GD for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmU4-0008Az-2u for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:29 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34215) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmU3-00089V-Q3 for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:27 -0400 Received: by mail-wr1-x444.google.com with SMTP id f7so4101365wrq.1 for ; Thu, 09 May 2019 10:05:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zGueEXNbToGx5hE14DEDnOdyHE8+wvuGNK1SwxHKnFs=; b=ouujw737NJgjmvM4H7Y4WHQ2MzmtLJ+RZ1+bjEU8aXhHcnLoC199oeT3Up2vgd30hJ 8iBFm900G7jpe7hLYgTlwlFJ9HJtESdgUPaw25BsclYL4QPJQx7Dgy5q0VH3h+Cpz/On 4p5Fzuf4wGUoInBF1iMDlhYz6CO5Z/QzfHL0GfNe8frKqat0GEIaCgKOSe4MOL2dAx6S m+dK+gZwqr4Y9B6cyVtEBObA5VrEsKoozd2HLUMAXKZ4s+a4cKoHxjYTSE9jByQ7LiYa aHP7lR7hdlKUwpUTDj011tx2CMxWGKNlNGkOgMdP085a6o+MjLl6OuxToASZdV5J1R/U r8FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zGueEXNbToGx5hE14DEDnOdyHE8+wvuGNK1SwxHKnFs=; b=JowEJN3+sL2Z0hdcSJ8yJ5Yotd/NcOUJWKQVoBhIcbFWrPbmAL7WnAs0E1zj/ruwyG WuHC1a0o/Ux0De0a2yJB2t88+y7XVEkt9LlyJXU36LcuWRpfyurhCGBhzjHouNrdaj0K XcfuWs0gsCQZplyLtBHU7AGcS6teUtZ4kKz6jgF5ksJ7di4AkyrHo4kmRRwEMI5PMH6u l5U2BJqEzckBvot42ig4FipnoFt6XIOLmsAPf3htZdN0XcQx1SrdfKvJH41Y87Hce/9M 8oUQk93l6qEKW+wo2GxozHSpPJC28oSeJBgFJsvfNZAotUiIIvEsj9M+Mn3YWzicAdXw uUnA== X-Gm-Message-State: APjAAAUXqHbmGmIxX6Q7mjYA58BFdQdGbpl2PgKhZw9a80uWHFmVqfA2 PTbmtHHRXmYDhVb+qNM6I08PfQ== X-Received: by 2002:adf:e703:: with SMTP id c3mr3806988wrm.98.1557421525928; Thu, 09 May 2019 10:05:25 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r3sm1790121wrn.5.2019.05.09.10.05.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 10:05:23 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A53D81FFA6; Thu, 9 May 2019 17:59:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:07 +0100 Message-Id: <20190509165912.10512-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v1 19/23] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , Ed Maste , =?utf-8?q?Alex_Benn=C3=A9e?= , Christian Borntraeger , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Li-Wen Hsu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth We are going to enable the qemu-iotests during "make check" again, and for running the iotests, we need bash and gnu-sed. Reviewed-by: Li-Wen Hsu Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Acked-by: Christian Borntraeger Signed-off-by: Thomas Huth Message-Id: <20190502084506.8009-5-thuth@redhat.com> Signed-off-by: Alex Bennée --- .cirrus.yml | 4 ++-- .travis.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/.cirrus.yml b/.cirrus.yml index 47ef5bc6040..8326a3a4b16 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,7 @@ freebsd_12_task: cpu: 8 memory: 8G install_script: pkg install -y - bison curl cyrus-sasl git glib gmake gnutls + bash bison curl cyrus-sasl git glib gmake gnutls gsed nettle perl5 pixman pkgconf png usbredir script: - mkdir build @@ -20,7 +20,7 @@ macos_task: osx_instance: image: mojave-base install_script: - - brew install pkg-config python glib pixman make sdl2 + - brew install pkg-config python gnu-sed glib pixman make sdl2 script: - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; } - gmake -j$(sysctl -n hw.ncpu) diff --git a/.travis.yml b/.travis.yml index 8ba571b88a8..b053a836a32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,7 @@ addons: packages: - glib - pixman + - gnu-sed # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu From patchwork Thu May 9 16:59:08 2019 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: 163745 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1271235ilr; Thu, 9 May 2019 10:28:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqwkD0MgjgokHkZVRoklYYYG4tMbHEA0zm6UIaH72N2M6MuS73A/cSN90vbfUGzwRjQgiGGs X-Received: by 2002:adf:eb84:: with SMTP id t4mr1894378wrn.43.1557422930144; Thu, 09 May 2019 10:28:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422930; cv=none; d=google.com; s=arc-20160816; b=ONCUP1rJ67IjJpWSW61zKglfmbtcEYbsrvXvE272fRODubKNXy/epcEwLXAX1OY/x/ QJM8EtZpDYIlzEXuFOXGwb5VDmvTPJP28prpK0JXzB63fLPkea5JewZdQMVNvAwcbTt8 S742z0EpZZBTxUDqMAHaw8+EbOig0dNuLcmFPzeSBkMxKctx639aqlDqFywTWfvchSYG DpbF8HT1igNLOV82lE+OD8hPHS1pKKO+UtR5PvExsdXnOd1gfovS5Q8J8n39bWrpXVCI KlxSp6Gjm3iaDudx3N099Qf0iqeZ9YMLDIJV6SR/YHeU4yQ5NJUUjgkrkQXhi55Dwdcd ZSKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=bB2i4GUjhBmVIAfyyxgXDSeVjb7JmNz+SNv0HmJf3DM=; b=wRqAtWWOEUHx5w2PPOIr4T3Y9wS6y2dTOzk6LtEBIYV3W/8BDEeHzMmYaZR+uAvJfk tjFGmkIWWQUKGKOONKd6Q0qbd3CYPTABj9kEZPzV4+mh/6M9Gw7nLLBQkTdlE6PSRlKL NbRQA0ilZFXXMLi2402POrp1S6q5/vmbWuDqxJEAWjkiKZOKhHK4CwmmCBtXJDXR+kBb kAPem2EF11Vg0jzdb6qpBFroHSXxnqsidU4JDTGea2Emw+jtBev76g0o3llicUu95xPe O9wWgiiRxaEej3Ka6dJ1XQrW0+YZ+wsNCEz/LGRS0pyjfc0xw/iVPVeXKm8bp6HrDKC9 ujgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tF+uAkrO; 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=fail (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 x12si2220292wrl.73.2019.05.09.10.28.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10: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=fail header.i=@linaro.org header.s=google header.b=tF+uAkrO; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmqe-0006hM-Uz for patch@linaro.org; Thu, 09 May 2019 13:28:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmUC-0003sQ-NN for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmU4-0008Bq-FC for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:36 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33606) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmU3-000895-Su for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:28 -0400 Received: by mail-wr1-x429.google.com with SMTP id e11so4099026wrs.0 for ; Thu, 09 May 2019 10:05:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bB2i4GUjhBmVIAfyyxgXDSeVjb7JmNz+SNv0HmJf3DM=; b=tF+uAkrO0Kg+ghEjwa/l6Jb+aznNtPCjby/LwS57I6QmeUbAguX16lEEMDoRjhwfIi kFC68xbk8LtvsBCJXq3g26QwSRn45sUgsPEYKtjBSfKhqhPDOqqd90vXji3rA7296QCi WKCtQEzWmkZNGDeNUX0jSt0Eijr2cSW5XSbYCdBFcTW5g5sMbR1nN82HMAm2kXNDquB2 1Ky05pn/4n8ZiERkFLf1cJYhFVYhp/UI98UwtGzbLLR6vFq8EN6CdNNw+qJ9R77l5Qxw +eECuFJ24RIysGOPqsBJZQZ4XIMS9AkMx3UMCo7VtsuhAT4cXXfdcb/8wBp0fXuLi/LT ZlRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bB2i4GUjhBmVIAfyyxgXDSeVjb7JmNz+SNv0HmJf3DM=; b=qjGsualxA6r9+Y9c3RSpFT3ULuG7t7xZ8mqWW05To9K55AjOqTKNBHfhyURGYof9XY jSFrEUQrdkPgcpXkF2QH0kX7mnHsiYqLJXczCiVwXC8yL2e0UMdN2rgCWtJkbM7vvxYF Q3SuviPnsqvGLByvG4nRftPs8j9YqVZGN6l92vJkK1Cc6ZUKU04ldTIqNs9l8Ls9xKtQ wYGgDI5r82DOxju3NqLDpv4nDR7QGMkChi/EgbL9lktIH6oE6HrjhVlG+VT3wmyL+Owi D+Nn1UsLvZwGQV7GSxWYyE1Q19q8o+rhtGxx7KymeFeRUMiE/ACtR/1NqScdu79NDlir 2Vcw== X-Gm-Message-State: APjAAAVLNuwHdhBot2lROFQfFFEEV4PdC8QG71Jrr1wx8fKiW86zLL6I eiUuoETEe/FGhRlrvBxpjf3uKQ== X-Received: by 2002:adf:94a5:: with SMTP id 34mr3943507wrr.275.1557421524651; Thu, 09 May 2019 10:05:24 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u22sm1581840wmc.12.2019.05.09.10.05.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 10:05:23 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4CA7A1FF8C; Thu, 9 May 2019 17:59:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:08 +0100 Message-Id: <20190509165912.10512-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PATCH v1 20/23] tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , "open list:Block layer core" , Max Reitz , Christian Borntraeger , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth A lot of tests run fine on FreeBSD and macOS, too - the limitation to Linux here was likely just copied-and-pasted from other tests. Thus remove the "_supported_os Linux" line from tests that run successful in our CI pipelines on FreeBSD and macOS. Reviewed-by: Alex Bennée Tested-by: Alex Bennée Acked-by: Christian Borntraeger Signed-off-by: Thomas Huth Message-Id: <20190502084506.8009-6-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/qemu-iotests/001 | 1 - tests/qemu-iotests/002 | 1 - tests/qemu-iotests/003 | 1 - tests/qemu-iotests/004 | 1 - tests/qemu-iotests/007 | 1 - tests/qemu-iotests/008 | 1 - tests/qemu-iotests/009 | 1 - tests/qemu-iotests/010 | 1 - tests/qemu-iotests/011 | 1 - tests/qemu-iotests/012 | 1 - tests/qemu-iotests/015 | 1 - tests/qemu-iotests/017 | 1 - tests/qemu-iotests/020 | 1 - tests/qemu-iotests/021 | 1 - tests/qemu-iotests/022 | 1 - tests/qemu-iotests/025 | 1 - tests/qemu-iotests/026 | 1 - tests/qemu-iotests/027 | 1 - tests/qemu-iotests/029 | 1 - tests/qemu-iotests/031 | 1 - tests/qemu-iotests/032 | 1 - tests/qemu-iotests/033 | 1 - tests/qemu-iotests/035 | 1 - tests/qemu-iotests/036 | 1 - tests/qemu-iotests/037 | 1 - tests/qemu-iotests/042 | 1 - tests/qemu-iotests/043 | 1 - tests/qemu-iotests/046 | 1 - tests/qemu-iotests/047 | 1 - tests/qemu-iotests/049 | 1 - tests/qemu-iotests/050 | 1 - tests/qemu-iotests/051 | 1 - tests/qemu-iotests/052 | 1 - tests/qemu-iotests/053 | 1 - tests/qemu-iotests/054 | 1 - tests/qemu-iotests/062 | 1 - tests/qemu-iotests/063 | 1 - tests/qemu-iotests/066 | 1 - tests/qemu-iotests/067 | 1 - tests/qemu-iotests/068 | 1 - tests/qemu-iotests/069 | 1 - tests/qemu-iotests/071 | 1 - tests/qemu-iotests/072 | 1 - tests/qemu-iotests/073 | 1 - tests/qemu-iotests/079 | 1 - tests/qemu-iotests/082 | 1 - tests/qemu-iotests/085 | 1 - tests/qemu-iotests/089 | 1 - tests/qemu-iotests/090 | 1 - tests/qemu-iotests/094 | 1 - tests/qemu-iotests/095 | 1 - tests/qemu-iotests/098 | 1 - tests/qemu-iotests/102 | 1 - tests/qemu-iotests/103 | 1 - tests/qemu-iotests/104 | 1 - tests/qemu-iotests/105 | 1 - tests/qemu-iotests/107 | 1 - tests/qemu-iotests/110 | 1 - tests/qemu-iotests/111 | 1 - tests/qemu-iotests/112 | 1 - tests/qemu-iotests/114 | 1 - tests/qemu-iotests/115 | 1 - tests/qemu-iotests/117 | 1 - tests/qemu-iotests/120 | 1 - tests/qemu-iotests/125 | 1 - tests/qemu-iotests/126 | 1 - tests/qemu-iotests/127 | 1 - tests/qemu-iotests/133 | 1 - tests/qemu-iotests/134 | 1 - tests/qemu-iotests/142 | 1 - tests/qemu-iotests/143 | 1 - tests/qemu-iotests/144 | 1 - tests/qemu-iotests/145 | 1 - tests/qemu-iotests/153 | 1 - tests/qemu-iotests/156 | 1 - tests/qemu-iotests/157 | 1 - tests/qemu-iotests/158 | 1 - tests/qemu-iotests/159 | 1 - tests/qemu-iotests/162 | 1 - tests/qemu-iotests/170 | 1 - tests/qemu-iotests/173 | 1 - tests/qemu-iotests/182 | 1 - tests/qemu-iotests/183 | 1 - tests/qemu-iotests/186 | 1 - tests/qemu-iotests/187 | 1 - tests/qemu-iotests/190 | 1 - tests/qemu-iotests/191 | 1 - tests/qemu-iotests/192 | 1 - tests/qemu-iotests/195 | 1 - tests/qemu-iotests/197 | 1 - tests/qemu-iotests/200 | 1 - tests/qemu-iotests/214 | 1 - tests/qemu-iotests/215 | 1 - tests/qemu-iotests/217 | 1 - tests/qemu-iotests/227 | 1 - tests/qemu-iotests/231 | 1 - tests/qemu-iotests/233 | 1 - tests/qemu-iotests/240 | 1 - tests/qemu-iotests/247 | 1 - 99 files changed, 99 deletions(-) -- 2.20.1 diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001 index 5d266e170a9..d87a535c339 100755 --- a/tests/qemu-iotests/001 +++ b/tests/qemu-iotests/001 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 index 7fb85084a1f..fd413bce48e 100755 --- a/tests/qemu-iotests/002 +++ b/tests/qemu-iotests/002 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 index f008c57cdcb..ccd3a39dfb3 100755 --- a/tests/qemu-iotests/003 +++ b/tests/qemu-iotests/003 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux size=128M offset=67M diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004 index 64fab3e7147..d308dc4b498 100755 --- a/tests/qemu-iotests/004 +++ b/tests/qemu-iotests/004 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx luks _supported_proto generic -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 index 3ab5490db39..6abd402423f 100755 --- a/tests/qemu-iotests/007 +++ b/tests/qemu-iotests/007 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # currently only qcow2 allows for consistency checks using qemu-img _supported_fmt qcow2 _supported_proto generic -_supported_os Linux # refcount_bits must be at least 4 so we can create ten internal snapshots # (1 bit supports none, 2 bits support two, 4 bits support 14) _unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]' diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008 index 75067e36ad8..2b81b119bfe 100755 --- a/tests/qemu-iotests/008 +++ b/tests/qemu-iotests/008 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 index bc4b461122c..51b200db1d5 100755 --- a/tests/qemu-iotests/009 +++ b/tests/qemu-iotests/009 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux size=6G diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 index 6920408d289..48c533f6326 100755 --- a/tests/qemu-iotests/010 +++ b/tests/qemu-iotests/010 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux size=6G diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 index b4c7e8f7996..8b1fce069ad 100755 --- a/tests/qemu-iotests/011 +++ b/tests/qemu-iotests/011 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux size=6G diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012 index 2c3b42d9dd0..12957285b33 100755 --- a/tests/qemu-iotests/012 +++ b/tests/qemu-iotests/012 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file -_supported_os Linux # Remove once all tests are fixed to use TEST_IMG_FILE # correctly and common.rc sets it unconditionally diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 index 5a4063e4f53..eec5387f3d7 100755 --- a/tests/qemu-iotests/015 +++ b/tests/qemu-iotests/015 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # actually any format that supports snapshots _supported_fmt qcow2 _supported_proto generic -_supported_os Linux # Internal snapshots are (currently) impossible with refcount_bits=1 _unsupported_imgopts 'refcount_bits=1[^0-9]' diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index 83744f29a3f..79875de4543 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow qcow2 vmdk qed _supported_proto generic _unsupported_proto vxhs -_supported_os Linux _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" TEST_OFFSETS="0 4294967296" diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index 71fa753b4ed..6b0ebb37d2f 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting backing files _supported_fmt qcow qcow2 vmdk qed _supported_proto file -_supported_os Linux _unsupported_imgopts "subformat=monolithicFlat" \ "subformat=twoGbMaxExtentFlat" \ "subformat=twoGbMaxExtentSparse" diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021 index f6555f3b74d..f888269fd4c 100755 --- a/tests/qemu-iotests/021 +++ b/tests/qemu-iotests/021 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022 index b68cd64b33c..99eb08f57f6 100755 --- a/tests/qemu-iotests/022 +++ b/tests/qemu-iotests/022 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format that supports snapshots _supported_fmt qcow2 _supported_proto generic -_supported_os Linux TEST_OFFSETS="10485760 4294967296" CLUSTER_SIZE="4096" diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025 index d9a4ebc5e75..e05d833452d 100755 --- a/tests/qemu-iotests/025 +++ b/tests/qemu-iotests/025 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt raw qcow2 qed luks _supported_proto file sheepdog rbd nfs -_supported_os Linux echo "=== Creating image" echo diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index ca89ad70486..e30243608b9 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Currently only qcow2 supports rebasing _supported_fmt qcow2 _supported_proto file -_supported_os Linux _default_cache_mode "writethrough" _supported_cache_modes "writethrough" "none" # The refcount table tests expect a certain minimum width for refcount entries diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 index b7df9701f73..4cb638022a1 100755 --- a/tests/qemu-iotests/027 +++ b/tests/qemu-iotests/027 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt vmdk qcow qcow2 qed _supported_proto generic -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 index 5f42f76cc6e..94c27131320 100755 --- a/tests/qemu-iotests/029 +++ b/tests/qemu-iotests/029 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic _unsupported_proto vxhs -_supported_os Linux # Internal snapshots are (currently) impossible with refcount_bits=1 _unsupported_imgopts 'refcount_bits=1[^0-9]' diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index ef92d8eee37..a3c25ec2378 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 _supported_proto file -_supported_os Linux CLUSTER_SIZE=65536 diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 index a1757bb15e2..23c216c5495 100755 --- a/tests/qemu-iotests/032 +++ b/tests/qemu-iotests/032 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This works for any image format (though unlikely to segfault for raw) _supported_fmt generic _supported_proto generic -_supported_os Linux echo echo === Prepare image === diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index cfdf1ec2bab..362a48c0a07 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 index 46aa8359365..ad6fa3115a7 100755 --- a/tests/qemu-iotests/035 +++ b/tests/qemu-iotests/035 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic -_supported_os Linux size=6G diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 index 1b563941299..f06ff67408f 100755 --- a/tests/qemu-iotests/036 +++ b/tests/qemu-iotests/036 @@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 _supported_proto file -_supported_os Linux # Only qcow2v3 and later supports feature bits IMGOPTS="compat=1.1" diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 index 0781bebefe6..819a2a52d2f 100755 --- a/tests/qemu-iotests/037 +++ b/tests/qemu-iotests/037 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow qcow2 vmdk qed _supported_proto file -_supported_os Linux _unsupported_imgopts "subformat=monolithicFlat" \ "subformat=twoGbMaxExtentFlat" \ "subformat=twoGbMaxExtentSparse" diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 index a9a7fc30412..0e85b356b76 100755 --- a/tests/qemu-iotests/042 +++ b/tests/qemu-iotests/042 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 qed _supported_proto file -_supported_os Linux echo echo "== Creating zero size image ==" diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 index 9894b154ecb..67cc7e74c2d 100755 --- a/tests/qemu-iotests/043 +++ b/tests/qemu-iotests/043 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting backing files _supported_fmt qcow2 qed _supported_proto file -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 index 95160bea4c2..543355c64f4 100755 --- a/tests/qemu-iotests/046 +++ b/tests/qemu-iotests/046 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux CLUSTER_SIZE=64k size=128M diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047 index ce81fc6fa78..4528465fb02 100755 --- a/tests/qemu-iotests/047 +++ b/tests/qemu-iotests/047 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 index bc09cd67179..c100d30ed07 100755 --- a/tests/qemu-iotests/049 +++ b/tests/qemu-iotests/049 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux filter_test_dir() { diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 index dd7b2c72eb2..211fc00797d 100755 --- a/tests/qemu-iotests/050 +++ b/tests/qemu-iotests/050 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 qed _supported_proto file -_supported_os Linux if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then IMGOPTS=compat=1.1 diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 02ac960da43..a3deb1fcadb 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux # A compat=0.10 image is created in this test which does not support anything # other than refcount_bits=16 _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 index b3a2dc11432..6e2ecbfe214 100755 --- a/tests/qemu-iotests/052 +++ b/tests/qemu-iotests/052 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file -_supported_os Linux # Don't do O_DIRECT on tmpfs _supported_cache_modes "writeback" "writethrough" "unsafe" diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 index 50c62f0f563..e82bb698814 100755 --- a/tests/qemu-iotests/053 +++ b/tests/qemu-iotests/053 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 qcow _supported_proto file -_supported_os Linux echo echo "== Creating single sector image ==" diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054 index 0d5e14f8474..a8905b60d0e 100755 --- a/tests/qemu-iotests/054 +++ b/tests/qemu-iotests/054 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux echo echo "creating too large image (1 EB)" diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 index ed7400fed2d..d5f818fcce1 100755 --- a/tests/qemu-iotests/062 +++ b/tests/qemu-iotests/062 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This tests qocw2-specific low-level functionality _supported_fmt qcow2 _supported_proto generic -_supported_os Linux IMGOPTS="compat=1.1" IMG_SIZE=64M diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index 2d5c0ce9fb4..fe4892e4679 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow qcow2 vmdk qed raw _supported_proto file -_supported_os Linux _unsupported_imgopts "subformat=monolithicFlat" \ "subformat=twoGbMaxExtentFlat" \ "subformat=twoGbMaxExtentSparse" diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 index f480986e352..28f8c98412c 100755 --- a/tests/qemu-iotests/066 +++ b/tests/qemu-iotests/066 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This tests qocw2-specific low-level functionality _supported_fmt qcow2 _supported_proto generic -_supported_os Linux # Intentionally create an unaligned image IMGOPTS="compat=1.1" diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index fda16a6b0d7..926c79b37c4 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -32,7 +32,6 @@ status=1 # failure is the default! _supported_fmt qcow2 _supported_proto file -_supported_os Linux # Because anything other than 16 would change the output of query-block _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index 881a022107d..22f5ca3ba66 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This tests qocw2-specific low-level functionality _supported_fmt qcow2 _supported_proto generic -_supported_os Linux IMGOPTS="compat=1.1" IMG_SIZE=128K diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069 index 6a8e4aa22ed..3974714852d 100755 --- a/tests/qemu-iotests/069 +++ b/tests/qemu-iotests/069 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qed qcow qcow2 vmdk _supported_proto file -_supported_os Linux _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" IMG_SIZE=128K diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 index 7f3e5abd570..1cca9233d09 100755 --- a/tests/qemu-iotests/071 +++ b/tests/qemu-iotests/071 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux do_run_qemu() { diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 index 6f9f247fa57..661b36da2da 100755 --- a/tests/qemu-iotests/072 +++ b/tests/qemu-iotests/072 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow _supported_proto file -_supported_os Linux IMG_SIZE=64M diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 index 990f90acbd7..e684b1b780f 100755 --- a/tests/qemu-iotests/073 +++ b/tests/qemu-iotests/073 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic _unsupported_proto vxhs -_supported_os Linux CLUSTER_SIZE=64k size=128M diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index 1b6594ebefe..81f0c21f530 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file nfs -_supported_os Linux echo "=== Check option preallocation and cluster_size ===" echo diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index 278511dba49..bbbdf555dcb 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file nfs -_supported_os Linux run_qemu_img() { diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 68cb6659878..d40fdab5421 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -56,7 +56,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux # ${1}: unique identifier for the snapshot filename diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index 66099549084..ad029f1f099 100755 --- a/tests/qemu-iotests/089 +++ b/tests/qemu-iotests/089 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux # Because anything other than 16 would change the output of qemu_io -c info _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 index 193bae7d773..9f8cfbb80f3 100755 --- a/tests/qemu-iotests/090 +++ b/tests/qemu-iotests/090 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file nfs -_supported_os Linux IMG_SIZE=128K diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 index 0bcca772611..9343e09492f 100755 --- a/tests/qemu-iotests/094 +++ b/tests/qemu-iotests/094 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto nbd -_supported_os Linux _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" _make_test_img 64M diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 index 18505b7181a..58fe174b5ed 100755 --- a/tests/qemu-iotests/095 +++ b/tests/qemu-iotests/095 @@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux size_smaller=5M size_larger=100M diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 index 461144c831f..1c1d1c468f8 100755 --- a/tests/qemu-iotests/098 +++ b/tests/qemu-iotests/098 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux IMGOPTS="compat=1.1" diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102 index cedd2b25dcf..749ff66b8ad 100755 --- a/tests/qemu-iotests/102 +++ b/tests/qemu-iotests/102 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux IMG_SIZE=64K diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 index 6773e94d9fa..554b9de0547 100755 --- a/tests/qemu-iotests/103 +++ b/tests/qemu-iotests/103 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file nfs -_supported_os Linux # Internal snapshots are (currently) impossible with refcount_bits=1 _unsupported_imgopts 'refcount_bits=1[^0-9]' diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104 index 390167bad40..c70f28a9a1c 100755 --- a/tests/qemu-iotests/104 +++ b/tests/qemu-iotests/104 @@ -34,7 +34,6 @@ trap "exit \$status" 0 1 2 3 15 _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx _supported_proto generic -_supported_os Linux echo "=== Check qemu-img info output ===" echo diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 index 3b5a5968440..3346e8cb254 100755 --- a/tests/qemu-iotests/105 +++ b/tests/qemu-iotests/105 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 vmdk vhdx qed _supported_proto generic -_supported_os Linux _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \ "subformat=twoGbMaxExtentSparse" diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107 index fcd5a24dfe6..268ba276889 100755 --- a/tests/qemu-iotests/107 +++ b/tests/qemu-iotests/107 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file nfs -_supported_os Linux IMG_SIZE=64K diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 index fad672c1aea..4318341ac59 100755 --- a/tests/qemu-iotests/110 +++ b/tests/qemu-iotests/110 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting backing files _supported_fmt qed qcow qcow2 vmdk _supported_proto file -_supported_os Linux _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" TEST_IMG_REL=$(basename "$TEST_IMG") diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111 index 57395be64cb..490a5bbcb53 100755 --- a/tests/qemu-iotests/111 +++ b/tests/qemu-iotests/111 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qed qcow qcow2 vmdk _supported_proto file -_supported_os Linux _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" $QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \ diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 index 6d81c75a9c9..706c10b6006 100755 --- a/tests/qemu-iotests/112 +++ b/tests/qemu-iotests/112 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 _supported_proto file -_supported_os Linux # This test will set refcount_bits on its own which would conflict with the # manual setting; compat will be overridden as well _unsupported_imgopts refcount_bits 'compat=0.10' diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index f36b88f3f3c..f90a744fc09 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic _unsupported_proto vxhs -_supported_os Linux TEST_IMG="$TEST_IMG.base" _make_test_img 64M diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115 index 7ed347010f5..9ed3cb6a83d 100755 --- a/tests/qemu-iotests/115 +++ b/tests/qemu-iotests/115 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux # This test relies on refcounts being 64 bits wide (which does not work with # compat=0.10) _unsupported_imgopts 'refcount_bits=\([^6]\|.\([^4]\|$\)\)' 'compat=0.10' diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117 index 0af0f31c5aa..f37b34f8b1e 100755 --- a/tests/qemu-iotests/117 +++ b/tests/qemu-iotests/117 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux _make_test_img 64k diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 index ca95b9276ea..e9b4fbb0095 100755 --- a/tests/qemu-iotests/120 +++ b/tests/qemu-iotests/120 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file -_supported_os Linux _unsupported_fmt luks _make_test_img 64M diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125 index 212dcd8f0d5..dc4b8f5fb99 100755 --- a/tests/qemu-iotests/125 +++ b/tests/qemu-iotests/125 @@ -44,7 +44,6 @@ get_image_size_on_host() _supported_fmt qcow2 _supported_proto file -_supported_os Linux if [ -z "$TEST_IMG_FILE" ]; then TEST_IMG_FILE=$TEST_IMG diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126 index 96dc048d592..580fae5d62c 100755 --- a/tests/qemu-iotests/126 +++ b/tests/qemu-iotests/126 @@ -37,7 +37,6 @@ _supported_fmt qcow qcow2 qed vmdk # colons which separate a protocol prefix from the rest and colons which are # just part of the filename, so we cannot test protocols which require a prefix) _supported_proto file -_supported_os Linux echo echo '=== Testing plain files ===' diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 index 3e941f74d4f..b64926ab316 100755 --- a/tests/qemu-iotests/127 +++ b/tests/qemu-iotests/127 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux IMG_SIZE=64K diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133 index 1f6056d1449..6f7cacc0910 100755 --- a/tests/qemu-iotests/133 +++ b/tests/qemu-iotests/133 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux TEST_IMG="$TEST_IMG.base" _make_test_img 64M _make_test_img -b "$TEST_IMG.base" diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index e9e3e84c2ab..141a2eaa7eb 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow qcow2 _supported_proto generic _unsupported_proto vxhs -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index d9b98cf60a5..6b62271876e 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux # We test all cache modes anyway, but O_DIRECT needs to be supported _default_cache_mode none diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 index c223867cb3c..92249ac8dad 100755 --- a/tests/qemu-iotests/143 +++ b/tests/qemu-iotests/143 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux keep_stderr=y \ _launch_qemu 2> >(_filter_nbd) diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 index 15157f33d77..011ed4f2bc1 100755 --- a/tests/qemu-iotests/144 +++ b/tests/qemu-iotests/144 @@ -46,7 +46,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux size=512M diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 index 28878dc8a1b..94275496514 100755 --- a/tests/qemu-iotests/145 +++ b/tests/qemu-iotests/145 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto generic -_supported_os Linux _make_test_img 1M diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 index 08ad8a67301..c969a1a16ff 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 @@ -62,7 +62,6 @@ _check_ofd || _notrun "OFD lock not available" _supported_fmt qcow2 _supported_proto file -_supported_os Linux _run_cmd() { diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 index 8d134029c6e..2ffa3ca942a 100755 --- a/tests/qemu-iotests/156 +++ b/tests/qemu-iotests/156 @@ -49,7 +49,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 qed _supported_proto generic _unsupported_proto vxhs -_supported_os Linux # Create source disk TEST_IMG="$TEST_IMG.backing" _make_test_img 1M diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157 index 69b25cab303..7cbac380999 100755 --- a/tests/qemu-iotests/157 +++ b/tests/qemu-iotests/157 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file -_supported_os Linux do_run_qemu() { diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index 8c0928a7f95..ba4db6116ac 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow qcow2 _supported_proto generic _unsupported_proto vxhs -_supported_os Linux size=128M diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159 index 29066eebde8..2557140ac26 100755 --- a/tests/qemu-iotests/159 +++ b/tests/qemu-iotests/159 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file -_supported_os Linux _unsupported_fmt luks TEST_SIZES="5 512 1024 1999 1K 64K 1M" diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162 index 2e9947fd9ab..4e5ed74fd58 100755 --- a/tests/qemu-iotests/162 +++ b/tests/qemu-iotests/162 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt generic -_supported_os Linux test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh\( \|$\)') [ "$test_ssh" = "" ] && _notrun "ssh support required" diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170 index 7deb7563c97..05dd6ed6c36 100755 --- a/tests/qemu-iotests/170 +++ b/tests/qemu-iotests/170 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file -_supported_os Linux _unsupported_fmt luks echo diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 index 47036a5564f..9e2fa2e73cb 100755 --- a/tests/qemu-iotests/173 +++ b/tests/qemu-iotests/173 @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto nfs -_supported_os Linux size=100M diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index 38959bf276a..3a90ebfbfd6 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux size=32M diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index 93b7bd798ae..fbe5a99bebd 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 raw qed quorum _supported_proto file -_supported_os Linux size=64M _make_test_img $size diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index 5dd2177b893..7e7d45babc2 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then _notrun "Requires a PC machine" diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 index a45addde09a..2fcef9e2bd2 100755 --- a/tests/qemu-iotests/187 +++ b/tests/qemu-iotests/187 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux size=64M _make_test_img $size diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 index e1c1d407f08..eb766ad09f4 100755 --- a/tests/qemu-iotests/190 +++ b/tests/qemu-iotests/190 @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # See 178 for more extensive tests across more formats _supported_fmt qcow2 _supported_proto file -_supported_os Linux echo "== Huge file ==" echo diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 index 1ea908ce3d6..528022e8d81 100755 --- a/tests/qemu-iotests/191 +++ b/tests/qemu-iotests/191 @@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux size=64M diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index 158086f9d2c..84d1ed7cfa7 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file -_supported_os Linux if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then _notrun "Requires a PC machine" diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 index bd1b71ae5ee..ef7b9a94e29 100755 --- a/tests/qemu-iotests/195 +++ b/tests/qemu-iotests/195 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux do_run_qemu() { diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 index 2c664793f41..383d7d7f616 100755 --- a/tests/qemu-iotests/197 +++ b/tests/qemu-iotests/197 @@ -51,7 +51,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Test is supported for any backing file; but we force qcow2 for our wrapper. _supported_fmt generic _supported_proto generic -_supported_os Linux # LUKS support may be possible, but it complicates things. _unsupported_fmt luks diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 index 1c0f8cafc2f..72d431f2517 100755 --- a/tests/qemu-iotests/200 +++ b/tests/qemu-iotests/200 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 qed _supported_proto file -_supported_os Linux BACKING_IMG="${TEST_DIR}/backing.img" TEST_IMG="${TEST_DIR}/test.img" diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 index c1a452ff9a1..21ec8a2ad83 100755 --- a/tests/qemu-iotests/214 +++ b/tests/qemu-iotests/214 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file -_supported_os Linux # Repairing the corrupted image requires qemu-img check to store a # refcount up to 3, which requires at least two refcount bits. diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215 index 7b063d7cfa7..958c14f5a07 100755 --- a/tests/qemu-iotests/215 +++ b/tests/qemu-iotests/215 @@ -48,7 +48,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Test is supported for any backing file; but we force qcow2 for our wrapper. _supported_fmt generic _supported_proto generic -_supported_os Linux # LUKS support may be possible, but it complicates things. _unsupported_fmt luks diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217 index f5482bb6694..58a78a6098a 100755 --- a/tests/qemu-iotests/217 +++ b/tests/qemu-iotests/217 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This test is specific to qcow2 _supported_fmt qcow2 _supported_proto file -_supported_os Linux # This test needs clusters with at least a refcount of 2 so that # OFLAG_COPIED is not set. refcount_bits=1 is therefore unsupported. diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227 index 10cf144eb05..bdd727a721b 100755 --- a/tests/qemu-iotests/227 +++ b/tests/qemu-iotests/227 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file -_supported_os Linux do_run_qemu() { diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231 index 5b2cbab9ace..c0b053ac30a 100755 --- a/tests/qemu-iotests/231 +++ b/tests/qemu-iotests/231 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto rbd -_supported_os Linux BOGUS_CONF=${TEST_DIR}/ceph-$$.conf touch "${BOGUS_CONF}" diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233 index 41b4d465606..057cad20446 100755 --- a/tests/qemu-iotests/233 +++ b/tests/qemu-iotests/233 @@ -47,7 +47,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt raw qcow2 _supported_proto file # If porting to non-Linux, consider using socat instead of ss in common.nbd -_supported_os Linux _require_command QEMU_NBD nbd_server_set_tcp_port diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240 index d3e663ed65c..b4cf95096db 100755 --- a/tests/qemu-iotests/240 +++ b/tests/qemu-iotests/240 @@ -33,7 +33,6 @@ status=1 # failure is the default! _supported_fmt generic _supported_proto generic -_supported_os Linux do_run_qemu() { diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247 index fc50eb5dc1a..546a794d3d4 100755 --- a/tests/qemu-iotests/247 +++ b/tests/qemu-iotests/247 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Requires backing files and .bdrv_change_backing_file support _supported_fmt qcow2 qed _supported_proto file -_supported_os Linux size=128M From patchwork Thu May 9 16:59:09 2019 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: 163744 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1269916ilr; Thu, 9 May 2019 10:27:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzkFnkTaSxG/xWUEzB6d6KZZT5T9TkV0fjfyry1byYa9E25DYDNeSTuwhWH+t+HtI2zNTLf X-Received: by 2002:adf:e288:: with SMTP id v8mr3975949wri.7.1557422855746; Thu, 09 May 2019 10:27:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422855; cv=none; d=google.com; s=arc-20160816; b=yMVHssXq4Ux1bXzZdruc38CfulHRXFmC81E5RSzfTDgk7rYwTMtiXC+NDB9aPZ/Su/ r8eGAp964ga5b3cVockzzCgAjzwz/HJlTKciHpg77hWeHdWetI9lBwoTjLzF8/y7g4HH pA30VcXTtD7O8qLUKI2E4fETUMyG8WDgiIJ9sOGBkY5oh+peloi19BjQWIKZYU8MN/wd nCGV3FwdoETnH0adg4tppRbt12/hXLIu3U+JXfc+zXPomME6kJkjVGBBD/I2au0D9DmH iDekB39ZL98eV140s6vJL9krfH7hzYeMH9O2mIe0NN1rHfZ3fgLnRFVTd9tE/qiSVu+u aZVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=8ol/ZSthiboP03wvr8SO5iIpNkd7gS0i+AC1zoN5TmQ=; b=bPzp7tnT34GCjG4ub1ybm7TpOLInfH8zIiQPeYy4vxpBrLjdgINEPfApZnbGd6VnDD mmYKf2wlnSYxLmnh/zLzc1aO5hFug+jBcpsMHd9FZlivOV/6zcAYAR3vaPg/qJqEw6q5 ajZl2wX+RapGGbS8e+MSioPrkXR/3ejuqeqvfp8GilSaCYIO64c20kyv1J0bJBV2D/ap czi3QNDTls8a2vDJdugZeNb4YXC8sbZP4PB18C1M1a5mr5VybCcOCls3VFvle6Friv1B zoVMklZYMhxxSEYmav/fY0j/k8wkumDfAG6gLRoNfJaCaDIAuAzgB9vIROgufykkScES oVyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Nk19BUP0; 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=fail (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 l15si2298671wrg.383.2019.05.09.10.27.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:27:35 -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=fail header.i=@linaro.org header.s=google header.b=Nk19BUP0; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmpS-000668-Mq for patch@linaro.org; Thu, 09 May 2019 13:27:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmU7-0003og-33 for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmU4-0008BU-BJ for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:31 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:45116) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmU3-000871-Vb for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:28 -0400 Received: by mail-wr1-x436.google.com with SMTP id s15so4034251wra.12 for ; Thu, 09 May 2019 10:05:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8ol/ZSthiboP03wvr8SO5iIpNkd7gS0i+AC1zoN5TmQ=; b=Nk19BUP0L7SaFaGcuyxYBnf8oXp/3eXVkmDBjN16RoEe3LGHuDtcTNij95aiCFR/2l 6XAVoBf10fWNUMiC7oauoi0c4JxmmJxnMWjeabYmtsrJnxIjq90Q47fM2LdYVy+yH5Mn nxNF27lWx5CmxxZOaEnV+d35FZSzlfbstuDnQFB/y70zj4RSssWUnbZUJSyRDqwkrTs1 ezYFtVYq7c1EUa0HkLZX3nqBvuiHZtE90vEridxUqjWGr2GmLMf/eqkTPp5V++sg6XNa teH8zlkdBdxzYxefplciAvhIzTs37ndJ1yVNzZSoInfDeBnG46d6IpxGyZBcID1Zdhls j5Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8ol/ZSthiboP03wvr8SO5iIpNkd7gS0i+AC1zoN5TmQ=; b=fnRoGgZLiKFADZM+58Uh8MHTsDiLNvsmm0Tr8De2LP8qrCimPZnq056VfXVfOaXC6s 6oPVnn8Io9BhTxFuXajRcKyInfwgxQ/Y4g5IFfHRiD+Wfkp5DLajZRJSeX42bK+uqAOA GQfiaTEU8sPEwmOPb8RHzVPWQSTTkK094JhIUV4llPTCMGqssgrMkhM/R4nuujGW2zI8 Er60+dxdoFUi/oVfYaIDu/n5t9oFsfcBr8o5aEvk65ENMVmpCwnZmK+Tl6ykflv8blKA OjSp85mKBueMdaQyZsKtnmPS1tatJD3dQcebWfExq9IyvZoFG9gUeV3pjX1mptGOLK6W j/6Q== X-Gm-Message-State: APjAAAWiNiMAL3zlgihkqB5TIPptnFW2BZc+VZjkhP0SzWVPM6L1qDVn Nv/r6nHGXJl3eQwrb5Go9+sFZA== X-Received: by 2002:a5d:548a:: with SMTP id h10mr3916557wrv.56.1557421522404; Thu, 09 May 2019 10:05:22 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c11sm2703204wrs.86.2019.05.09.10.05.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 10:05:20 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 62B2C1FFA9; Thu, 9 May 2019 17:59:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:09 +0100 Message-Id: <20190509165912.10512-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PATCH v1 21/23] tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , "open list:Block layer core" , Max Reitz , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Currently, all tests are in the "auto" group. This is a little bit pointless. OTOH, we need a group for the tests that we can automatically run during "make check" each time, too. Tests in this new group are supposed to run with every possible QEMU configuration, for example they must run with every QEMU binary (also non-x86), without failing when an optional features is missing (but reporting "skip" is ok), and be able to run on all kind of host filesystems and users (i.e. also as "nobody" or "root"). So let's use the "auto" group for this class of tests now. The initial list has been determined by running the iotests with non-x86 QEMU targets and with our CI pipelines on Gitlab, Cirrus-CI and Travis (i.e. including macOS and FreeBSD). Signed-off-by: Thomas Huth Message-Id: <20190502084506.8009-7-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/qemu-iotests/group | 177 +++++++++++++++++++++------------------ 1 file changed, 95 insertions(+), 82 deletions(-) -- 2.20.1 diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 7ac9a5ea4a7..a8ca5fd7823 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -1,8 +1,21 @@ # # QA groups control file # Defines test groups +# +# Some notes about the groups: +# # - do not start group names with a digit # +# - quick : Tests in this group should finish within some few seconds. +# +# - img : Tests in this group can be used to excercise the qemu-img tool. +# +# - auto : Tests in this group are used during "make check" and should be +# runnable in any case. That means they should run with every QEMU binary +# (also non-x86), with every QEMU configuration (i.e. must not fail if +# an optional feature is not compiled in - but reporting a "skip" is ok), +# and work all kind of host filesystems and users (e.g. "nobody" or "root"). +# # # test-group association ... one line per test @@ -32,11 +45,11 @@ 023 rw auto 024 rw backing auto quick 025 rw auto quick -026 rw blkdbg auto +026 rw blkdbg 027 rw auto quick -028 rw backing auto quick +028 rw backing quick 029 rw auto quick -030 rw auto backing +030 rw backing 031 rw auto quick 032 rw auto quick 033 rw auto quick @@ -46,35 +59,35 @@ 037 rw auto backing quick 038 rw auto backing quick 039 rw auto quick -040 rw auto -041 rw auto backing +040 rw +041 rw backing 042 rw auto quick 043 rw auto backing -044 rw auto -045 rw auto quick +044 rw +045 rw quick 046 rw auto aio quick 047 rw auto quick 048 img auto quick 049 rw auto 050 rw auto backing quick -051 rw auto +051 rw 052 rw auto backing quick 053 rw auto quick 054 rw auto quick -055 rw auto -056 rw auto backing -057 rw auto -058 rw auto quick +055 rw +056 rw backing +057 rw +058 rw quick 059 rw auto quick 060 rw auto quick 061 rw auto 062 rw auto quick 063 rw auto quick 064 rw auto quick -065 rw auto quick +065 rw quick 066 rw auto quick -067 rw auto quick -068 rw auto quick +067 rw quick +068 rw quick 069 rw auto quick 070 rw auto quick 071 rw auto quick @@ -91,18 +104,18 @@ 082 rw auto quick 083 rw auto 084 img auto quick -085 rw auto +085 rw 086 rw auto quick -087 rw auto quick +087 rw quick 088 rw auto quick 089 rw auto quick 090 rw auto quick 091 rw auto migration 092 rw auto quick -093 auto +093 throttle 094 rw auto quick -095 rw auto quick -096 rw auto quick +095 rw quick +096 rw quick 097 rw auto backing 098 rw auto backing quick 099 rw auto quick @@ -118,60 +131,60 @@ 109 rw auto 110 rw auto backing quick 111 rw auto quick -112 rw auto +112 rw 113 rw auto quick 114 rw auto quick -115 rw auto +115 rw 116 rw auto quick 117 rw auto -118 rw auto +118 rw 119 rw auto quick 120 rw auto quick -121 rw auto +121 rw 122 rw auto 123 rw auto quick -124 rw auto backing -125 rw auto +124 rw backing +125 rw 126 rw auto backing -127 rw auto backing quick +127 rw backing quick 128 rw auto quick -129 rw auto quick +129 rw quick 130 rw auto quick 131 rw auto quick -132 rw auto quick +132 rw quick 133 auto quick 134 rw auto quick 135 rw auto -136 rw auto +136 rw 137 rw auto 138 rw auto quick -139 rw auto quick +139 rw quick 140 rw auto quick 141 rw auto quick 142 auto 143 auto quick -144 rw auto quick -145 auto quick +144 rw quick +145 quick 146 auto quick -147 auto -148 rw auto quick -149 rw auto sudo +147 img +148 rw quick +149 rw sudo 150 rw auto quick -151 rw auto -152 rw auto quick -153 rw auto quick +151 rw +152 rw quick +153 rw quick 154 rw auto backing quick -155 rw auto +155 rw 156 rw auto quick -157 auto +157 quick 158 rw auto quick 159 rw auto quick 160 rw auto quick 161 rw auto quick -162 auto quick -163 rw auto -165 rw auto quick -169 rw auto quick migration +162 quick +163 rw +165 rw quick +169 rw quick migration 170 rw auto quick 171 rw auto quick 172 auto @@ -180,72 +193,72 @@ 175 auto quick 176 rw auto backing 177 rw auto quick -178 auto +178 img 179 rw auto quick 181 rw auto migration -182 rw auto quick -183 rw auto migration +182 rw quick +183 rw migration 184 rw auto quick -185 rw auto +185 rw 186 rw auto 187 rw auto -188 rw auto quick -189 rw auto +188 rw quick +189 rw 190 rw auto quick 191 rw auto 192 rw auto quick -194 rw auto migration quick +194 rw migration quick 195 rw auto quick -196 rw auto quick migration +196 rw quick migration 197 rw auto quick -198 rw auto -199 rw auto migration -200 rw auto +198 rw +199 rw migration +200 rw 201 rw auto migration -202 rw auto quick -203 rw auto migration -204 rw auto quick -205 rw auto quick -206 rw auto +202 rw quick +203 rw migration +204 rw quick +205 rw quick +206 rw 207 rw auto -208 rw auto quick -209 rw auto quick +208 rw quick +209 rw quick 210 rw auto 211 rw auto quick 212 rw auto quick 213 rw auto quick 214 rw auto 215 rw auto quick -216 rw auto quick +216 rw quick 217 rw auto quick -218 rw auto quick -219 rw auto +218 rw quick +219 rw 220 rw auto 221 rw auto quick -222 rw auto quick -223 rw auto quick -224 rw auto quick +222 rw quick +223 rw quick +224 rw quick 225 rw auto quick 226 auto quick -227 auto quick -228 rw auto quick +227 quick +228 rw quick 229 auto quick 231 auto quick -232 auto quick +232 quick 233 auto quick -234 auto quick migration -235 auto quick -236 auto quick +234 quick migration +235 quick +236 quick 237 rw auto quick -238 auto quick +238 quick 239 rw auto quick -240 auto quick +240 quick 241 rw auto quick -242 rw auto quick +242 rw quick 243 rw auto quick 244 rw auto quick -245 rw auto -246 rw auto quick -247 rw auto quick -248 rw auto quick +245 rw +246 rw quick +247 rw quick +248 rw quick 249 rw auto quick From patchwork Thu May 9 16:59:10 2019 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: 163735 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1255222ilr; Thu, 9 May 2019 10:14:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwdQ8MgS373PvRXNPiJQZvMVFMBtA97UtcrNgxIUdBdc+fgxtwwOeytTdLh/vYY4YqwwqOu X-Received: by 2002:a1c:4107:: with SMTP id o7mr1117327wma.122.1557422080851; Thu, 09 May 2019 10:14:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422080; cv=none; d=google.com; s=arc-20160816; b=MoUHO6yCWSDxPBpeeYSB5W78cU0dbCv6ViLUHcNxzcaQ+tGq2Zw7YlgqI6XTjxxVQR MxDVg0jMy75tHOHN08rqRhgn3obht87eZeXCtMD3fZL2/OtqnzoXr9Bq59bi8zdG7JlY foELsSpzylv7TVsJh8xTY+6/lsHKIxD94yo2NevyP+TultIN13yv3QdA8VEGnjUBTpZY EqcK70QKQ/Dw4h1rHCJR6s0ClFGnEBLVuDZEgMZf7XDPKcrKmxa262mwG/d6tAbVAYeY 6hWEVIht1GSXDhXG8b8V5KX3nGZ7YCVlzwgdiWdOm0nRrPHfqFDMq4zAenHCfYFFW/V7 5bdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=NyUW/7CxiSp6jwDVSTGWLwGt+wdiAqLsvRe2mSONQKQ=; b=FdrcovRZfhEl5pzqCi0XK2IgA1/RJGZAGDseXwNb2V2Jxuo6V6gcjuyU5CJdHzKWMK TDVJiGkO1H6XtN8ub4ILD3QkM1e2cGkV5SsdHzmw0mWkUqGpGm8jXbyLAHxVohEV2WpY Zq4/Qa241Lr0W8Z2RAaQdgi+lexnhJ0EDuFK3yDatRMSvJ3zmbkExF35L0GfG4BcCVHt ZXLSLLPCowffKPHVXqW+f/rYUgkz11QU/puETtcnsEG3HvNMgdkp+8fGDjs3YUxO8EnU VnHrHb/nsJI3kuShW7bE5iXNvAla3HvwFchJwY0lZ10bNe7ze99JYLUf6h0ZOvZVqVeY QvHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TCrgSVj4; 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=fail (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 h16si2196185wrv.42.2019.05.09.10.14.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:14:40 -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=fail header.i=@linaro.org header.s=google header.b=TCrgSVj4; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmcx-0003Zh-K9 for patch@linaro.org; Thu, 09 May 2019 13:14:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmU7-0003pe-UV for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmU4-0008CP-Is for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:31 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38128) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmU4-0008AD-7O for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:28 -0400 Received: by mail-wr1-x442.google.com with SMTP id v11so4086515wru.5 for ; Thu, 09 May 2019 10:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NyUW/7CxiSp6jwDVSTGWLwGt+wdiAqLsvRe2mSONQKQ=; b=TCrgSVj4xaqozMJwhSkjbqNcAV00aNyULMNVD5h1c5ObOVmPHD5e6Tw99DtByfgPYC kkbqTIYimfHfpnEeDuAhl7cfhA/JFD9P71R37F/yucS5Vopuqe72U3P9/VW9nndC6qO+ 5lpSwMJVvDs9TQMvZpPri8HVD9bQBceINllj7FeGF+9c+Z+TYCvb7tpf/Otf6kuuRwPl F5Bo9oc5fw6zJyarxVdftOP4ID+uNaVFdHH8XyJLA8sNIHIjZx7rd5T67/sUlhjCBQVy 8zlDwfmEgvOQyMH7exn+101XoXTSGzZl9HwA6FnzO3r3zgXtSwiuopwMZQsWEcBTbBlP Tv7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NyUW/7CxiSp6jwDVSTGWLwGt+wdiAqLsvRe2mSONQKQ=; b=DlG+AVi28He1FKfxFQgPMIntEaJ0bmyeTOJ6msXwTPEa9h9xRWYDLnAG0YoZVHKfQb 70suvnWGih5jYXAIL2sEry26jlI3sXQ5Q57xho8l38GJqSWjHf02no6C6nLe9oB8i9ei LBlOd/4rnHTqfRoN1/46fm8X6ovT02qGg+dx+DqxNzfxYPbT+wFeACVpvI4LFVx+Dt93 j1/vlRT8r7Zw/PTmN9uWilL8v7K4qAsJ454FDFrU74bvSJihnIVXsNFET4hMipkI+BUq XwTssX/xCCgtpBc8Oa3QTO2mVmkm0JD3puMGAB7be3c7khDx9rcS7jQZZo5aS+ANU+jO MU6Q== X-Gm-Message-State: APjAAAUPPWSOcfPrlvC+6hpe3F8ORwRsF+37zx5NMq5ehEVX8pOrPLwO ylaMeFgINKX5fz+fJz3RmMM3kQ== X-Received: by 2002:adf:e8c4:: with SMTP id k4mr4265412wrn.9.1557421526830; Thu, 09 May 2019 10:05:26 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b2sm3085172wrt.20.2019.05.09.10.05.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 10:05:23 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 77E941FFAA; Thu, 9 May 2019 17:59:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:10 +0100 Message-Id: <20190509165912.10512-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v1 22/23] tests/qemu-iotests: re-format output to for make check-block X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-arm@nongnu.org, =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This attempts to clean-up the output to better match the output of the rest of the QEMU check system. This includes: - formatting as " TEST iotest: nnn" - calculating time diff at the end - only dumping config on failure Signed-off-by: Alex Bennée Message-Id: <20190503143904.31211-1-alex.bennee@linaro.org> --- tests/qemu-iotests/check | 101 +++++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 40 deletions(-) -- 2.20.1 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 922c5d1d3d3..fb239967a32 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -27,6 +27,7 @@ bad="" notrun="" casenotrun="" interrupt=true +pretty=false # by default don't output timestamps timestamp=${TIMESTAMP:=false} @@ -88,6 +89,22 @@ _full_platform_details() echo "$os/$platform $host $kernel" } +_full_env_details() +{ + cat </dev/null 2>&1 && diff=xxdiff fi ;; - + -pretty) # pretty print output + pretty=true + xpand=false + ;; -n) # show me, don't do it showme=true xpand=false @@ -633,12 +654,6 @@ _wallclock() date "+%H %M %S" | awk '{ print $1*3600 + $2*60 + $3 }' } -_timestamp() -{ - now=$(date "+%T") - printf %s " [$now]" -} - _wrapup() { if $showme @@ -704,23 +719,25 @@ END { if (NR > 0) { trap "_wrapup; exit \$status" 0 1 2 3 15 +# Report the test result, optionally pretty printing the result +# args: sequence, results +_report_test_result() +{ + if $pretty; then + echo " TEST iotest: $1 $2" + else + echo "$1 $2" + fi +} + [ -f $TIMESTAMP_FILE ] || touch $TIMESTAMP_FILE FULL_IMGFMT_DETAILS=$(_full_imgfmt_details) FULL_HOST_DETAILS=$(_full_platform_details) -cat < $TESTS_REMAINING_LOG.tmp mv $TESTS_REMAINING_LOG.tmp $TESTS_REMAINING_LOG @@ -738,7 +757,6 @@ do if $showme then - echo continue elif [ -f expunged ] && $expunge && egrep "^$seq([ ]|\$)" expunged >/dev/null then @@ -753,17 +771,11 @@ do # really going to try and run this one # rm -f $seq.out.bad - lasttime=$(sed -n -e "/^$seq /s/.* //p" <$TIMESTAMP_FILE) - if [ "X$lasttime" != X ]; then - printf %s " ${lasttime}s ..." - else - printf " " # prettier output with timestamps. - fi rm -f core $seq.notrun rm -f $seq.casenotrun start=$(_wallclock) - $timestamp && printf %s " [$(date "+%T")]" + $timestamp && echo -n "$seq [$(date "+%T")] ->" if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python" ]; then run_command="$PYTHON $seq" @@ -781,26 +793,24 @@ do $run_command >$tmp.out 2>&1) fi sts=$? - $timestamp && _timestamp + $timestamp && echo " [$(date "+%T")]" stop=$(_wallclock) if [ -f core ] then - printf " [dumped core]" mv core $seq.core + reason="[dumped core] $seq.core" err=true fi if [ -f $seq.notrun ] then - $timestamp || printf " [not run] " - $timestamp && echo " [not run]" && printf %s " $seq -- " - cat $seq.notrun - notrun="$notrun $seq" + # overwrites timestamp output + results="[not run] $(cat $seq.notrun)" else if [ $sts -ne 0 ] then - printf %s " [failed, exit status $sts]" + reason=$(printf %s "[failed, exit status $sts]") err=true fi @@ -821,22 +831,29 @@ do if [ ! -f "$reference" ] then - echo " - no qualified output" + reason=" - no qualified output" err=true else if diff -w "$reference" $tmp.out >/dev/null 2>&1 then - echo "" if $err then : else - echo "$seq $(expr $stop - $start)" >>$tmp.time + lasttime=$(sed -n -e "/^$seq /s/.* //p" <$TIMESTAMP_FILE) + thistime=$(expr $stop - $start) + echo "$seq $thistime" >>$tmp.time + + if [ "X$lasttime" != X ]; then + results="${results}${thistime}s (last ${lasttime}s)" + else + results="${results}${thistime}s" + fi fi else - echo " - output mismatch (see $seq.out.bad)" mv $tmp.out $seq.out.bad $diff -w "$reference" "$PWD"/$seq.out.bad + reason=" - output mismatch (see $seq.out.bad)" err=true fi fi @@ -852,9 +869,13 @@ do # if $err then + _report_test_result $seq "FAILED $reason" + _full_env_details bad="$bad $seq" n_bad=$(expr $n_bad + 1) quick=false + else + _report_test_result $seq "$results" fi [ -f $seq.notrun ] || try=$(expr $try + 1) From patchwork Thu May 9 16:59:11 2019 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: 163740 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1264050ilr; Thu, 9 May 2019 10:22:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzXmXMKEgVJPbJ3qmXXcPE8UwSV7SL6oAAO6tNGaaKYHs/Uxej8++d20oH1ilnbeind3GCI X-Received: by 2002:a1c:d7:: with SMTP id 206mr4059140wma.69.1557422529203; Thu, 09 May 2019 10:22:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557422529; cv=none; d=google.com; s=arc-20160816; b=b5dvXuwg4hRzneidEujBkjyuEYRe6jBpkMjagvZJysx0WPHFaYi6omyDtSnP2BJDHi coHZCebVoCDaqEn0dGKW37PlzNjjhbZj2j/r0TkXdd5yE1CrY0reZY31Os0swLeV15fW 1tm+kK8hILPTG9cRrdNRT4dKYaooBaNbqqZoAyYvVIpZEb6xTYeKq7e8wUW+NL1ZVokH N6arvBEdtMJc8LGoYAPscilA6N8o0NZUAEwUiye2p6c3V7xY7lt3EeGq/eSIBzbvgOEW 8eA9sap8d4aVtYI10Sw526Rdsqpts92qF8Xx6iaRWq7TEIo87z6ehH+KKX9ZG4+1/NJM gb+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=iHi8P5Y+fYb6nyulM6KxlZkFZ/na7aLikDVfLgDRiak=; b=haHAjPzhHmLWBz7nfSe29F91KPYUqFZqMUtHXdN4b1JSWVoMBQlf8UPtnWKO/EEn61 s6b5wI+kde9BjUjFQV5bcA9+JCDpWlPX3imJlftFKXO8aSAfwW6qAeODkOq9hpv4YO11 TliGHqHMzmFjTfHRfod0xv94JAYS2hpx/+EozUB4eP2RCniFh/M74zsmScSy5YGTePKm dveNHMBF2g+xsdPBDL2owQdIFZmOOrfnMKo9p2RC1Uyj6AKEcB2NP20aSqfWp5U0XR6G BUNlj6e5pO4Eig/7PE7TNnEmFKUwK9t1v5Rvd/iy6Zp88np1QT6mvXB82Ue7WAAE4tAw XiuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=u439D07E; 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=fail (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 y13si2201826wrn.29.2019.05.09.10.22.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:22:09 -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=fail header.i=@linaro.org header.s=google header.b=u439D07E; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmkC-0001mp-2m for patch@linaro.org; Thu, 09 May 2019 13:22:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmU8-0003pq-NZ for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmU4-0008Dd-Ul for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:32 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:55798) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmU4-0008Al-LB for qemu-devel@nongnu.org; Thu, 09 May 2019 13:05:28 -0400 Received: by mail-wm1-x344.google.com with SMTP id y2so4153066wmi.5 for ; Thu, 09 May 2019 10:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iHi8P5Y+fYb6nyulM6KxlZkFZ/na7aLikDVfLgDRiak=; b=u439D07EEYGjhUmMS2JFWYGKjhYT3YoFJ8Wi1NaAAEEDcf4k1etHXHy3TwBIdSGGtb nCRR83cZVx7l82EnlKn11okIMUvrqtUnaOGuVQ+aE+k9Adjc5lHqD9/Je9kE3sYlZa2d 8N9WVA+OTlJ7CnbyeD1URFO13qBtvOTiexAPdSGkAH68bEi9EgRE74C7jezrGrvKQ7+Y iQkYFXngzgG1CXNCgHCx1cUBJm05VRZ8ktF4PODXQkHn/gK+6XHmN2fzE/DOVFrfSB/P 6ZQxLoBUA3gkrEhUHWbmOScs0+FuKuxZcW2lICRiluE3pSHHf9F3Bhw9lP948+dAm9U+ GyRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iHi8P5Y+fYb6nyulM6KxlZkFZ/na7aLikDVfLgDRiak=; b=KrriGnvqfn1dtnmwwB+dA6KeETdZ69cu26Vrr9pE2vZIcTnr7TJgVRqBa46iwDegfL GwAQFfzmKJ+Iohs7NZt2UGF92xxejWVcdqs0qjdJFZLTEFZMAT3dmdrHcPxJPjznQi+F HdKQQdPKrlI4sEvbVj73MG/8q2+GiWdXHvDFp30tQ8EOobIhrGyBcQTLJ9jV53fqPdI+ xuZugBeLmWCGj6BqMC/S2OSyUkC73VIAulE62Z0niOlKk1qQpgloDmlgFDR4Ys6903So pSgOjFkxelZ7dtKyJDkifn6zVb1jzgiEvT+mo21e2AjIRIsELLipFRSu1sVV/AW1R6tp vemA== X-Gm-Message-State: APjAAAXgACQ+ddQ2GiWjU8hrUvfIPesmZEaWzNaU7F6IQgNCD3MuwYZf 4AOk3DQCNSlPFzfIRZDQrl+0dA== X-Received: by 2002:a1c:1d4:: with SMTP id 203mr3954770wmb.76.1557421527426; Thu, 09 May 2019 10:05:27 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p24sm1748448wma.18.2019.05.09.10.05.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 10:05:23 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8F2D71FFAB; Thu, 9 May 2019 17:59:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:11 +0100 Message-Id: <20190509165912.10512-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v1 23/23] tests: Run the iotests during "make check" again X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-arm@nongnu.org, =?utf-8?q?Alex_Be?= =?utf-8?b?bm7DqWU=?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth People often forget to run the iotests before submitting patches or pull requests - this is likely due to the fact that we do not run the tests during our mandatory "make check" tests yet. Now that we've got a proper "auto" group of iotests that should be fine to run in every environment, we can enable the iotests during "make check" again by running the "auto" tests by default from the check-block.sh script. Some cases still need to be checked first, though: iotests need bash and GNU sed (otherwise they fail), and if gprof is enabled, it spoils the output of some test cases causing them to fail. So if we detect that one of the required programs is missing or that gprof is enabled, we still have to skip the iotests to avoid failures. And finally, since we are using check-block.sh now again, this patch also removes the qemu-iotests-quick.sh script since we do not need that anymore (and having two shell wrapper scripts around the block tests seem rather confusing than helpful). Signed-off-by: Thomas Huth Message-Id: <20190502084506.8009-8-thuth@redhat.com> [AJB: add -pretty to check-block.sh] Signed-off-by: Alex Bennée --- tests/Makefile.include | 8 +++---- tests/check-block.sh | 44 ++++++++++++++++++++++++++++--------- tests/qemu-iotests-quick.sh | 8 ------- 3 files changed, 38 insertions(+), 22 deletions(-) delete mode 100755 tests/qemu-iotests-quick.sh -- 2.20.1 diff --git a/tests/Makefile.include b/tests/Makefile.include index 60de085ee1f..e865daaa897 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -140,7 +140,7 @@ check-unit-y += tests/test-uuid$(EXESUF) check-unit-y += tests/ptimer-test$(EXESUF) check-unit-y += tests/test-qapi-util$(EXESUF) -check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh +check-block-$(CONFIG_POSIX) += tests/check-block.sh # All QTests for now are POSIX-only, but the dependencies are # really in libqtest, not in the testcases themselves. @@ -1077,8 +1077,8 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF) -.PHONY: check-tests/qemu-iotests-quick.sh -check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) +.PHONY: check-tests/check-block.sh +check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) $< .PHONY: $(patsubst %, check-%, $(check-qapi-schema-y)) @@ -1152,7 +1152,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-block: $(patsubst %,check-%, $(check-block-y)) -check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree +check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree check-block check-clean: rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y)) diff --git a/tests/check-block.sh b/tests/check-block.sh index f3d12fd602d..9f636feccb2 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -1,24 +1,48 @@ #!/bin/sh -FORMAT_LIST="raw qcow2 qed vmdk vpc" +# Honor the SPEED environment variable, just like we do it for the qtests. +if [ "$SPEED" = "slow" ]; then + format_list="raw qcow2" + group= +elif [ "$SPEED" = "thorough" ]; then + format_list="raw qcow2 qed vmdk vpc" + group= +else + format_list=qcow2 + group="-g auto" +fi + if [ "$#" -ne 0 ]; then - FORMAT_LIST="$@" + format_list="$@" +fi + +if grep -q "TARGET_GPROF=y" *-softmmu/config-target.mak 2>/dev/null ; then + echo "GPROF is enabled ==> Not running the qemu-iotests." + exit 0 fi -export QEMU_PROG="$PWD/x86_64-softmmu/qemu-system-x86_64" -export QEMU_IMG_PROG="$PWD/qemu-img" -export QEMU_IO_PROG="$PWD/qemu-io" +if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then + echo "No qemu-system binary available ==> Not running the qemu-iotests." + exit 0 +fi + +if ! command -v bash >/dev/null 2>&1 ; then + echo "bash not available ==> Not running the qemu-iotests." + exit 0 +fi -if [ ! -x $QEMU_PROG ]; then - echo "'make check-block' requires qemu-system-x86_64" - exit 1 +if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then + if ! command -v gsed >/dev/null 2>&1; then + echo "GNU sed not available ==> Not running the qemu-iotests." + exit 0 + fi fi cd tests/qemu-iotests ret=0 -for FMT in $FORMAT_LIST ; do - ./check -T -nocache -$FMT || ret=1 +for fmt in $format_list ; do + ./check -pretty -$fmt $group || ret=1 done exit $ret diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh deleted file mode 100755 index 0e554bb9724..00000000000 --- a/tests/qemu-iotests-quick.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -cd tests/qemu-iotests - -ret=0 -TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1 - -exit $ret