From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549565695597625.4351075882241; Thu, 7 Feb 2019 10:54:55 -0800 (PST) Received: from localhost ([127.0.0.1]:45311 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groow-0004xY-GH for importer@patchew.org; Thu, 07 Feb 2019 13:54:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYe-0000C1-8I for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYc-0007OV-5S for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:56 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44612) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYY-0007Cu-9z for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:52 -0500 Received: by mail-wr1-x432.google.com with SMTP id v16so910780wrn.11 for ; Thu, 07 Feb 2019 10:37:47 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c202sm32683wmd.40.2019.02.07.10.37.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:45 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A02061FF81; Thu, 7 Feb 2019 18:37:44 +0000 (UTC) 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=tUzSsJORsVt00bRvSbOldCFkduktdRL9TwYw6pBwPUw=; b=kFqZU/NJAeLyGoJhwd2EB7tBxtwhTxLBx+SdTqN5M2rV39+MgNPezLB/QCJGb2UY+G MZV9jXui8nzyfW91kGOK7wj6ZyLhf8lGwjWY7PN7WXZYLB2gCQwDoIEUVeok73uGSkb/ ugi2vn9Zh0tXayDbRsmiFg6NELOXpi+WJMm5X+L3MjGebAtbo8CXmqjLCS4gLlTo3K1e xhabYfCsrO7KOZojt3dwiZqg9/rYBy7/CVJo+0OZ0Av9B1FLzvjdLvQPoXxowzCqcjWt kHBXJFOIVk5QhvlhxO4v/+I6LWpVNkdyiF1XJ/4gnCbADuPCcWyWSqaCWDdz3XdGBi9z WZ1g== 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=tUzSsJORsVt00bRvSbOldCFkduktdRL9TwYw6pBwPUw=; b=nGSG3Mn10IiPDH+GuRuqpvlscLaVT7Gbb7I826GKySc4NmPJTPw4FEAWT2CoWoz37B xU0oQgWcfPG6kqn8eYUqXlFBWbCNaZbW+4q/3kYfgWwv734wwR66mV8Z8Opn7qscfxM1 PeabG8rjSXq4xi+NYbyA9LLRyAqEKW5YDviWUeCuXzz73mLDoiz9WsXTGrCzaM0obJ2J Q1V0WD2jkTwetnQnVERyo2cJI09zLjvonuSAXW+lkEYwFQDf6BKYUVGXTRoTzvmN2dP7 34guhRBpiy3JZgJUzBH+63zqh1Cg2M18goDvRYIVth8/nd7svLW8OO8VLO+5f4fGZAU2 BwVA== X-Gm-Message-State: AHQUAuZwwEwkAKt5rSKLMPhs8UzuulV/nCmru+PdyEtroqqOfbCOXwJw 3qUQTzTs4zLv5CfwH+wdskorwA== X-Google-Smtp-Source: AHgI3IbnU2TlEaLRLp88C+/eimEBAPqLVZqR/f/vXYfL5HLuPN8L7Hx0gRHkptbzoUh3FzPtERHXHQ== X-Received: by 2002:a5d:4a4b:: with SMTP id v11mr1932977wrs.186.1549564665744; Thu, 07 Feb 2019 10:37:45 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:29 +0000 Message-Id: <20190207183744.5054-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 Subject: [Qemu-devel] [PATCH v2 01/16] .cirrus.yml: basic compile and test for 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Ed Maste Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Ed Maste Signed-off-by: Ed Maste Signed-off-by: Alex Benn=C3=A9e --- .cirrus.yml | 16 ++++++++++++++++ MAINTAINERS | 8 ++++++++ 2 files changed, 24 insertions(+) create mode 100644 .cirrus.yml diff --git a/.cirrus.yml b/.cirrus.yml new file mode 100644 index 0000000000..303fe720d6 --- /dev/null +++ b/.cirrus.yml @@ -0,0 +1,16 @@ +freebsd_12_task: + freebsd_instance: + image: freebsd-12-0-release-amd64 + cpu: 8 + memory: 8G + env: + CIRRUS_CLONE_DEPTH: 1 + install_script: pkg install -y + bison curl cyrus-sasl git glib gmake gnutls + nettle perl5 pixman pkgconf png usbredir + script: + - mkdir build + - cd build + - ../configure || { cat config.log; exit 1; } + - gmake -j8 + - gmake -j8 V=3D1 check diff --git a/MAINTAINERS b/MAINTAINERS index 9a76845581..eecfafad56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2475,6 +2475,14 @@ W: https://travis-ci.org/qemu/qemu W: https://app.shippable.com/github/qemu/qemu W: http://patchew.org/QEMU/ =20 +FreeBSD Hosted Continuous Integration +M: Ed Maste +M: Li-Wen Hsu +L: qemu-devel@nongnu.org +S: Maintained +F: .cirrus.yml +W: https://cirrus-ci.com/github/qemu/qemu + Guest Test Compilation Support M: Alex Benn=C3=A9e R: Philippe Mathieu-Daud=C3=A9 --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549565509441290.6738846883326; Thu, 7 Feb 2019 10:51:49 -0800 (PST) Received: from localhost ([127.0.0.1]:45272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grolz-0002cG-8x for importer@patchew.org; Thu, 07 Feb 2019 13:51:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYe-0000Bi-19 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYa-0007Kd-An for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:54 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:44436) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYY-0007FD-6a for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:50 -0500 Received: by mail-wr1-x444.google.com with SMTP id v16so910875wrn.11 for ; Thu, 07 Feb 2019 10:37:48 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x12sm21890909wrt.20.2019.02.07.10.37.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:45 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ABCA01FF82; Thu, 7 Feb 2019 18:37:44 +0000 (UTC) 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=BiAAp9cg9fsS67w904hkKebBnTgG/kt3TjycozlBYgs=; b=HiJskkh8I5y1rLperfdGNlcW0/cqU39y5BZUEM8vI8+NvFDIBAKU7WQVOITPt4Eb26 jqkGYZJyFBCbLh6ATWIhZ0ZL+WsCnPEAEePLbBLBnN/v0AdKKTnv1JGVq5ANkZegnIiK eu5HzSmj6+7DqBE2qDpxJq93rPrYMLBugKWkhTWYa/uC2GeA51FzuBaydOYFLUcRat/N faZxtoZOnaT8ixvLEvX2CRCOmdq4ErnACR0XvJc1+bGqBh22MMSIE33hS4FETAsG7vcJ fkClGMIQbU/6WXeQm/nf/aYhYzabMdNblB4x4yCymNzbwH+FK/PE3vRJG8ACIMm7szGz h7iQ== 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=BiAAp9cg9fsS67w904hkKebBnTgG/kt3TjycozlBYgs=; b=H1mbmvQlo5W21cJNjqF/ZqQPsa4BUbPab89+HHWedZ6V18ytVX6eF5O6+/l4zG+Bx3 w9wha6rLpq2JSUMG5uUzaWQyqKKiTGd+fKJTT0uuNXKeSOY6aVTnXC38TL3IlaNHNOTd lAYCG5uSx6KmBwFnx/TBRZOxcMsTsA6pPUohwuTfqnqTa0c0nbIycc0NFnbZXFskNrJ3 dFfy+1B7L+mklZM5ZBI5h3pf4T9gBhF5CC1piLGrWJgyV19+f0S253m/F/58ROHUz7iR H6FuL5FTg9uNZwoSMnpToHVTHK1bqxqUg5lT81ZsaA+Vq5kByLaKTP0/68h2u5lZcf6n SHUw== X-Gm-Message-State: AHQUAub+XczGc/lZ806apHKK0vii6EwnrpdW1+F+c6xnZrn5rhK9N6kN D2Xh9FnAPJRBqoCI9WBHxGje4A== X-Google-Smtp-Source: AHgI3Ib8SdMOFdpPuGVqizXl/1wz1gqf/CCiWujkQUuRDJYpjFPmK4mrXIMRo5XS0+TNRMcocgffRg== X-Received: by 2002:adf:b3c3:: with SMTP id x3mr13363157wrd.294.1549564667933; Thu, 07 Feb 2019 10:37:47 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:30 +0000 Message-Id: <20190207183744.5054-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 02/16] .travis.yml: stop requesting libffi & gettext from homebrew 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=20Benn=C3=A9e?= , qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The default package set installed on macOS builders from Travis already includes libffi and gettext as shown by log messages: Skipping install of libffi formula. It is already up-to-date. Using libffi Skipping install of gettext formula. It is already up-to-date. Using gettext Signed-off-by: Daniel P. Berrang=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87d9fa971c..beea941408 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,8 +40,6 @@ addons: - gcovr homebrew: packages: - - libffi - - gettext - glib - pixman =20 --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549566337132891.5652843322958; Thu, 7 Feb 2019 11:05:37 -0800 (PST) Received: from localhost ([127.0.0.1]:45500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grozM-0005Cy-3Y for importer@patchew.org; Thu, 07 Feb 2019 14:05:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYk-0000Ih-0K for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYf-0007UV-Mc for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:00 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:38528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYe-0007IK-SP for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:57 -0500 Received: by mail-wm1-x329.google.com with SMTP id v26so936753wmh.3 for ; Thu, 07 Feb 2019 10:37:50 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a12sm34391245wrm.45.2019.02.07.10.37.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:47 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B79501FF83; Thu, 7 Feb 2019 18:37:44 +0000 (UTC) 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=pfc47NYOwc8vUfGwCm80+Mqp4zX7tIqX5Sr9cI5v/1g=; b=q3IhORSGBq2rbLI/MpgFshSsVm87GArFmyuW0/JldMS1n8RcLxdIHT16S4wQMldd9m ESIRECKHMyBjuNC0R7s+0z+mOJFXXA1l9IemISNgMX1s51p2Bzju9mtqYQHk27thUwg0 lQcOoX3EUjgOIxo+Wy5AEPLlCVXvnvTCEIYJJY4kUvFb7JoW/ZqzFRjElD3iWU+3XsEV hPwA8FPzaoV5EWM2+d1CEbeN79Ur3CWeBw5LigjZIQ1vwlFrFjzodOhmc/aYBluMJ74E tbQ5kUrLkpgnR1CG3YvkypjV7NHHo2rk+v9RCYrkwwFqV69sivJx8dhZ7eClEPQOGJZZ fYMw== 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=pfc47NYOwc8vUfGwCm80+Mqp4zX7tIqX5Sr9cI5v/1g=; b=Y14/01fSZlZvWbLvRph9lYneCBJ+NfBJ3rSh8Gw7TesoNb+H2OAL1/U4yGkq6aTfqr Lvn31hv/Ni+ijm6mgSjExF2OfL+CKF4bSTK35PSSf1u0ObSNrrCNX/lQ2CLeTrEWzMew aC5nfOwjhIJ8imMl4K9rI57BoNKhCxcHRbR1zxc9+pLb1X3Kph/PK/oiVJr4bvvoR91+ 2+2ft+8KYwWx+u8TW2EUyaW/1ZlOQWvUT4xt1vonFML6rPXhSwRU5Luh/AHjVEpwNAoU 1U93KZlKF3cjeN/qDIapAQoDzisWi+I4IRWefDTxQedivxGjn9BSETdakd6RWtVzJyLb E7kQ== X-Gm-Message-State: AHQUAuY9+3bFcSV6XVax91EzML2f0TDqVMpvYDXiXt9pWPqWak4UIM3B tRfvLZlkOsu5eHGhhtd7STh6Rw== X-Google-Smtp-Source: AHgI3IbpBoimx4YG46XnVBgCKyA2VuTanT074ILuH2QYERmVfrBw13J+crEe60FeZmyEQxHEc+lFpw== X-Received: by 2002:a1c:f909:: with SMTP id x9mr8379018wmh.108.1549564669633; Thu, 07 Feb 2019 10:37:49 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:31 +0000 Message-Id: <20190207183744.5054-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 Subject: [Qemu-devel] [PATCH v2 03/16] .travis.yml: separate tools and docs into another entry 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?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Re-building the tools and documents by default is a little wasteful as they are not really affected by the main build options. Split tools and documents into their own task with a minimal softmmu and linux-user target list just to check they don't interact badly. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .travis.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index beea941408..652be702ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,6 +59,7 @@ env: global: - SRC_DIR=3D"." - BUILD_DIR=3D"." + - BASE_CONFIG=3D"--disable-docs --disable-tools" - TEST_CMD=3D"make check -j3 V=3D1" =20 =20 @@ -69,7 +70,7 @@ git: =20 before_script: - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } + - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && e= xit 1; } script: - make -j3 && ${TEST_CMD} =20 @@ -104,6 +105,17 @@ matrix: - CONFIG=3D"--with-coroutine=3Dsigaltstack --disable-linux-user" =20 =20 + # Check we can build docs and tools + - env: + - BASE_CONFIG=3D"--enable-tools --enable-docs" + - CONFIG=3D"--target-list=3Dx86_64-softmmu,aarch64-linux-user" + addons: + apt: + packages: + - python-sphinx + - texinfo + - perl + # Test out-of-tree builds - env: - CONFIG=3D"--enable-debug --enable-debug-tcg" @@ -241,5 +253,5 @@ matrix: =20 =20 - env: - - CONFIG=3D"--disable-system --disable-docs" + - CONFIG=3D"--disable-system" - TEST_CMD=3D"make -j3 check-tcg V=3D1" --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549565783334988.2432280788718; Thu, 7 Feb 2019 10:56:23 -0800 (PST) Received: from localhost ([127.0.0.1]:45357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groqQ-0006Kz-Ai for importer@patchew.org; Thu, 07 Feb 2019 13:56:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYe-0000Bg-17 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYa-0007Kj-AL for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:54 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:45924) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYY-0007Gb-7O for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:50 -0500 Received: by mail-wr1-x42c.google.com with SMTP id q15so899954wro.12 for ; Thu, 07 Feb 2019 10:37:49 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x18sm1591528wrw.61.2019.02.07.10.37.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:47 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C31BF1FF84; Thu, 7 Feb 2019 18:37:44 +0000 (UTC) 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=h3QrD7ZUcXIeA6mQi65eMFZwQhsVnMHkYxp7q6Lsmx0=; b=RWE27JHl75PMt73Q5gfmXNQQSQMY9DElu04uhcz/KpEQZ4OEjAzlcGnJ4YSCYiRe6r twmXCvNSFc38d381lpoxOZOh+BIetl2/dt5N6oGuV1SP0983z7Pj9SQ5z8axz94w/9uM olCEPpauPqngnKWbDHmkzRQa9dmGARHa8jUV6RVA3oCpdtmWh6RoIi3aaDsRyRDKmGaS rSth0fl5MIqa4rmVeq6tCPHwQHJTBKUuhA+V+dIz3q0Bf/IWuN7EP7qGXpIGWSZJ0RQi oGaS4CdiDiQ8+4bJuHXmMf+JUau2sLdI6XVcpyeII4df0EXCFq9x+au+/+93EL4TyUXL iAPQ== 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=h3QrD7ZUcXIeA6mQi65eMFZwQhsVnMHkYxp7q6Lsmx0=; b=bPDfM/ABuIK0y/tWCnABdGqKZeidyKmjPXqrYqc1rgJHsXWe4kcppANXMCQyJ5Hjii Q8sfozsjnvLc4bjvTtEdEJq1gWn8QOrEOOrQhhE/O5T47LuZnITxKH6cwlaCMNvWamoD l9BmCaLMoeNFIH41vKP4e5IUWrLUR/ITJ8nwZXVxq9GGjM8ctnoGWXXhaQXrZdJYKfm9 LdDNcQi6KcSfiGWeW9VrQWLgTcXRFiyb2YRfQ1982eq6kE5KCz/4gC5mpYi4MPh/79Rt 2hsRWPihoQxLnuDw846SL4TDbSNL4tYXK6IU8CzLLh67o8XowKesbIxbqa9MQLtuslQq hKHQ== X-Gm-Message-State: AHQUAubxV/hL+w+LeA8TBErAcJXpodo+wFUuCZkEmD6WvrjshwN8xOBf lVFBurnWqB4ln+i+OYERwAKOBw== X-Google-Smtp-Source: AHgI3IalsE0ac3jI5uZPMXR2oslmxi8XS8JGyovi1lJ5Svw5gspT7GTQ4aVB4sey5Js+hmTDxrIxiQ== X-Received: by 2002:adf:eb12:: with SMTP id s18mr13091385wrn.120.1549564668722; Thu, 07 Feb 2019 10:37:48 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:32 +0000 Message-Id: <20190207183744.5054-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PATCH v2 04/16] .travis.yml: fold --disable-tcg into alternate coroutine builds 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The alternate coroutine builds are really only of interest to people running KVM (although I think you could use them for TCG if you really tried). As they tend to run long lets kill two birds with one stone and fold the --disable-tcg build into them. Signed-off-by: Alex Benn=C3=A9e --- .travis.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 652be702ac..baa06b976a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,12 +97,16 @@ matrix: - CONFIG=3D"--enable-modules --disable-linux-user" =20 =20 + # Alternate coroutines implementations are only really of interest to = KVM users + # However we can't test against KVM on Travis so we can only run unit = tests - env: - - CONFIG=3D"--with-coroutine=3Ducontext --disable-linux-user" + - CONFIG=3D"--with-coroutine=3Ducontext --disable-tcg" + - TEST_CMD=3D"make check-unit -j3 V=3D1" =20 =20 - env: - - CONFIG=3D"--with-coroutine=3Dsigaltstack --disable-linux-user" + - CONFIG=3D"--with-coroutine=3Dsigaltstack --disable-tcg" + - TEST_CMD=3D"make check-unit -j3 V=3D1" =20 =20 # Check we can build docs and tools @@ -162,11 +166,6 @@ matrix: - TEST_CMD=3D"" =20 =20 - - env: - - CONFIG=3D"--disable-tcg" - - TEST_CMD=3D"" - - # MacOSX builds - env: - CONFIG=3D"--target-list=3Daarch64-softmmu,arm-softmmu,i386-softm= mu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,= x86_64-softmmu" --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154956612819163.22744034780783; Thu, 7 Feb 2019 11:02:08 -0800 (PST) Received: from localhost ([127.0.0.1]:45470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grovy-0002ie-4z for importer@patchew.org; Thu, 07 Feb 2019 14:02:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYf-0000Du-Pb for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYe-0007S0-7M for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:57 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:38980) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYc-0007JI-3C for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:56 -0500 Received: by mail-wm1-x335.google.com with SMTP id f16so931511wmh.4 for ; Thu, 07 Feb 2019 10:37:51 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a8sm73401wme.23.2019.02.07.10.37.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:47 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CF0E61FF85; Thu, 7 Feb 2019 18:37:44 +0000 (UTC) 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=GSU/ydIdVIQon6ziPPblb2Na1YmlnDmKU+FtTXm5aZA=; b=r1KXbXEA2Bz88FzPFief35UAOMFxKdTnuiVOylOVGmkzwc8jLzqp96sMgdfRGmE+2L GHL9ZLp/rZwyd+9CVNK5hIrs2LA9rTGwQC4sTgghkONBV+6tajhuX/CtmYLXODfjx7E0 ligl9vnKzXv7K67RaQrWebtijz9aPp2fg7RUzNR6wq4+a2kQCzc1aPht6quLV7aw9mIC oVLwOmpk1MF2nRDbskkzCCn6mV9FU8tWPepaDf6X20FDo/jrkj+rKbcq5Tp4xCcjeE6S 2Mp2A8DEkXDSvLRTj6g1e5CFnF4xdkzR6eOTxO4kTWQjOuZV1p4yxNfYTQWGNRHCOy4E GWnw== 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=GSU/ydIdVIQon6ziPPblb2Na1YmlnDmKU+FtTXm5aZA=; b=Bx+cC2vV5cvk1hTMcLR/F+1Imf0OoMB+QOilEQeuH2DYe5/RUiH+2X2y0A9VCmYfZS e+pffQAF1v+jf98uxK4uzgFpDoHTOay1guzEPbKGumRTRC1bNv/f/NfNdy6AE6MSKCE2 dYDDilAn9rNIyLBqiX0V1ZVYOVyu3iSjrh001YJxPLAgH3qP7qMM78q4W1rxDX+v66e6 Qe3SDwbWId6PA772htsavmDIBjjjC9xkT4P8/n/GekooAP1oq7cYXOBRRe8rEAZzXpEL SvEyy4NcgRvhzO16dAQBWycQRcBmVi38SELA+a9ivouhOzLUMYIBrJqUqTi4UFic5kYy pRag== X-Gm-Message-State: AHQUAuaw+ChRdJ0d4kZPwk17drQ0QB38Cz2xCJUrqmyD3YBUkanwyLXL 6H6tOkFHHgLArdsK7CL7Mtfcqw== X-Google-Smtp-Source: AHgI3IakcOUIW1Q2J+fiSdsMJ6N1lxV2X2SSGdx8cBOWiUioAufQCL1fN0BDAECEjcaso6m7ct2JLA== X-Received: by 2002:a1c:b189:: with SMTP id a131mr8873095wmf.38.1549564670479; Thu, 07 Feb 2019 10:37:50 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:33 +0000 Message-Id: <20190207183744.5054-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 Subject: [Qemu-devel] [PATCH v2 05/16] MAINTAINERS: Add an entry for scripts/archive-source.sh 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=20Benn=C3=A9e?= , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The scripts/archive-source.sh is used by the VM tests, it makes sense to add it in the "Build and test automation" section. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index eecfafad56..a2da141a92 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2471,6 +2471,7 @@ F: scripts/travis/ F: .shippable.yml F: tests/docker/ F: tests/vm/ +F: scripts/archive-source.sh W: https://travis-ci.org/qemu/qemu W: https://app.shippable.com/github/qemu/qemu W: http://patchew.org/QEMU/ --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549566037151695.8357484556574; Thu, 7 Feb 2019 11:00:37 -0800 (PST) Received: from localhost ([127.0.0.1]:45420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grouZ-0001UJ-R9 for importer@patchew.org; Thu, 07 Feb 2019 14:00:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYk-0000Ii-0O for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYf-0007Ua-Mr for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:00 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:35984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYe-0007K1-QL for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:57 -0500 Received: by mail-wm1-x343.google.com with SMTP id p6so952329wmc.1 for ; Thu, 07 Feb 2019 10:37:52 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 126sm121182wmd.1.2019.02.07.10.37.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:48 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DA5B11FF86; Thu, 7 Feb 2019 18:37:44 +0000 (UTC) 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=3Uv0tUPHS97AXR5+QkXIO7BnZ5VZS3wwnm5Ld1f8b8E=; b=eamfVL9evGlsHoo0uJ5tJa1ZukgeThWBscXcHaI3TG19+72iVsxLli4FLmX8uxRYov O4Xuh8eJR7H1HAbOVND1u/gJCx6zn6d0xPKWdAQBaYVi31zdx93jUYv4sIjc1KbLjifK 69N/J1Bbs5LXogoD+z2dDEp6c0sSnk9SUZsadTH8ZLmh9T4UMUkr7lJQf9eLCt75BYVG IRblBB3vDxHoRfRTuOMjsi10B0OI1ixmwF+aRG/ELBXfCF/EdOIpEkMMn/w1lPaQPHlY GAjQHj8MGkL7oAHMymuGLuwlDW40FCJwLWodkpZVCiDCz0/AUlRwL6xHLfZnQRE7ZuMa Ruow== 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=3Uv0tUPHS97AXR5+QkXIO7BnZ5VZS3wwnm5Ld1f8b8E=; b=l0hNKqNovnXM+WL+aXS+Fb4eOCwotrPHEjhEInVtQUkIgtStE7OlFxV0t29snfSTwg Y0kCT/qnIS4nGEs0rmJRdDMnQ/Cy9LhZuVmBLqfmii40qvgDpUA/okhrAwjG3TJPPlUu Dcg1h6yxWjtYxOsZskEWfXyM2JWh6G7ZOITDnzSWFpCeTlWaseA4ULa1PypNdMdgia6x oy12c0kLrRvz+K+lLE5464q/bMARHvz1yqXuLYk9/vjWT4e2A6i1014wkh8wdUmpYfR1 uA/uxE6I0lLI6TJvmN3s9o1NkIl5eQH3/27f5V9mKH6uHZX1doJaqtICKcxQw1d9ru3v XiUA== X-Gm-Message-State: AHQUAuYF/uQ+Ib3DPkoS7ghDz0Zpo42Pf6osUYF9VKUQ3HkkR4Ifa1JR v2GWFTC68AaqRBJje+cBk7LYbA== X-Google-Smtp-Source: AHgI3Ib2KYnFcgRTPN/08h/VQvI4vnJdjyb5CDQ+SRl2WqlcebuXVImhdBVEHHNWnkkATKHQAmw8uQ== X-Received: by 2002:a1c:f50a:: with SMTP id t10mr8736877wmh.126.1549564671343; Thu, 07 Feb 2019 10:37:51 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:34 +0000 Message-Id: <20190207183744.5054-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 06/16] archive-source.sh: Clone the submodules locally 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=20Benn=C3=A9e?= , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 We cloned the QEMU repository from the local storage. Since the submodules are also available there, clone them too. This is quicker and reduce network use. Signed-off-by: Philippe Mathieu-Daud=C3=A9 [AJB: incorporated review suggestions from danpb] Signed-off-by: Alex Benn=C3=A9e --- scripts/archive-source.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 6eed2a29bd..d3a88f71e9 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -38,6 +38,13 @@ else fi git clone --shared . "$vroot_dir" test $? -ne 0 && error "failed to clone into '$vroot_dir'" +for sm in $submodules; do + if test -d "$sm/.git" + then + git clone --shared "$sm" "$vroot_dir/$sm" + test $? -ne 0 && error "failed to clone submodule $sm" + fi +done =20 cd "$vroot_dir" test $? -ne 0 && error "failed to change into '$vroot_dir'" --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549566698031495.05756883759227; Thu, 7 Feb 2019 11:11:38 -0800 (PST) Received: from localhost ([127.0.0.1]:45639 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grp5C-00029K-Rv for importer@patchew.org; Thu, 07 Feb 2019 14:11:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYt-0000RL-Tv for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYr-0007l5-SM for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:11 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:33725) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYr-0007Np-K2 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:09 -0500 Received: by mail-wr1-x42a.google.com with SMTP id a16so997547wrv.0 for ; Thu, 07 Feb 2019 10:37:54 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b15sm2457454wrm.47.2019.02.07.10.37.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:48 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E61601FF87; Thu, 7 Feb 2019 18:37:44 +0000 (UTC) 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=SYT2gwK9+L/tBC0i3KbJPNIUYDpf0myO2F5zvVvbEEQ=; b=kyqhWVJLT84Uv9n2LJre/FJ+Njn/nC2+mEZzSzE+dXj4RBsedtHGg1XkdzpBt1+uka +aDDxXkF4e3WlJp8uJ9QiT87SJgQQs+hZZ8+U625REnGGg15hqanD8kczo9rN4DoBJq5 zU1C4IOFIp73PHsyshHL7yjkSf+ROPGkoF7bYV1ZsAOa7KiVoi6suaL0ReWvuD9FnUpx HPrfjp8kiy1u/o4apTXTFcrSna85QVXVXJYpXvTx2AtCZlWokOIUJHrKzrWd/EdEDtJ6 h3WXjA4DOqmA989cY8VvnTdgoWK/E6n6Ot6wT5ld0I5tVHDFp5C3sVR0IavAY8WS7IeL gPSA== 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=SYT2gwK9+L/tBC0i3KbJPNIUYDpf0myO2F5zvVvbEEQ=; b=tr1wawjMh2gt3a70NiZ+/YnprS5foRFGREGD4FmOuCzYwRzTO+le53mwHnk6Aw1WSD qxCilMnCz/5CZNehKO1O1227RI4TEXIWB+v7mRMrdKZ9vDiO0NKgIgZ10rkqo7X/V67l YW0bad0BO+7lp2Glcq7rVcUV6VmfRW3NeVlMSmz2XN4LNWbIBwyxsOgd1pMcUkv4Ml3z vI8zavIwCA423dwsgRcUS0fhc/Nbi/VMqw/eDX9Jidyo8kRr/B3u0XfGdgE/Nabwh8Kk lAdC6u7iBU1WQjBlfPI72E4TopIr161T8BvVsplwLJsRR6MO3utuFU98vn22WXuljmJ7 Xm+w== X-Gm-Message-State: AHQUAuYyRovSrR4fICbG1ywoHC9OzM3JZSBb6PK1Qes60hxIfDY/bLhP vhqw4lkkM9R0I0QiMwNPY/pbfw== X-Google-Smtp-Source: AHgI3IagOkeplWw8F/xifouZF5a9c75CS3LS0RmC8EMqMd6BTWGGjnh2TpCO2Ow9HgRG1aWoSx9zqw== X-Received: by 2002:a5d:6803:: with SMTP id w3mr13745905wru.272.1549564673088; Thu, 07 Feb 2019 10:37:53 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:35 +0000 Message-Id: <20190207183744.5054-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 07/16] docker: add debian-buster-arm64-cross 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We can't build QEMU with this but we can use this image to build newer arm64 testcases which need more up to date tools. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 1 + .../debian-buster-arm64-cross.docker | 15 +++++++++ tests/docker/dockerfiles/debian10.docker | 31 +++++++++++++++++++ tests/tcg/aarch64/Makefile.include | 2 +- 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 tests/docker/dockerfiles/debian-buster-arm64-cross.dock= er create mode 100644 tests/docker/dockerfiles/debian10.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7032c68895..83d43c50e4 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -90,6 +90,7 @@ docker-image-debian-amd64: docker-image-debian9 docker-image-debian-armel-cross: docker-image-debian9 docker-image-debian-armhf-cross: docker-image-debian9 docker-image-debian-arm64-cross: docker-image-debian9 +docker-image-debian-buster-arm64-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian9 docker-image-debian-mipsel-cross: docker-image-debian9 docker-image-debian-mips64el-cross: docker-image-debian9 diff --git a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker b/te= sts/docker/dockerfiles/debian-buster-arm64-cross.docker new file mode 100644 index 0000000000..33ada13806 --- /dev/null +++ b/tests/docker/dockerfiles/debian-buster-arm64-cross.docker @@ -0,0 +1,15 @@ +# +# Docker arm64 cross-compiler target +# +# This docker target builds on the Debian's Buster base image. There +# are no QEMU pre-requistes so this image can only be used to build +# test cases. +# +FROM qemu:debian10 + +# Add the foreign architecture we want and install dependencies +RUN dpkg --add-architecture arm64 +RUN apt update +RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + crossbuild-essential-arm64 diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/docker= files/debian10.docker new file mode 100644 index 0000000000..aeeb151b52 --- /dev/null +++ b/tests/docker/dockerfiles/debian10.docker @@ -0,0 +1,31 @@ +# +# Docker multiarch cross-compiler target +# +# This docker target is builds on Debian cross compiler targets to build d= istro +# with a selection of cross compilers for building test binaries. +# +# On its own you can't build much but the docker-foo-cross targets +# build on top of the base debian image. +# +FROM debian:buster-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list + +# Install common build utilities +RUN apt update +RUN DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata +RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ + apt install -y --no-install-recommends \ + bison \ + build-essential \ + ca-certificates \ + clang \ + flex \ + gettext \ + git \ + pkg-config \ + psmisc \ + python \ + texinfo \ + $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) diff --git a/tests/tcg/aarch64/Makefile.include b/tests/tcg/aarch64/Makefil= e.include index de32c91235..5d4e4c6f99 100644 --- a/tests/tcg/aarch64/Makefile.include +++ b/tests/tcg/aarch64/Makefile.include @@ -3,6 +3,6 @@ # We don't have any bigendian build tools so we only use this for AArch64 =20 ifeq ($(TARGET_NAME),aarch64) -DOCKER_IMAGE=3Ddebian-arm64-cross +DOCKER_IMAGE=3Ddebian-buster-arm64-cross DOCKER_CROSS_COMPILER=3Daarch64-linux-gnu-gcc endif --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549565873927631.2210210506049; Thu, 7 Feb 2019 10:57:53 -0800 (PST) Received: from localhost ([127.0.0.1]:45381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grorr-0007Yj-Qr for importer@patchew.org; Thu, 07 Feb 2019 13:57:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYj-0000Ie-VI for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYe-0007Sz-P7 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:00 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:34112) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYe-0007Ll-9n for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:37:56 -0500 Received: by mail-wr1-x42d.google.com with SMTP id z15so991437wrn.1 for ; Thu, 07 Feb 2019 10:37:53 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g123sm144421wmd.1.2019.02.07.10.37.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:48 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F23FD1FF88; Thu, 7 Feb 2019 18:37:44 +0000 (UTC) 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=S0Y0SJaJ+3uJySRmld2klURjfuxOZh/cv8KZYQZ3LY4=; b=TDxNaFUlOQB7IKeUJHn3Jh52UKCZ3CnSlPNwN7PueVV2pJC305dcPYAv7wN3KroXw8 Z2C/Zz67kaS7hEmkQ39s27RsduyQcYG4hf4nVJUvc+Pkl7hGDWLB24GdsjakbZe1i+Mn 8ncqkm9iUvNXktUP7gX3h7qlytV4F9uAOwt43mR0zQAcIuhxVCokV6wwq5cgmEXQUvRe T5+8wgIFetb4Pg0ryUyhkn2bVx7Pvl6UvOA1JKoNJpQStu8UkyvQ9Br3NfvNErt2q/PK z88sT6tPgOqMrXfjpD1EtNdyKcu2OSLar7tvhn6JIeACThzNoDRMxxWrP/pTemvDrvM+ CEWQ== 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=S0Y0SJaJ+3uJySRmld2klURjfuxOZh/cv8KZYQZ3LY4=; b=PlDnGK+29TG/ENuDA5bAOtLYEoTf1kQUd9tBJ24lK8jUDMG5q9RmEKL1iFKhoEv7Qj vBaM+mp0xXCvfJnx2cC2t1ogVzUT6KD4eQ1kJslEdNwGqmCKbCjjacSbUkh3tFmp6WUc 74JyClUoEQ60SGq0FQ3/unTwgI3EaDm4fvnFm/t708A6tSmv3WSh+PGfykDg5e3UXHrH Cy2gj4cf4T9SsTZQw3fJtalOXQ7bj4z4u4FhTgLYTC0VCNvtqLQuV3xfCrRKUfQkMaOb RDTgd0ShEh7ylNws9ek7At0oNXCQowKOm2L0wN+OcQ+pJqWyiN+gqKOjvzACLG+lfDfn oFZA== X-Gm-Message-State: AHQUAua9bAdPTATVEu9j50IDSId1PqTMq68++AFo6O9Nh8ld/3IuExVw /TtUN8WMKa4c/lZGPmAPpJv7nw== X-Google-Smtp-Source: AHgI3IbDXItuNm2O56NvwRvu39kxAfDOh0aCgaZZMpLFYK1EVYcE5sQJMw+yeNj4K4z3Squ7SeU4Uw== X-Received: by 2002:adf:9067:: with SMTP id h94mr10600283wrh.129.1549564672250; Thu, 07 Feb 2019 10:37:52 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:36 +0000 Message-Id: <20190207183744.5054-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 08/16] tests: make docker.py update use configured binfmt path 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When copying a QEMU binary into a linux-user docker image we should check what the current configured binfmt_misc path is rather than just assuming "/usr/bin/qemu-bin". Obviously if the user changes the configuration afterwards they will break their images again. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 02d8a83847..30f463af9f 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -123,17 +123,17 @@ def _check_binfmt_misc(executable): =20 if not os.path.exists(binfmt_entry): print ("No binfmt_misc entry for %s" % (binary)) - return False + return None =20 with open(binfmt_entry) as x: entry =3D x.read() =20 - qpath =3D "/usr/bin/%s" % (binary) - if not re.search("interpreter %s\n" % (qpath), entry): - print ("binfmt_misc for %s does not point to %s" % (binary, qpath)) - return False - - return True + m =3D re.search("interpreter (\S+)\n", entry) + interp =3D m.group(1) + if interp and interp !=3D executable: + print("binfmt_misc for %s does not point to %s, using %s" % + (binary, executable, interp)) =20 + return interp =20 def _read_qemu_dockerfile(img_name): # special case for Debian linux-user images @@ -394,9 +394,14 @@ class UpdateCommand(SubCommand): tmp =3D tempfile.NamedTemporaryFile(suffix=3D"dckr.tar.gz") tmp_tar =3D TarFile(fileobj=3Dtmp, mode=3D'w') =20 - # Add the executable to the tarball - bn =3D os.path.basename(args.executable) - ff =3D "/usr/bin/%s" % bn + # Add the executable to the tarball, using the current + # configured binfmt_misc path. + ff =3D _check_binfmt_misc(args.executable) + if not ff: + bn =3D os.path.basename(args.executable) + ff =3D "/usr/bin/%s" % bn + print ("No binfmt_misc configured: copied to %s" % (ff)) + tmp_tar.add(args.executable, arcname=3Dff) =20 # Add any associated libraries --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549566213751310.22073812865483; Thu, 7 Feb 2019 11:03:33 -0800 (PST) Received: from localhost ([127.0.0.1]:45478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groxQ-0003ir-O1 for importer@patchew.org; Thu, 07 Feb 2019 14:03:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYn-0000KN-La for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYk-0007aI-0i for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:03 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:47013) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYg-0007S6-Ah for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:00 -0500 Received: by mail-wr1-x42e.google.com with SMTP id l9so892292wrt.13 for ; Thu, 07 Feb 2019 10:37:56 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f130sm29479wme.41.2019.02.07.10.37.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:53 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0A04A1FF89; Thu, 7 Feb 2019 18:37:45 +0000 (UTC) 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=RI3hIy4OUCm1BggeTdQKyOo4KLrZ8N+o4uTqKehgzt0=; b=W2crA9k2iIjT+vKBSVwCvudwTUg6/jzyt3L9Bt2Liy8yw9zlXnciUgoGNUZiC2XDPg lp2BlJQGryYbong8h9+n20TRGu5aekVto9gPcGPefK8dtSc/ZvlkZfCUsBCDeRh1ZU7q wc08dgeIs63wCEWZzG9B24fw4lM6YNoJQtEMMnZIq5IR+PNKh0++Jrn9RHyUD9i0iYkb IRYlFFjqJYshHY6zAzNkZq40rfu+QbxT3/Ne1AelctKphqkRDSYALMHLcHTelrNhe54H 0ZLthNSYnVeZ6+6da+9hGMYV4chluQA9CAfriFzHYliGp27BUSHWAjRbxZ5PXkTceNX6 /xOQ== 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=RI3hIy4OUCm1BggeTdQKyOo4KLrZ8N+o4uTqKehgzt0=; b=dFz9NraR+72HYjhC9DaVB8szLDK7+H3cv3nS0hC0RYxT4Tdk5j5jeCT/Egy2LUec9b rWvl/dUsbPHlW+uHgSxxIpwkAIAXe64vQ0rS8JBWth6b/nE1wZ4xnkiqgc4sUL4F7sfe UOwsUcT8JzutQl+FxOW91upvHvLjGjghmPpgUuA3AjYud79Ub1+QVeubr9hS09HIevIr I5sRrnZoXu0D4ayZmyCkOJtEABJlGcAJt/r40AQJKwu2e7siZTydztvAHDvGf9UU45F7 kDPFane55NQ4y4/i2yC+VYnr8p6uLVi6qQoq83FJf0Hr7dYhtAsRuoIntpw3f9bGuraE h91A== X-Gm-Message-State: AHQUAuYc4BRyuEnYGRIfg4M+mk1pUEKMGUWYbG8tJ1CUd9KSOdCOfyXs RIyek6v2q5dNvd9iuXcTjKbGBQ== X-Google-Smtp-Source: AHgI3IazTVHgNQ/nFJ1wRL5wZ6YrSy77ZHQgsZ0L3uIzgVHq6rTwNehQrQDJ+1oTUgP/eIKvwCLekQ== X-Received: by 2002:adf:ed11:: with SMTP id a17mr6099844wro.283.1549564675696; Thu, 07 Feb 2019 10:37:55 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:37 +0000 Message-Id: <20190207183744.5054-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PATCH v2 09/16] tests: make docker.py check for persistent configs 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) binfmt_misc configured with the "F" flag opens the interpreter at config time. This means it can use an already open file-descriptor to run QEMU so there is no point trying to copy the binary into a container. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 30f463af9f..768728785f 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -127,6 +127,11 @@ def _check_binfmt_misc(executable): =20 with open(binfmt_entry) as x: entry =3D x.read() =20 + if re.search("flags:.*F.*\n", entry): + print("binfmt_misc for %s uses persistent(F) mapping to host binar= y\n" % + (binary)) + return None + m =3D re.search("interpreter (\S+)\n", entry) interp =3D m.group(1) if interp and interp !=3D executable: --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549566193768108.71213005137929; Thu, 7 Feb 2019 11:03:13 -0800 (PST) Received: from localhost ([127.0.0.1]:45476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groww-0003Oh-In for importer@patchew.org; Thu, 07 Feb 2019 14:03:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYt-0000RQ-VS for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYr-0007kl-Lh for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:11 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44436) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYp-0007TC-Ii for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:09 -0500 Received: by mail-wr1-x443.google.com with SMTP id v16so911298wrn.11 for ; Thu, 07 Feb 2019 10:37:57 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u3sm90545wrq.21.2019.02.07.10.37.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:53 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 16C1D1FF8A; Thu, 7 Feb 2019 18:37:45 +0000 (UTC) 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=HG1vTAmvanN6jqH+SWmOxUZc43Hn8ObxxcUu8+Vvrbc=; b=GdBriDtvTdfm+SGg2mPhuVcHL8ffPOEBmRU1Jr/teIr/o/Sdf/6m43wW53cCfkXARt ZxjwCar/EcIrSZo0KimQB/DDuBEPazNfUH8bGovEifDEgbjwy1NsLiRCx+xizrFevu1v t+A1RxjoCrq4UYHiDtt8v1ob95uKGt6HMiQ/Q6s6LzLJGqxEWZGn+IBnpgLr+fAjK4Bu h8mPa81IpoiDqkZGIjcxdP93tkL23L3IUpwBeL+3UbFZ5F9yhoNlIHX3AsN8SMTl1jb1 56hjKS7uflmOaZGwN9kUah0Q/Mnb7g20G+VVsi7HLmJTvwwDWdR8+jyn28DXmJS0WcxI 7rEQ== 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=HG1vTAmvanN6jqH+SWmOxUZc43Hn8ObxxcUu8+Vvrbc=; b=S2q6Cm0+izUdZsGGWN9rNK0Wc1br7RcVqWrzV8VyW87imvLWLnqtY5Staf9zdwif6v 8i3Wn48qZLZtACg/NqyiB+3Nbc7DzE7PfU3dINIWV+kvM/52qyV/Fvg5lCjyCcqbodop D8pvj/6P/mDYvAut8XfWGsu2l1CTXuaugYXJdEBP6fh0sl2EusgB96le5Gk6Pw5x6LNL OLnCV7rULkT/zVRj9s4vfHfe9Z1XTJv+iUW74ZYC1cwWJvfDeHwJYIdFT3CMK9enu8Re /+h9xhXGHULbkPEPxw5eNnmMcDmk9pgQ5vtnZ/rouZfs6SunxLH2FTivGAJIYLw7TggR Wq6g== X-Gm-Message-State: AHQUAua544zJWw6EgJIdJkFoID/ztmQpdkog1vRckcadiyp84GKKEJmi vtdzuwUTUfOynSBo8NI8XnQq7A== X-Google-Smtp-Source: AHgI3IYS4vMO4RK6VFbz4QxxOm4qT94NBNV662Dn8Y0Gnd8HYaTnMRPpVpUzxNeP7oeGFtOPS/zGfQ== X-Received: by 2002:adf:9b11:: with SMTP id b17mr13666471wrc.168.1549564676358; Thu, 07 Feb 2019 10:37:56 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:38 +0000 Message-Id: <20190207183744.5054-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 10/16] tests: docker.py be even smarter with persistent binfmt_misc 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) If we have a persistent mapping we don't need the QEMU binary copied into the container as the kernel has already opened the file and will pass the fd in. However the support libraries will still need to be there. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 56 ++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 768728785f..a74338cb61 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -96,13 +96,22 @@ def _get_so_libs(executable): =20 return libs =20 -def _copy_binary_with_libs(src, dest_dir): - """Copy a binary executable and all its dependent libraries. +def _copy_binary_with_libs(src, bin_dest, dest_dir): + """Maybe copy a binary and all its dependent libraries. + + If bin_dest isn't set we only copy the support libraries because + we don't need qemu in the docker path to run (due to persistent + mapping). Indeed users may get confused if we aren't running what + is in the image. =20 This does rely on the host file-system being fairly multi-arch - aware so the file don't clash with the guests layout.""" + aware so the file don't clash with the guests layout. + """ =20 - _copy_with_mkdir(src, dest_dir, "/usr/bin") + if bin_dest: + _copy_with_mkdir(src, dest_dir, os.path.dirname(bin_dest)) + else: + print("only copying support libraries for %s" % (src)) =20 libs =3D _get_so_libs(src) if libs: @@ -116,21 +125,26 @@ def _check_binfmt_misc(executable): =20 The details of setting up binfmt_misc are outside the scope of this script but we should at least fail early with a useful - message if it won't work.""" + message if it won't work. + + Returns the configured binfmt path and a valid flag. For + persistent configurations we will still want to copy and dependent + libraries. + """ =20 binary =3D os.path.basename(executable) binfmt_entry =3D "/proc/sys/fs/binfmt_misc/%s" % (binary) =20 if not os.path.exists(binfmt_entry): print ("No binfmt_misc entry for %s" % (binary)) - return None + return None, False =20 with open(binfmt_entry) as x: entry =3D x.read() =20 if re.search("flags:.*F.*\n", entry): print("binfmt_misc for %s uses persistent(F) mapping to host binar= y\n" % (binary)) - return None + return None, True =20 m =3D re.search("interpreter (\S+)\n", entry) interp =3D m.group(1) @@ -138,7 +152,8 @@ def _check_binfmt_misc(executable): print("binfmt_misc for %s does not point to %s, using %s" % (binary, executable, interp)) =20 - return interp + return interp, True + =20 def _read_qemu_dockerfile(img_name): # special case for Debian linux-user images @@ -345,7 +360,8 @@ class BuildCommand(SubCommand): =20 # Validate binfmt_misc will work if args.include_executable: - if not _check_binfmt_misc(args.include_executable): + qpath, enabled =3D _check_binfmt_misc(args.include_executa= ble) + if not enabled: return 1 =20 # Is there a .pre file to run in the build context? @@ -368,7 +384,9 @@ class BuildCommand(SubCommand): # FIXME: there is no checksum of this executable and the l= inked # libraries, once the image built any change of this execu= table # or any library won't trigger another build. - _copy_binary_with_libs(args.include_executable, docker_dir) + _copy_binary_with_libs(args.include_executable, + qpath, docker_dir) + for filename in args.extra_files or []: _copy_with_mkdir(filename, docker_dir) cksum +=3D [(filename, _file_checksum(filename))] @@ -400,14 +418,16 @@ class UpdateCommand(SubCommand): tmp_tar =3D TarFile(fileobj=3Dtmp, mode=3D'w') =20 # Add the executable to the tarball, using the current - # configured binfmt_misc path. - ff =3D _check_binfmt_misc(args.executable) - if not ff: - bn =3D os.path.basename(args.executable) - ff =3D "/usr/bin/%s" % bn - print ("No binfmt_misc configured: copied to %s" % (ff)) - - tmp_tar.add(args.executable, arcname=3Dff) + # configured binfmt_misc path. If we don't get a path then we + # only need the support libraries copied + ff, enabled =3D _check_binfmt_misc(args.executable) + + if not enabled: + print("binfmt_misc not enabled, update disabled") + return 1 + + if ff: + tmp_tar.add(args.executable, arcname=3Dff) =20 # Add any associated libraries libs =3D _get_so_libs(args.executable) --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549566437095474.0358724623784; Thu, 7 Feb 2019 11:07:17 -0800 (PST) Received: from localhost ([127.0.0.1]:45545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grp0x-0006Zo-0l for importer@patchew.org; Thu, 07 Feb 2019 14:07:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYt-0000RG-Tk for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYr-0007jx-HI for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:11 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:41709) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYn-0007XR-KC for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:07 -0500 Received: by mail-wr1-x42f.google.com with SMTP id x10so932812wrs.8 for ; Thu, 07 Feb 2019 10:37:59 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t12sm16675911wra.63.2019.02.07.10.37.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:53 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 22ACD1FF8B; Thu, 7 Feb 2019 18:37:45 +0000 (UTC) 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=fmapYH0wot9fyIAyDh0ISylnJSehFwq7HZ4Z2248uT4=; b=fAuiv6KQMJ5mHu9WszLN6VtA+RmdjAKQcrCn18xyFDMJpx4wfrM1GmHnE6UzzQNzmA jMpc8LZaIvOYL1Gfs/5FHTBtiEipLMikJarHECXQFm9PB/7PN82iv4DgoxJBclBzBCTG 98+EUnXiK7eSuDDp5Vv4nF44WtUHPElt/dGijS1fXa1v3BqWoA9Gu+RR1NBkmNLdBs2b zJaEXfm8V4ytM5ZUY0/jpg5WMtxltTV+Vh4Iuqu65XrVMWcaXo/cADqbgZaIaf7oL8VG OdStIKlWqMsYB/bVAB2NEeUeng4SCJzAMDF9mdvKiJaMpW0rl0h59BMdlFe/Mo+imGPv f7IA== 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=fmapYH0wot9fyIAyDh0ISylnJSehFwq7HZ4Z2248uT4=; b=QEDfDhZiBeAmyt01JTwrSKPks5I3Xcv/12CKzR4lFdDhxNlFQFk+WC4Rb10gX88KIy R0KuRmMRRtNj0ZozafXCciRqfCjKHgN0Mmn7qvRcNa1FRRyjDGi3avJV0fbp98HjwFHV 7risp5geiAZxs6O9YEyYrfxzzaiRpDHbd7gDo3IOowW3cNsiX+/S6yZvGoX2OI9BmVZV wIwqmaZmFJp0SFvZaGaHTmyH+M8sBl21yp8Sd+JAae4u1U+x+wLnhYd9N+XRCSwxcr0d CeUm7n3YQhrOr3du1AT441+bSvFNLBPzb68f5yqDMyDThncoYv9VyhvWJhCLq0ktfCIG jsGQ== X-Gm-Message-State: AHQUAuaI1BUexGqZmTMsjNIoWPojklm69GMQIVz5Cw0yOsrBnD0PO//B 16EatJ9d7YsIycT+ObR5EaqtSBYrJGU= X-Google-Smtp-Source: AHgI3IbsqnvdKLaI8YJ5ssCKMHSVvCMUGKrgGy7C0qb1W7lT84DR2al2RpGbBX6kLO7UZHAmQdK7mw== X-Received: by 2002:adf:8224:: with SMTP id 33mr1680153wrb.264.1549564678786; Thu, 07 Feb 2019 10:37:58 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:39 +0000 Message-Id: <20190207183744.5054-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f Subject: [Qemu-devel] [PATCH v2 11/16] tests: PEP8 cleanup of docker.py, mostly white space 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) My editor keeps putting squiggly lines under a bunch of the python lines to remind me how non-PEP8 compliant it is. Clean that up so it's easier to spot new errors. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 48 ++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index a74338cb61..53a8c9c801 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -30,7 +30,7 @@ except ImportError: from io import StringIO from shutil import copy, rmtree from pwd import getpwuid -from datetime import datetime,timedelta +from datetime import datetime, timedelta =20 =20 FILTERED_ENV_NAMES =3D ['ftp_proxy', 'http_proxy', 'https_proxy'] @@ -43,9 +43,11 @@ def _text_checksum(text): """Calculate a digest string unique to the text content""" return hashlib.sha1(text).hexdigest() =20 + def _file_checksum(filename): return _text_checksum(open(filename, 'rb').read()) =20 + def _guess_docker_command(): """ Guess a working docker command or raise exception if not found""" commands =3D [["docker"], ["sudo", "-n", "docker"]] @@ -59,9 +61,10 @@ def _guess_docker_command(): except OSError: pass commands_txt =3D "\n".join([" " + " ".join(x) for x in commands]) - raise Exception("Cannot find working docker command. Tried:\n%s" % \ + raise Exception("Cannot find working docker command. Tried:\n%s" % commands_txt) =20 + def _copy_with_mkdir(src, root_dir, sub_path=3D'.'): """Copy src into root_dir, creating sub_path as needed.""" dest_dir =3D os.path.normpath("%s/%s" % (root_dir, sub_path)) @@ -96,6 +99,7 @@ def _get_so_libs(executable): =20 return libs =20 + def _copy_binary_with_libs(src, bin_dest, dest_dir): """Maybe copy a binary and all its dependent libraries. =20 @@ -117,7 +121,7 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir): if libs: for l in libs: so_path =3D os.path.dirname(l) - _copy_with_mkdir(l , dest_dir, so_path) + _copy_with_mkdir(l, dest_dir, so_path) =20 =20 def _check_binfmt_misc(executable): @@ -142,7 +146,7 @@ def _check_binfmt_misc(executable): with open(binfmt_entry) as x: entry =3D x.read() =20 if re.search("flags:.*F.*\n", entry): - print("binfmt_misc for %s uses persistent(F) mapping to host binar= y\n" % + print("binfmt_misc for %s uses persistent(F) mapping to host binar= y" % (binary)) return None, True =20 @@ -164,6 +168,7 @@ def _read_qemu_dockerfile(img_name): img_name + ".docker") return open(df, "r").read() =20 + def _dockerfile_preprocess(df): out =3D "" for l in df.splitlines(): @@ -181,6 +186,7 @@ def _dockerfile_preprocess(df): out +=3D l + "\n" return out =20 + class Docker(object): """ Running Docker commands """ def __init__(self): @@ -248,7 +254,7 @@ class Docker(object): =20 def build_image(self, tag, docker_dir, dockerfile, quiet=3DTrue, user=3DFalse, argv=3DNone, extra_files_c= ksum=3D[]): - if argv =3D=3D None: + if argv is None: argv =3D [] =20 tmp_df =3D tempfile.NamedTemporaryFile(dir=3Ddocker_dir, suffix=3D= ".docker") @@ -269,7 +275,7 @@ class Docker(object): =20 tmp_df.flush() =20 - self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + \ + self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + [docker_dir], quiet=3Dquiet) =20 @@ -299,9 +305,11 @@ class Docker(object): def command(self, cmd, argv, quiet): return self._do([cmd] + argv, quiet=3Dquiet) =20 + class SubCommand(object): """A SubCommand template base class""" - name =3D None # Subcommand name + name =3D None # Subcommand name + def shared_args(self, parser): parser.add_argument("--quiet", action=3D"store_true", help=3D"Run quietly unless an error occurred") @@ -309,6 +317,7 @@ class SubCommand(object): def args(self, parser): """Setup argument parser""" pass + def run(self, args, argv): """Run command. args: parsed argument by argument parser. @@ -316,18 +325,23 @@ class SubCommand(object): """ pass =20 + class RunCommand(SubCommand): """Invoke docker run and take care of cleaning up""" name =3D "run" + def args(self, parser): parser.add_argument("--keep", action=3D"store_true", help=3D"Don't remove image when command comple= tes") + def run(self, args, argv): return Docker().run(argv, args.keep, quiet=3Dargs.quiet) =20 + class BuildCommand(SubCommand): - """ Build docker image out of a dockerfile. Arguments: """ + """ Build docker image out of a dockerfile. Arg: """ name =3D "build" + def args(self, parser): parser.add_argument("--include-executable", "-e", help=3D"""Specify a binary that will be copied= to the @@ -392,8 +406,8 @@ class BuildCommand(SubCommand): cksum +=3D [(filename, _file_checksum(filename))] =20 argv +=3D ["--build-arg=3D" + k.lower() + "=3D" + v - for k, v in os.environ.iteritems() - if k.lower() in FILTERED_ENV_NAMES] + for k, v in os.environ.iteritems() + if k.lower() in FILTERED_ENV_NAMES] dkr.build_image(tag, docker_dir, dockerfile, quiet=3Dargs.quiet, user=3Dargs.user, argv=3Da= rgv, extra_files_cksum=3Dcksum) @@ -402,9 +416,11 @@ class BuildCommand(SubCommand): =20 return 0 =20 + class UpdateCommand(SubCommand): - """ Update a docker image with new executables. Arguments: """ + """ Update a docker image with new executables. Args: """ name =3D "update" + def args(self, parser): parser.add_argument("tag", help=3D"Image Tag") @@ -457,16 +473,20 @@ class UpdateCommand(SubCommand): =20 return 0 =20 + class CleanCommand(SubCommand): """Clean up docker instances""" name =3D "clean" + def run(self, args, argv): Docker().clean() return 0 =20 + class ImagesCommand(SubCommand): """Run "docker images" command""" name =3D "images" + def run(self, args, argv): return Docker().command("images", argv, args.quiet) =20 @@ -539,7 +559,7 @@ class CheckCommand(SubCommand): =20 try: dkr =3D Docker() - except: + except subprocess.CalledProcessError: print("Docker not set up") return 1 =20 @@ -578,7 +598,8 @@ class CheckCommand(SubCommand): =20 def main(): parser =3D argparse.ArgumentParser(description=3D"A Docker helper", - usage=3D"%s ..." % os.path.basename(sys.argv[0])) + usage=3D"%s ..." % + os.path.basename(sys.argv[0])) subparsers =3D parser.add_subparsers(title=3D"subcommands", help=3DNon= e) for cls in SubCommand.__subclasses__(): cmd =3D cls() @@ -589,5 +610,6 @@ def main(): args, argv =3D parser.parse_known_args() return args.cmdobj.run(args, argv) =20 + if __name__ =3D=3D "__main__": sys.exit(main()) --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549566521943504.61429284672; Thu, 7 Feb 2019 11:08:41 -0800 (PST) Received: from localhost ([127.0.0.1]:45579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grp2L-0007j2-Rg for importer@patchew.org; Thu, 07 Feb 2019 14:08:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYr-0000P7-HY for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYn-0007fz-O4 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:07 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33341) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYl-0007UL-1Q for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:03 -0500 Received: by mail-wr1-x441.google.com with SMTP id a16so997741wrv.0 for ; Thu, 07 Feb 2019 10:37:58 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r12sm26872714wrq.3.2019.02.07.10.37.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:53 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2EF621FF8C; Thu, 7 Feb 2019 18:37:45 +0000 (UTC) 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=c5SUFjy6D/+fVu+wE7JNZRrzv3wslsES3l1OXnRCA/8=; b=IkPhfQOed5A8YHmYAY3wXT9gOCd7mp33ssmw8L9rcuFImt0othohxUsbqi4Xb7WtoO DKk8BsDhNML3hhBW6y+0jY1jMk9pTdOuyd+EVLmu/DStjI/xZ1DwkiD25LMbd/sQxoo5 57qy3Z5LTlHtBT4JM5xm1UExXXmq33HQ6IFgoMohI4yPD8D5DpL//tM3THkaWOxQ88t8 JGvKqrgzWG9zkpukp2qLf97j4IASRx9n6rN60NGgX4eNNQCBew9q4QoIFgdsS4pRtlnD qA+nwa6jU0E5sj7FZQFcCLJyUr8Y5kc0QcofxCvvz1OLQwim2CiRgUIpX6gGYdWyhxhk VveA== 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=c5SUFjy6D/+fVu+wE7JNZRrzv3wslsES3l1OXnRCA/8=; b=gII67eOi/LKGSylIy6HW9QT2zBR4s4Clh9qEZ3vEfVOpJlqFphJzeTD9haHVdf9yxZ Ta4RDoR22A+G7iQEgiJGiaiwzsp5xoQEkEX0Zak65e1DkQi41Y9DwS2+q/+tT/eOPWM4 l1S0V874Ga1SH7fAp51F7fxRaSwUWBReVBzPywSJ+U3Q0pbRbPokdgL7o5hhc9rwJc8x YoQchyAIEpniCu/VPu9Cg2v6FYEikXg9JKljiDDv6MPjXkmV2RpxtxfJMZSlSma5Brrw LihCzuMh6VyZHw3cXuGmzTLcYMTYfTpx6+k3U654ZQM4/H2L2y7V7XHtFIQMEfc/FZ6v Qb6w== X-Gm-Message-State: AHQUAuaIO5UNYWkrNSRyU8iS5GEulHXaFFEGcg2Agv39qeC0M63Bz83T GxQ321i5ZtiQcs8pq5p6+GUMgcX2KT8= X-Google-Smtp-Source: AHgI3IYjf8ILMmPI/83PSlYaWiKJem9ScZZFnhfEjLs4tg6fwnzgpx4Y0cFPydn/uuJ6aULd9AnDbA== X-Received: by 2002:a5d:5512:: with SMTP id b18mr13929617wrv.66.1549564677038; Thu, 07 Feb 2019 10:37:57 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:40 +0000 Message-Id: <20190207183744.5054-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 12/16] tests/vm: move images to $HOME/.cache/qemu-vm/images 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=20Benn=C3=A9e?= , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann It's easier to move around the images then, by replacing the subdirectory with a symlink. Allows to share the images between multiple qemu checkouts for example. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- tests/vm/Makefile.include | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index a98fb3027f..a58383d263 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -3,7 +3,8 @@ .PHONY: vm-build-all vm-clean-all =20 IMAGES :=3D ubuntu.i386 freebsd netbsd openbsd centos -IMAGE_FILES :=3D $(patsubst %, tests/vm/%.img, $(IMAGES)) +IMAGES_DIR :=3D $(HOME)/.cache/qemu-vm/images +IMAGE_FILES :=3D $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) =20 .PRECIOUS: $(IMAGE_FILES) =20 @@ -24,9 +25,10 @@ vm-build-all: $(addprefix vm-build-, $(IMAGES)) vm-clean-all: rm -f $(IMAGE_FILES) =20 -tests/vm/%.img: $(SRC_PATH)/tests/vm/% \ - $(SRC_PATH)/tests/vm/basevm.py \ - $(SRC_PATH)/tests/vm/Makefile.include +$(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ + $(SRC_PATH)/tests/vm/basevm.py \ + $(SRC_PATH)/tests/vm/Makefile.include + @mkdir -p $(IMAGES_DIR) $(call quiet-command, \ $< \ $(if $(V)$(DEBUG), --debug) \ @@ -37,7 +39,7 @@ tests/vm/%.img: $(SRC_PATH)/tests/vm/% \ =20 =20 # Build in VM $(IMAGE) -vm-build-%: tests/vm/%.img +vm-build-%: $(IMAGES_DIR)/%.img $(call quiet-command, \ $(SRC_PATH)/tests/vm/$* \ $(if $(V)$(DEBUG), --debug) \ --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549566624402279.6030736935652; Thu, 7 Feb 2019 11:10:24 -0800 (PST) Received: from localhost ([127.0.0.1]:45599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grp43-0000xW-CS for importer@patchew.org; Thu, 07 Feb 2019 14:10:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grofd-0006I9-3U for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:45:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grofc-0005Kz-3v for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:45:08 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:35669) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grofb-0005Jm-UJ for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:45:08 -0500 Received: by mail-wr1-x436.google.com with SMTP id z18so1009274wrh.2 for ; Thu, 07 Feb 2019 10:45:07 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r12sm26882504wrq.3.2019.02.07.10.45.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:45:06 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3B5651FF8D; Thu, 7 Feb 2019 18:37:45 +0000 (UTC) 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=IPprguoj5mK+12h14/lLvvuSBZZ4XZa/hXHxsq0MsuU=; b=JAnOsGss33kfYa63RI/+VYIM+15ACgq71VnvtRjxo77dv7VzAnHv+KpU/5pmYiOita eVuPGNjC4Ym+Kr9THM2iNZ+A6J0kzd/8LTaxUu2oZUArNOi1f3JUh0kyiGkN4rbtF+4K t4MBKuQ8DfPUtEODKCk1UG7woW30lXDoW7EYt4c3aX8oL1tPvGAfXk2ZKezNrKBCreMU JO8xqK1DBlbAW3t4s8xGWWjQW7b7gJ9lhA5Vh81jnUaLY7wheHFZsJbotvNV3UY7KjVc 4xQhmn8corpSM2JN5WFNu4Gk1C7fG7/Sx0xlIsGSBEEUwbc+UoJ6McGE5m7Mttgn2BaG vnDA== 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=IPprguoj5mK+12h14/lLvvuSBZZ4XZa/hXHxsq0MsuU=; b=gWvYX35AGLWto1tbK0DWlidaqsYK2uUZgNZNUE2ickt3iS8iuwrw+D070+7rJ00i/F oHCWYRJM6Jw0q33CIYFWklT2uXznBOtI9P/yJiILbBMgYFBnPuNwfV9brzdtIU0c6PxH c8HsyWVJU6rLK9Tw0YtmHUVNoDJMH48N6f4h75sfAgo2FAYtby7bA64e/+R7nl7bhx0s 9DpoiK93S3OJdZ6UP12q4/JFimvRFSq68IOmYS4UR3gBwENPCDd74epxoVDTKPk5iG3I SwVN+PcM9+ajdXeB3CDwCWdHBvYbmYIyUffYHE/Kzyl4RoIYAVlPPybWIvUxP4ll4nSg QX5Q== X-Gm-Message-State: AHQUAua6OZgazugcng2iY0JOHhDXXM7GpZNcIXi7GpFndCrUTh3RwSfG TTSEXCXAk/Ub6cMjEd60ObaCww== X-Google-Smtp-Source: AHgI3IauYXMWCIycJ1hvs6N7pbtbZXVaDNqbjLfXpUfqRo5MWaT1vyelFxnrIsIQamJyjCOA6Km91g== X-Received: by 2002:a5d:4f10:: with SMTP id c16mr13787709wru.177.1549565106619; Thu, 07 Feb 2019 10:45:06 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:41 +0000 Message-Id: <20190207183744.5054-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 13/16] tests/vm: call make check directly for netbsd/freebsd/ubuntu.i386 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?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The "make check" target calls check-qtest which has the appropriate system binaries as dependencies so we shouldn't need to do two steps of make invocation. Doing it in two steps was a hangover from when our make check couldn't run tests in parallel. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/freebsd | 1 - tests/vm/netbsd | 1 - tests/vm/ubuntu.i386 | 1 - 3 files changed, 3 deletions(-) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 19a3729172..a85c866c30 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -25,7 +25,6 @@ class FreeBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/vtbd1; ./configure {configure_opts}; - gmake --output-sync -j{jobs} {verbose}; gmake --output-sync -j{jobs} check {verbose}; """ =20 diff --git a/tests/vm/netbsd b/tests/vm/netbsd index fac6a7ce51..edea113bb5 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -25,7 +25,6 @@ class NetBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rld1a; ./configure --python=3Dpython2.7 {configure_opts}; - gmake --output-sync -j{jobs} {verbose}; gmake --output-sync -j{jobs} check {verbose}; """ =20 diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 1b7e1ab8f0..252e514859 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -26,7 +26,6 @@ class UbuntuX86VM(basevm.BaseVM): sudo chmod a+r /dev/vdb; tar -xf /dev/vdb; ./configure {configure_opts}; - make --output-sync -j{jobs}; make --output-sync check -j{jobs} {verbose}; """ =20 --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549566341164772.1097836536917; Thu, 7 Feb 2019 11:05:41 -0800 (PST) Received: from localhost ([127.0.0.1]:45506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grozU-0005Nt-5o for importer@patchew.org; Thu, 07 Feb 2019 14:05:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYt-0000RM-UR for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYr-0007kH-IX for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:11 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:37069) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYn-0007WH-OO for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:07 -0500 Received: by mail-wm1-x344.google.com with SMTP id g67so937710wmd.2 for ; Thu, 07 Feb 2019 10:37:59 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y20sm35696522wra.51.2019.02.07.10.37.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:53 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 475CE1FF8E; Thu, 7 Feb 2019 18:37:45 +0000 (UTC) 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=458VsIuHOmbZBe2YP64b9Zf2PvPdcWTqzpqK98thYpI=; b=lcM3dCy8hg47ER5ktwKlLwHW+g3ErpCyHGNR/V53fYY4uHZjEy6Jdgi2OZ3XZi9gFT QH8OTtsIGDeh/r5ol/wY3HE+e1PfiIcrp1jpk+/fGIxIYa1+1AFKiuMMDeGtdh9UYrmT I83J+xGjM53UgkOXbLgMans/LqZFMz8IVtBLc1StYARygcvUvu8kgNsw41CSM2tHWbAn X2JXgzy0R3IzXk5nJ10ftcyfoWHB1hLgY2mKnQPEO5ao8wLY5JSddrPkp9KwezQYv+Ea yPbLu2ePZfwz4ED/zbM4sCp/j9J96GnWVB2BAEx18bGT0t1AvRMXTSTNmP0aHmvlGAeF fSiw== 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=458VsIuHOmbZBe2YP64b9Zf2PvPdcWTqzpqK98thYpI=; b=UCah6WAW/+dXwAFuzAqm1nbMJ9Un/K+RTiU1CxLbtN5NkwtDd2kZzFgPQgOheE0gNs XVFT40snpw9vavQpqDGcWoy1eUJQF221VVEpNXca3MpeAjy+eKzJeNZyemm4uUS4nSjd /4vp+3UgsU/el3VIdVAMEP+DcewbP/KFWRyxQQQP/xRYlutw6EPJFGALCMiDmP39Q5Lv C5Y9jfh8qpL1ylR+5TaE62cVsw4MHUfdYZ3Ac/pQAdjVEL1YfQEHUAtLguINZUYebdWF 8ry0UqyE4VIS1NSXGt+T1RuHpPo6X7W8E5PeiFA+oYz8LNKPXasyqpxpmLC8TOb5difH D/VQ== X-Gm-Message-State: AHQUAuZsQAQH1u3QXcfGl2ttpAQ/bahcc8CN5PdsAih3KZjzm8nDzakG C51+vvS2JAVVoVablKpcVQFhsg== X-Google-Smtp-Source: AHgI3IYVapdyg1/MASEhSq/mJteGutTfHB+zezyqbA7l1snKRxSIyxINZyxb/AwmSiPPKaqTt5hoVg== X-Received: by 2002:a1c:cc04:: with SMTP id h4mr8916892wmb.13.1549564677838; Thu, 07 Feb 2019 10:37:57 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:42 +0000 Message-Id: <20190207183744.5054-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 14/16] tests/vm: add --build-target option 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?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This allows us to invoke the build with a custom target (for the VMs that use the {target} format string specifier). Currently OpenBSD is still hardwired due to problems running check. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/basevm.py | 3 +++ tests/vm/freebsd | 2 +- tests/vm/netbsd | 2 +- tests/vm/ubuntu.i386 | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 5caf77d6b8..bdca6cb2fc 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -228,6 +228,8 @@ def parse_args(vmcls): help=3D"build image") parser.add_option("--build-qemu", help=3D"build QEMU from source in guest") + parser.add_option("--build-target", + help=3D"QEMU build target", default=3D"check") parser.add_option("--interactive", "-I", action=3D"store_true", help=3D"Interactively run command") parser.add_option("--snapshot", "-s", action=3D"store_true", @@ -255,6 +257,7 @@ def main(vmcls): cmd =3D [vm.BUILD_SCRIPT.format( configure_opts =3D " ".join(argv), jobs=3Dargs.jobs, + target=3Dargs.build_target, verbose =3D "V=3D1" if args.verbose else "")] else: cmd =3D argv diff --git a/tests/vm/freebsd b/tests/vm/freebsd index a85c866c30..1d64c31b7c 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -25,7 +25,7 @@ class FreeBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/vtbd1; ./configure {configure_opts}; - gmake --output-sync -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} {target} {verbose}; """ =20 def build_image(self, img): diff --git a/tests/vm/netbsd b/tests/vm/netbsd index edea113bb5..a2c3d13af4 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -25,7 +25,7 @@ class NetBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rld1a; ./configure --python=3Dpython2.7 {configure_opts}; - gmake --output-sync -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} {target} {verbose}; """ =20 def build_image(self, img): diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 252e514859..a22d137e76 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -26,7 +26,7 @@ class UbuntuX86VM(basevm.BaseVM): sudo chmod a+r /dev/vdb; tar -xf /dev/vdb; ./configure {configure_opts}; - make --output-sync check -j{jobs} {verbose}; + make --output-sync {target} -j{jobs} {verbose}; """ =20 def _gen_cloud_init_iso(self): --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549567069984653.6757726800571; Thu, 7 Feb 2019 11:17:49 -0800 (PST) Received: from localhost ([127.0.0.1]:45759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grpBC-0007Bn-Uk for importer@patchew.org; Thu, 07 Feb 2019 14:17:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grofc-0006Hh-Gx for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:45:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grofb-0005KO-Lr for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:45:08 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grofb-0005JJ-D0 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:45:07 -0500 Received: by mail-wr1-x444.google.com with SMTP id x10so955058wrs.8 for ; Thu, 07 Feb 2019 10:45:07 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u3sm102257wrq.21.2019.02.07.10.45.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:45:05 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 534601FF8F; Thu, 7 Feb 2019 18:37:45 +0000 (UTC) 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=6ctHGPCRB5rgyBhy5Weqh5JeJifx4dwStbosLa+ze0E=; b=H5jhkf/jQ4U6wJVwdHPulReTd9oflD5eV19stWDEeZfaPjL7SDJocXOkMkEprvUObu UAoPUqjdIJiqo2kDZcc5+DOI60NdtcqIC+C94wPoURSXkgeegVKlJ4HsJfE1Me8Wldv8 eagDmXHTe13bmc9En00pzZfTf5xY23ig+i3j2lCFfwK4oq7jGnxzv/RzaJghLo+frfu5 nNPuZuRUwr7SewFZvzsd0xKyxjrntk+UpVm+o4vK5s3OK/pAOHsSd+LNleRi59M3wHvR Co0NekIPt6Ioy6UtE6g+tmJzhfLVJKXGJwrNBnxTiomEEZoBAU/URo7vruwIoSdJQjqK FjKA== 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=6ctHGPCRB5rgyBhy5Weqh5JeJifx4dwStbosLa+ze0E=; b=q6ohdcTnpzNh162vp4HOFPsiTDHjnkPZ78uDV+3XzQ1XDRIjoYOGD2QpDCJU7wBxdV i/b0hdR44IwROn/F5qtT6kNr1ijb68riKUbv/LYcUpzuwUyXZWFdZw+br/HuK112ByRX RPcH3C7r46etGOb27rUfH3RSVifSv3XROMjRc/6ZmE7YcZ3t0Kzbicvu/Hob126rVJkq /FB+xsWdyR10yEJYPIpuVQn43JbJ7Do/JvjHeLHfVEAMVdeQ/TtFS8Gne8UYdjfD91s3 O8DhFD9P4+6t5tJF2Eso6l2t5WvFbKAyOjW0Vw0hM5ij1s0P3Lib8eOvl4eJbEJlIVX/ cnMQ== X-Gm-Message-State: AHQUAuboAV/5TDr9/KBTg8vlP9bE7U97JPEiH7I47wIw+hW7u3DlhWoz 7cgCrDlCZbBx5E8aqPm5XwLLjQ== X-Google-Smtp-Source: AHgI3IaMs2uElXFxV71ZaX/8QO2mqrgzF5SlHmxYULaQx8EJSstwuOXVJl2sPDVUj/aGCvvFo5KPVQ== X-Received: by 2002:adf:ecc4:: with SMTP id s4mr3337351wro.286.1549565105980; Thu, 07 Feb 2019 10:45:05 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:43 +0000 Message-Id: <20190207183744.5054-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 15/16] tests/vm: expose BUILD_TARGET, TARGET_LIST and EXTRA_CONFIGURE_OPTS 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?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Now the underlying basevm support passes these along we can expose some additional variables to our Makefile to allow more customised tweaking of the build. For example: make vm-build-freebsd TARGET_LIST=3Daarch64-softmmu \ EXTRA_CONFIGURE_OPTS=3D"--disable-tools --disable-docs" \ BUILD_TARGET=3Dcheck-softfloat Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/Makefile.include | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index a58383d263..992d823f6b 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -19,6 +19,11 @@ vm-test: @echo "" @echo " vm-build-all - Build QEMU in all VMs" @echo " vm-clean-all - Clean up VM images" + @echo + @echo "Special variables:" + @echo " BUILD_TARGET=3Dfoo - override the build target" + @echo " TARGET_LIST=3Da,b,c - Override target list in builds." + @echo ' EXTRA_CONFIGURE_OPTS=3D"..."' =20 vm-build-all: $(addprefix vm-build-, $(IMAGES)) =20 @@ -47,6 +52,9 @@ vm-build-%: $(IMAGES_DIR)/%.img $(if $(J),--jobs $(J)) \ $(if $(V),--verbose) \ --image "$<" \ - --build-qemu $(SRC_PATH), \ + $(if $(BUILD_TARGET),--build-target $(BUILD_TARGET)) \ + --build-qemu $(SRC_PATH) -- \ + $(if $(TARGET_LIST),--target-list=3D$(TARGET_LIST)) \ + $(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \ " VM-BUILD $*") =20 --=20 2.20.1 From nobody Sat Apr 20 09:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549566382382639.5498902945059; Thu, 7 Feb 2019 11:06:22 -0800 (PST) Received: from localhost ([127.0.0.1]:45539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grp06-0005ws-7Y for importer@patchew.org; Thu, 07 Feb 2019 14:06:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groYy-0000WP-7Z for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1groYt-0007nC-Sx for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:13 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:55748) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1groYr-0007Yf-Rz for qemu-devel@nongnu.org; Thu, 07 Feb 2019 13:38:11 -0500 Received: by mail-wm1-x344.google.com with SMTP id r17so917409wmh.5 for ; Thu, 07 Feb 2019 10:38:01 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f10sm27930wmb.35.2019.02.07.10.37.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 10:37:55 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5FC811FF90; Thu, 7 Feb 2019 18:37:45 +0000 (UTC) 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=twEAfdMN/6FjqGGiydr3gUMZzTupENw0qNrtRFI8B3w=; b=dV+fTvdAHXLT+WgMOu4QFBFGF+lghAOVxgnknPgKb96Y09+opDxH+69dseI/I8ztbM aXCulkIh1krTnOeDaMtg1SDmXmI1kmiitA8QJ+8hk8YjYCHNppAB76FFa64MBRu5D2WB DWeMbXN3nZdD6RuEIW+G97vhVBEKbloEdzuUfxxt5U7Ihf+offeYNbRL4EOpXm3cpeMa mEQR4DtYfnKlGx56r0KoQ9Z7BbawUtlluaDnn6d3XbcnkYIC+XxF1D6DUvwdkMQRuEYB YorG6m21kh1ior4s/5wI/lbN7CoT8xYV8w9IrdQq33JRBjDlY7TT7yrE5QoeXzkNDeZe uuAw== 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=twEAfdMN/6FjqGGiydr3gUMZzTupENw0qNrtRFI8B3w=; b=eJ+t7Q3MBTMpR+CxHGmdX6FqKTE5NmUsG5i+VaaNgI1FLms76sxCWPhfoEGp5F24JX Qne0yfXL7essFp45G5NMTPrmX3+BZGEtufbZM6TTPB1rnM3+CSRz4Dou5rK6Hxr1gkuu gW/0+uQHQ6JdFXNgXT18KgO4ZoEz6pbuP4Yzc/Yum7sRvhPCl6ZzBvj9PuFQZ1AS52Tk mYYlQ8ZyOVXYvTpFSb/UN2kdzPj8dbKje4a9NGS8DjwSTqNZ8K3hQ1d03iwY4GK9ccJM 7LLafFbZviWK3l5mwQqjIJ5KCbHqtem022Hva8kWL3+VaeFHZmtTDrTDOUAiDTfs5riL rBNg== X-Gm-Message-State: AHQUAuYvPGZyB4wBIZuUxBCZ4mIk3M/D7/aXyO9LofRDTGK2ILZecXjR DAWDFed5cM8oTw6TL79Hl+fz9g== X-Google-Smtp-Source: AHgI3Iaj9E0ZV2b7z5xIy3MUYidiapZ74y6XcZdWMmFZgQ1yFbMsH39AK5KSQKPlhHcKzNrj9IPXYA== X-Received: by 2002:a7b:c0c5:: with SMTP id s5mr8142082wmh.56.1549564680034; Thu, 07 Feb 2019 10:38:00 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:37:44 +0000 Message-Id: <20190207183744.5054-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207183744.5054-1-alex.bennee@linaro.org> References: <20190207183744.5054-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 16/16] scripts/qemu.py: allow arches use KVM for their 32bit cousins 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) A lot of architectures can run their 32 bit cousins on KVM so the kvm_available function needs to be a little less restricting when deciding if KVM is available. Signed-off-by: Alex Benn=C3=A9e --- scripts/qemu.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 0a5e02eb56..32b00af5cc 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -25,10 +25,18 @@ import tempfile =20 LOG =3D logging.getLogger(__name__) =20 +# Mapping host architecture to any additional architectures it can +# support which often includes its 32 bit cousin. +ADDITIONAL_ARCHES =3D { + "x86_64" : "i386", + "aarch64" : "armhf" +} =20 def kvm_available(target_arch=3DNone): - if target_arch and target_arch !=3D os.uname()[4]: - return False + host_arch =3D os.uname()[4] + if target_arch and target_arch !=3D host_arch: + if target_arch !=3D ADDITIONAL_ARCHES.get(host_arch): + return False return os.access("/dev/kvm", os.R_OK | os.W_OK) =20 =20 --=20 2.20.1