From patchwork Mon Feb 11 13:04:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039783 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="yhYc1JRi"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymJX0GrCz9sMp for ; Tue, 12 Feb 2019 00:06:36 +1100 (AEDT) Received: from localhost ([127.0.0.1]:49939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBIA-0007Ba-1F for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:06:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBH4-000728-40 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBGp-0003jc-0X for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:17 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:35556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBGo-0003i3-Dq for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:10 -0500 Received: by mail-wm1-x342.google.com with SMTP id t200so17218292wmt.0 for ; Mon, 11 Feb 2019 05:05:09 -0800 (PST) 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=xhEgj7+8jzdAuUAdts7bWG7Sd2v7uV7s5gXyJpnr14Q=; b=yhYc1JRioWqnlm907zQM8LQNahq3yXXf2mAhKQA1ckaUTaSTD1VyybZ9WpmsBrXhhS D/R6AXoSNLvr7ihYUA3qTXNyb+mP+fRVstzExxJp42Yx5Gc0xCSkwegHvPAFAdXqe1hU 6U6O6k0U3lPyyzl8euYXRgKtvIrQ6g6Qtil5ZTGjdqqKHwcDbmn+QxPgHanQBX4ijd+D 8vqXgj2Xl1lJOiHvAI0tbw8YuNj1uNFHBQU3X2bDPuuA/KeH05ohzI+HdoW2BRTWF2D9 yV66dwbw0ONDnDDEmJNOm0P1qnuWt1Y6RDpKNHwPykKFsPl7nhQBuM4nPtemEmGclBW7 PBEg== 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=xhEgj7+8jzdAuUAdts7bWG7Sd2v7uV7s5gXyJpnr14Q=; b=KGOYWlAfMUqXH/lyBX9uVRTSw7QoR8MCSPHZxijNlojag1IE0cElrYp+gqtm1P7s+I ASx0F0rcuASGjbNsnEdNQcH0cDdhN8rfT2RtBcT9afh0rOutebAlmrejDw2weXr6cIp1 IXLhph/3D7BizimYPKf7DgSI5gG8p8ghHbDVSkqfNEHCVVBogIgV7uea/zuwLLJPr7fU eXh97dOyfCisQQWEkuprSdFjqVcmOhliENlqU9RpIcUxHuxe24a0XEY9BkkwIlzIEKcn BOazGSqPeO46zi/krVFKwDyd3FOxJS9jZxEfpWKHNuekonuOepx3HvR+Q/ARuTSzsqbl bPVw== X-Gm-Message-State: AHQUAuaS+m/o5drM/BWEM4KyVd957qsbsKIgvLQvkkAS4GkEU3gYDO4/ mQA8I0uboZAc5nfGSOlssDHzAg== X-Google-Smtp-Source: AHgI3Iaw9lJs2ypW7w7LWCELXZ4P/O6oPTNK3h2aV2pWpZbLG/ueCecss/gOxby7H/lyhF3a7ycylg== X-Received: by 2002:a1c:a3c3:: with SMTP id m186mr9130588wme.16.1549890308219; Mon, 11 Feb 2019 05:05:08 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o3sm7128477wrs.30.2019.02.11.05.05.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:07 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 178851FF81; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:04:50 +0000 Message-Id: <20190211130507.8710-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PULL 01/18] .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_Benn=C3=A9e?= , Ed Maste , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Ed Maste Signed-off-by: Ed Maste Signed-off-by: Alex Bennée 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=1 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/ +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ée R: Philippe Mathieu-Daudé From patchwork Mon Feb 11 13:04:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039782 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="RJSPWQl0"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymJM3zgvz9sML for ; Tue, 12 Feb 2019 00:06:27 +1100 (AEDT) Received: from localhost ([127.0.0.1]:49937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHw-00076J-Cu for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:06:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBH9-00074N-BQ for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBGu-0003od-Ta for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:21 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:51611) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBGq-0003jm-Q8 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:14 -0500 Received: by mail-wm1-x332.google.com with SMTP id b11so17637887wmj.1 for ; Mon, 11 Feb 2019 05:05:11 -0800 (PST) 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=pFYYn8hcHHNIkyo8B18MdclGpTCQ3UtKCfLhXSmYZsw=; b=RJSPWQl0seKsJ9UBol+zfLXp6OxkFev4Ex1pqEGnuxeJl3h+SiBp+CmUInN+F1I5n2 uoqI1K25Oyrj9HloEBzqmkephi6bB30RKINg2maq7c7sfEAwISSjtjVyusBoxcfs7HhY TD2ZapF5paF/YZiCv4xFeGHonh8VZH4+4V7mXOIONVOtohZVE9hOu8Nq0VTK9WZaeEER ndXCqU3Kx/ic+ZMRKcmy1rc4PViXEG2sTJAKFTqb6BVnn5wmfkNhDRlTYPyZSoBvLd89 K7bJhYXmkhXE3l9J3lV41J5ixDW1gKJUEuGRTIRdRUp4WGQZAFdpx34BW6GRrN9DD9vL JbNA== 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=pFYYn8hcHHNIkyo8B18MdclGpTCQ3UtKCfLhXSmYZsw=; b=ubdpAbXgxUV1KM+W8NX36yndGLA8PeMqeCs2aNakxuYijkGJTb/m/R9dTMpsnBL29s KK36/Gy/Qu2UnAKul+Oi9q7+7qL915TyuVoftcodbCRyS+mvJOboS4QL7Y368DzoSaB8 N5p8hSMmDiqktj1tg1nIoOyt03Ali4WQ+qW+Jyl14Plr84uQA4yT6PRIosFtfGrh83y6 cl7uGnRD0RSG+qxA5PWwiEEoHok2wwDXxNdB+KRY0IS3Ytj3HD4dNX4Y2nYvFAZDs8v9 GYPZcip++X2DwsOKBaIZPS+PNpC4vlTLcNIRavpYJQ+DHhoAuLTYQJe9Ay7s4f7vawWA u4+w== X-Gm-Message-State: AHQUAuYT7hnPdN8YJDjdOsm335qFaLOBwoQPJ+cZmvz7Fhx7urYJsqQE MO/WRPBP2sm65jaynLbri0EVbQ== X-Google-Smtp-Source: AHgI3IbdOjjzfzIfGMyS/VYv10pq1KluUB8DHnQScXxXZLPkrvPMDOj6NELcpuoai8rjLUDHuzoDow== X-Received: by 2002:a1c:e913:: with SMTP id q19mr9497986wmc.55.1549890310832; Mon, 11 Feb 2019 05:05:10 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v6sm7419206wro.57.2019.02.11.05.05.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:08 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 233CA1FF82; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:04:51 +0000 Message-Id: <20190211130507.8710-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PULL 02/18] .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_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé 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é Signed-off-by: Alex Bennée 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 From patchwork Mon Feb 11 13:04:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039784 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ZrXoSR5U"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymJc2jBCz9sML for ; Tue, 12 Feb 2019 00:06:40 +1100 (AEDT) Received: from localhost ([127.0.0.1]:49941 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBIE-0007E5-3O for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:06:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHA-00075X-Tz for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBGw-0003pX-Hf for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:24 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35432) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBGs-0003kL-Km for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:16 -0500 Received: by mail-wr1-x42d.google.com with SMTP id t18so269388wrx.2 for ; Mon, 11 Feb 2019 05:05:12 -0800 (PST) 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=iX4jq76HTmOWv5zqJnHE2uLx9tQNLHYbX9PuDM2AjDw=; b=ZrXoSR5UVZ07SRMCmSFygBPCuzCLzVn1XQlPmNJ91X4gArO4HW/nqHuMI0mkD9ejPP h/NB1j97rgjMXS3NsG/Nf8lkJA58Ie5Qwa2fInBWgnhI7W9TIhrQLF0bTWeByLxfnZij tCTIND68VKuCAcuSvH7vffMUbjC4B9d5fDYHBisxkfx3VxBkj7eAqJxechPzOSc98VGQ qZIEhQF9/vzIut/pFm8W3c7LMo2uheATLSzsYkXzfNovCcCpZxPzTcM0pksaKjCS1pIn 9UTpyYlyWZXJvQzueMfzlU12WkocTirZUoFfHcZUzIqnN+KTXfNUpHnF9OTrciL7EEoJ 4EUQ== 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=iX4jq76HTmOWv5zqJnHE2uLx9tQNLHYbX9PuDM2AjDw=; b=H1iGnvbgAszBFV4K0cmaLnK3+7Hfvxs529eE8iGC21Vwko2gfZTbhKdSVkOOSHTzlj MgqL5L+tVwVkVcwlJ1t4hPHTug+4FSy/C4U/76e3rz2PhauxmzVpquSZ//B+Uoo6eUTz DeAZMS3QqByC6y+KVE9dD0WGmyUj1ecFcGuCpOnYTE59pebR89AXdc/v05fRT2wAs9/A VC8fAhVk+e7lk5NNsFzcXQsELfArLMWOrRzzvyPwKQXBl2DeUQ5d35yeEWgoFhBURIIH iJs3Zfejj2dbvyPG/e1ucnOocrhO3PGxxoMqACpEv3DQ+KK8c8/OTfqy5MWtIeIhYYUo me4A== X-Gm-Message-State: AHQUAuaHbWV8G5cu/Ek6Uy0n+5YqSKUlBzeYoiCPv6kzt+S50Jp0Du4L ifHwJhpaucQ3Tgi4uzAAj05glg== X-Google-Smtp-Source: AHgI3IbAMBBzu7gvKWyxB6RgtfPwc8rgPuEDx5IZqwX5EAgtjUr5t8p+ZaBoCqgB2NaumGIyBMRQyA== X-Received: by 2002:adf:dfca:: with SMTP id q10mr2437092wrn.45.1549890311606; Mon, 11 Feb 2019 05:05:11 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y20sm23634082wra.51.2019.02.11.05.05.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:08 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2EDEB1FF83; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:04:52 +0000 Message-Id: <20190211130507.8710-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 03/18] .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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée Reviewed-by: Philippe Mathieu-Daudé 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="." - BUILD_DIR="." + - BASE_CONFIG="--disable-docs --disable-tools" - TEST_CMD="make check -j3 V=1" @@ -69,7 +70,7 @@ git: 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 && exit 1; } script: - make -j3 && ${TEST_CMD} @@ -104,6 +105,17 @@ matrix: - CONFIG="--with-coroutine=sigaltstack --disable-linux-user" + # Check we can build docs and tools + - env: + - BASE_CONFIG="--enable-tools --enable-docs" + - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user" + addons: + apt: + packages: + - python-sphinx + - texinfo + - perl + # Test out-of-tree builds - env: - CONFIG="--enable-debug --enable-debug-tcg" @@ -241,5 +253,5 @@ matrix: - env: - - CONFIG="--disable-system --disable-docs" + - CONFIG="--disable-system" - TEST_CMD="make -j3 check-tcg V=1" From patchwork Mon Feb 11 13:04:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039786 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="fDD8//a/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymMx4Pkvz9sML for ; Tue, 12 Feb 2019 00:09:33 +1100 (AEDT) Received: from localhost ([127.0.0.1]:49955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBL1-0000zs-CH for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:09:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHD-0007A2-Vn for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBH9-0003yL-C3 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:35 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:42109) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBGw-0003kg-Dp for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:21 -0500 Received: by mail-wr1-x429.google.com with SMTP id q18so4602206wrx.9 for ; Mon, 11 Feb 2019 05:05:13 -0800 (PST) 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=CEUiMhz9ESqCeTHwhDpGSLgv6TEYmc9uLXBmbFAZd/0=; b=fDD8//a/Ui6trpupcB2k3bW6qw7u0p46C3l/JAye0GSZMRTETJedGj+oJvGEKEBWHw fbwpnXEiZNnZ0vxt1yRWuUMr7JUMtp8WRwHt9V0fJBoFcEsYox7Y3xV/64uTKBRT16yZ Skap186/8hmOL4KA/t4Eb1ERaYHblKKhl2Fsc18otkdzH3ucAEAxb4g5FDSR5w3fgPnE nW9qBSKL3JBIASvjxpPi2TGnYthjtRN7UNP0Vjk4iDhA1SVhBtcamlm5YRDF98zHAfnl avaOEILEiuO0+EbACPIN+l8tTkpp/3Em9w3Cs59y2tYSJAYk4FijW8rn+T334fHBJxVe q/cA== 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=CEUiMhz9ESqCeTHwhDpGSLgv6TEYmc9uLXBmbFAZd/0=; b=lOGvb85ZBD9oxokL1sZV+m+cx+mTrNm9ejsitqA3ogArHSQd1Sk5uRx0WumAnrwpHj 2YhMMlJpejtkk36q03hTE7f5snTSLo8OjT/WybWifb0+0C7BDDdTYF6Wu9MPQmzvwKN1 j9ucyetbFyEtxfBxZyeR0WOp8MMvutSGd9llr73+hsjqukMA/uaTjcQqqjpmZOsUSzdI hZvCMWIsqQrVP4s2qAEH9yBnhh9QqKX6d2eTgAYnfv4/M8osyIxX0vhXr3ByMouL2bd6 WBxgMcIM0LjtS2CXPlwkpVDOTIoFX13owYmUBt4TJCiC3RuI70tEIO2kEJ700Y2tHved /JoA== X-Gm-Message-State: AHQUAuapwDyb/EYiJCv810Olhuu8EmbRGs6RrfYiFKKynJHYsYX0eqfp ubSRUIW+XWbjJn/NcIhTmNFSeA== X-Google-Smtp-Source: AHgI3IbPjgcJWF/ht1HjUiCPclseAy8OuNr/Yqo77zr6wUissi8JDAqY6lQl5I+91koN7lSaIE3gzQ== X-Received: by 2002:a05:6000:1144:: with SMTP id d4mr26326918wrx.136.1549890312308; Mon, 11 Feb 2019 05:05:12 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c1sm11691337wrf.20.2019.02.11.05.05.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:08 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3ADD81FF84; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:04:53 +0000 Message-Id: <20190211130507.8710-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PULL 04/18] .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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée diff --git a/.travis.yml b/.travis.yml index 652be702ac..baa06b976a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,12 +97,16 @@ matrix: - CONFIG="--enable-modules --disable-linux-user" + # 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="--with-coroutine=ucontext --disable-linux-user" + - CONFIG="--with-coroutine=ucontext --disable-tcg" + - TEST_CMD="make check-unit -j3 V=1" - env: - - CONFIG="--with-coroutine=sigaltstack --disable-linux-user" + - CONFIG="--with-coroutine=sigaltstack --disable-tcg" + - TEST_CMD="make check-unit -j3 V=1" # Check we can build docs and tools @@ -162,11 +166,6 @@ matrix: - TEST_CMD="" - - env: - - CONFIG="--disable-tcg" - - TEST_CMD="" - - # MacOSX builds - env: - CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" From patchwork Mon Feb 11 13:04:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039793 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="m6QNXHpS"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymSD5CF2z9sML for ; Tue, 12 Feb 2019 00:13:16 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBOc-0003wS-F1 for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:13:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHf-0007Wf-2d for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHd-0004DI-7M for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:02 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:40398) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHb-0003lY-2o for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:00 -0500 Received: by mail-wr1-x42b.google.com with SMTP id q1so4620701wrp.7 for ; Mon, 11 Feb 2019 05:05:15 -0800 (PST) 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=zsOXDjjtA/ANapl6BEm4YA5UQgxr75Cca47eZpMJu2s=; b=m6QNXHpSc3DQnqcS1aW4KPU+WptpNxJVUh6yvolfSjU3Gzym0bf/cDlzjNBqRrT1Dg Xi3grRCKVHwvN7UDPts59K8zO/KBWSiYrN2j9dKYtKyFLGUMkXXYqyNOGOyKX9E7LZfl mQedKu1ppiFNYZHE7mQnJ8HX35fIpyqRtFDE+sMeV2fXu30wlAx3ERMMQKhH3qbHtFqt LPfRdPx9whejdHEEbxfr3da++keEkXZvTZ/Kvocdms0+s4NQQTwDGqQWWaA5Xpye841o EWXE8/C2X34VgHKulLZ6BxN/waHeQ3Ps4uJ6PNP9gOdzpwXntqGz0dTYMGegncPAWa4A plTA== 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=zsOXDjjtA/ANapl6BEm4YA5UQgxr75Cca47eZpMJu2s=; b=Dp/gxIXzgLTheY3EhLbwjXbrGCNBoUsxROEjqHMFSGsTUOrLORsRAQkew2X7kKniWh VbWqY0x43Ck0/wqe2gA1FMq71Fk7vVxVRuqZDxDzeyu7JEF9xmecyZScTWVtjdpeuTMR RG/fZ3iQR0qrw6JwNdKc73nKVLM8PgmJH5mmm+qvoZF8KMDHgvTGHI7+YHn5wP+JlMUm VPQ6QuIrj5Okf2GHhcC93WeaYwFzsdzsObGyFBU+r+kcmROA0c/imaCSXzx1OzPjfqIP oW8Lm56SkBozxgpH8SpFAx7vmTlgBoVDhESwmqoCoPD9lgscP55B/bThycelpW6anYIW yQZQ== X-Gm-Message-State: AHQUAuY6lppuHKZFlkk+8gp296EYUJsMsnaA0FKRqfcTZfU+qLk9+jvn UsWXKMtCGy5O1eHlY35h0+qEig== X-Google-Smtp-Source: AHgI3IYvkPF7PdJi7ZErarLShbFe8RHGzo73vWSRHE9Oh5W/lEuo72zwqNxJWWZar98BpTpvluNdBA== X-Received: by 2002:a05:6000:1185:: with SMTP id g5mr149485wrx.299.1549890314124; Mon, 11 Feb 2019 05:05:14 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i16sm1449837wru.16.2019.02.11.05.05.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:10 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 469181FF85; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:04:54 +0000 Message-Id: <20190211130507.8710-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 05/18] 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_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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é Signed-off-by: Alex Bennée 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/ From patchwork Mon Feb 11 13:04:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="h9YXIdA9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymVv0B5xz9sMp for ; Tue, 12 Feb 2019 00:15:34 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBQq-00064g-PR for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:15:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHg-0007Xq-Rw for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHf-0004EC-4G for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:04 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:33567) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHd-0003mF-8V for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:02 -0500 Received: by mail-wr1-x42b.google.com with SMTP id i12so267775wrw.0 for ; Mon, 11 Feb 2019 05:05:15 -0800 (PST) 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=DzjYK0ZXZnX/qRi5iTRBEhfDPhPL4DBoHWv6xqMDdt0=; b=h9YXIdA9NtTeLqLmKnnnbs3PkJRLVGzjXC+PFXNXlkpAXq9NsLsMI7i7/Po0w66qQk GT2r36wfDlnrmqu6BwvVrKex/tMIUKmOSl0wvUnZVzNJgHLSJyEZPp1hZyLbNox5jz6I uULoehUJOO56h2gwCWRQlDHey43xE+sviAsgpRJ22tvnC6AuXL36hEoaPaHMGK2eIrm5 YKJJjKW5hyOC5XaWqb9TmqF+ceqqMBax8VfGTWIieLxzGWpvfwK0XQD9a4wYmHbFopMH IaExNtHu/X3xClFzTN7dViTdsFR7kZcfMWSW/npOms/WCxYUQYlMI/BhH1pZj7+A1+Rq VgYA== 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=DzjYK0ZXZnX/qRi5iTRBEhfDPhPL4DBoHWv6xqMDdt0=; b=m5kw2Vz7yctCJXK0RKeAB2qi5cPcryQEW87WN3ahx5ARRl0LUzL++7P6bgacd21zdd ykVEmRFMB/WHgkCM1j4ddj26kTBoKSkHFfmESiUe7B5WAKiGVjs05b6sYHxW88RiM0in VkkvSY3ztPPpjApH/oStD2GSu7cFelgNanmU4KLgYMPCX80yJ1Z9LTUi5dcp+HdD9N5n TsdK4ngNzlMseAV4dDPrfX0KZ287Cay8GJy89OD2kS+//MHP1tnaiJJafDHEgdc/v/bw dYqLkkeSfS1WRntUzwxN5IvsawNsw8OxwPYuuzMKpwo/eyzSHsAHChTUpQpaJmVdmNDB 4H1Q== X-Gm-Message-State: AHQUAuYNS6pCtFxFtLwe+XsNVl4Lh3gReiIGaXC8BHYw+20oq7b9w4D/ eSeMe3TuU8eRjLcbfChJwmh4mILjgZo= X-Google-Smtp-Source: AHgI3Ia5O4tAnY6djmdjRZlvWQNys3HmF9WuFyppURl5UoPT57/tvn4z/AKHF0Ea8j1sGGT/CZZLWg== X-Received: by 2002:a5d:4686:: with SMTP id u6mr3301683wrq.206.1549890314752; Mon, 11 Feb 2019 05:05:14 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k2sm1132608wmj.45.2019.02.11.05.05.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:10 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 52EE91FF86; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:04:55 +0000 Message-Id: <20190211130507.8710-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 06/18] 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_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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é [AJB: incorporated review suggestions from danpb] Signed-off-by: Alex Bennée 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 cd "$vroot_dir" test $? -ne 0 && error "failed to change into '$vroot_dir'" From patchwork Mon Feb 11 13:04:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039792 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="OD0Iy6Mw"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymRq63Ldz9sMp for ; Tue, 12 Feb 2019 00:12:55 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBOH-0003hJ-It for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:12:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHg-0007Xr-Rw for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHZ-0004B5-4S for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:04 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:40111) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHX-0003oz-32 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:55 -0500 Received: by mail-wm1-x335.google.com with SMTP id q21so17151693wmc.5 for ; Mon, 11 Feb 2019 05:05:18 -0800 (PST) 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=7wotO7seyoEGtlZenlrFYTIMc6sHRkfKPhgm3UM4J4w=; b=OD0Iy6MwG6cjWyy4zM09r7vtC1tKLZh6kEgFulcArqs/ETXfAp9lHyx9ONithPNJbS Q+Ke9/xAkd0MSFjeHF6MwZTIliBCBgOVIFpoeY9UCDruuJHDuh0E1prS6/oJqYxSFmhs Xt6WxWxIm1wpGKTBYSkz4UJ3WhnCRLnUvxVXI4AqgmPOMXvtr5wwtm/WVpF139OgDBLU pg5DnMiP983U4oyHBOguWZ3RlrRbs0borlcb9jaBpAyl1FlEf4Ok2rY4vwe+hLZ2JtYv S7uhT0VFZHZXGb2NCsuC9hik9C//DcULVQwfv6b9GOoOj4mqUYBK1HPBGgjjCypXfNWH BNoQ== 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=7wotO7seyoEGtlZenlrFYTIMc6sHRkfKPhgm3UM4J4w=; b=FUY071oPr0qzsdtlgiQrjlLoi0wyjdSpw3uwarwETcob92O6TWcMSWx/37XViKUki3 1tobIr0qZyYcMUeeZRmweliiidF1azAQ7ZV1fPYkuZcb00F7MNiTPeU3Me33Qj5UFApG PtsiqewSUP/dtyXx/Jk/ssYw+Dt6wGf6Yv81Na1zOH9wOjIqG2f2ZOif0FEoYHt3/haK eykgYrlXHevxZMLTwYVJL0XUxnTmdIjjBtFgxXTaY4VV8Twt/nJ54bYL39GB+YvvmIub 2m+ajTPeCdaE+b6pijy5aI7oO1Uq6E3bMX+Wu719BsxTfSngEOq5Fem1xw417VyOM62f NMQw== X-Gm-Message-State: AHQUAuZij/Q3bCwqFgcdedHsJAjxfkbi2MuUWobmrIVZYBbtxM5pDjG5 CFViz2Xvb9T1vKGoROP1BLa/eQFDmQc= X-Google-Smtp-Source: AHgI3IbvrlGGaRjb/vxxSjs+ZBHiFDCPpTXBucGLj9I5JfQJlxerv1ZpVUQINbCPb5fk+6dmt4QZbw== X-Received: by 2002:a1c:4b0b:: with SMTP id y11mr9733864wma.137.1549890317026; Mon, 11 Feb 2019 05:05:17 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y185sm9134328wmg.34.2019.02.11.05.05.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:12 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5EEB51FF87; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:04:56 +0000 Message-Id: <20190211130507.8710-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 Subject: [Qemu-devel] [PULL 07/18] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée 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/tests/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=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + crossbuild-essential-arm64 diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/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 distro +# 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/sources.list + +# Install common build utilities +RUN apt update +RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata +RUN DEBIAN_FRONTEND=noninteractive 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/Makefile.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 ifeq ($(TARGET_NAME),aarch64) -DOCKER_IMAGE=debian-arm64-cross +DOCKER_IMAGE=debian-buster-arm64-cross DOCKER_CROSS_COMPILER=aarch64-linux-gnu-gcc endif From patchwork Mon Feb 11 13:04:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="F/4tcMYS"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymNf0y0xz9sMp for ; Tue, 12 Feb 2019 00:10:10 +1100 (AEDT) Received: from localhost ([127.0.0.1]:49967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBLc-0001Xv-17 for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:10:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHZ-0007S5-1n for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHR-00048s-IL for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:53 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:33483) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHO-0003pJ-1U for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:47 -0500 Received: by mail-wm1-x329.google.com with SMTP id h22so14534856wmb.0 for ; Mon, 11 Feb 2019 05:05:18 -0800 (PST) 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=cfYXt3jdwi09OihZ7AqVPIs1Vt0TXY0xmP8ZqbXxKOw=; b=F/4tcMYSiphmkMEqwEnfQ4/UFxDmfkTRQP/9fDqhoJg64Y/NbpFmLTuVmS7LOCODeE 0jo16hafEz5NkgwmNDgwFUHv55Wb3Nx6wHq9XhvRYm9K9rCV4+80y7f0sW2YzbOiJG4G dy0U3yjkv256TUi/Gd7JMViY2FhgG8+JhnNYGkDhtzilGlhXL1gvHYWzq7FukDcC3aVl niIxFVyVzVTIoOLc3j837MHMxOF0ySMzJv4BCCqBzaRGnxlyjlUHuCz89nHi6O+vlIu0 oaHvZNSPz3DnxACmA04jfDBv/+mYQXwnm9afpWjnqkPCfzIkbVhfq7nzyWag7PBAF3H0 Mjgw== 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=cfYXt3jdwi09OihZ7AqVPIs1Vt0TXY0xmP8ZqbXxKOw=; b=VrZ0JH6NuYX9VI8Y0STv3B6/1CrX0ayVaUQX9Umg5H2PyBe92ihre1p771QbAmaavx hHYdBMy9Q9ZLMAe3unaMcNYSquZiUnuk/6gKPY3ioleJuLSHSy5ndj8QMTTosMnwaIWz oIVEHlAAybxTtRhm7ZcSFXti6lalcXJovtlW857yF2TjTEEc58wUpfh8a6eeNOOIuV92 R6U1J+L3XDDk5w5z3irYjw2/eXS+PQmqBc1NDgfxsrXcESGLJMX2uliUzAF1wamJBJNo aoP/noiTJgxpGvi+Lw+lQ6LWOHPlT79R7ZjKYnDJz0vuLzguxRBGG7ZJUAb4n7/Y5Bo1 fmwA== X-Gm-Message-State: AHQUAuY4fmY8PKLug8rIa+PWEOSWuSAtHwrZ1jRaXu1kQ6o13zuR6zuK ErAs1GJAe61xWcsXyHSkzdny1Q== X-Google-Smtp-Source: AHgI3IY6ZAzxhHz1Aju+KQCZHnk6WyJd+2YjzgQwlMPUC2qOZffs8lYk1XCqy9ooEsjgBcCkmYuPwA== X-Received: by 2002:a1c:7312:: with SMTP id d18mr8339954wmb.24.1549890317624; Mon, 11 Feb 2019 05:05:17 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 2sm28872221wrj.27.2019.02.11.05.05.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:12 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6B5631FF88; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:04:57 +0000 Message-Id: <20190211130507.8710-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 Subject: [Qemu-devel] [PULL 08/18] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée 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): if not os.path.exists(binfmt_entry): print ("No binfmt_misc entry for %s" % (binary)) - return False + return None with open(binfmt_entry) as x: entry = x.read() - qpath = "/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 = re.search("interpreter (\S+)\n", entry) + interp = m.group(1) + if interp and interp != executable: + print("binfmt_misc for %s does not point to %s, using %s" % + (binary, executable, interp)) + return interp def _read_qemu_dockerfile(img_name): # special case for Debian linux-user images @@ -394,9 +394,14 @@ class UpdateCommand(SubCommand): tmp = tempfile.NamedTemporaryFile(suffix="dckr.tar.gz") tmp_tar = TarFile(fileobj=tmp, mode='w') - # Add the executable to the tarball - bn = os.path.basename(args.executable) - ff = "/usr/bin/%s" % bn + # Add the executable to the tarball, using the current + # configured binfmt_misc path. + ff = _check_binfmt_misc(args.executable) + if not ff: + bn = os.path.basename(args.executable) + ff = "/usr/bin/%s" % bn + print ("No binfmt_misc configured: copied to %s" % (ff)) + tmp_tar.add(args.executable, arcname=ff) # Add any associated libraries From patchwork Mon Feb 11 13:04:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039795 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Y4HXgM4O"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymWC3QQGz9sML for ; Tue, 12 Feb 2019 00:15:51 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBR7-0006MN-Cg for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:15:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHi-0007aB-Jm for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHc-0004Cn-VP for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:06 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:40108) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHb-0003qx-1E for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:59 -0500 Received: by mail-wm1-x331.google.com with SMTP id q21so17151939wmc.5 for ; Mon, 11 Feb 2019 05:05:22 -0800 (PST) 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=VsTFgXcfCpO8/hyDwfYb1FDhkYhY9rassK2hKUboKbQ=; b=Y4HXgM4OpVN0F+oHQSwsGI1jnCOOYsRKWXMdTTzJcf9ZK1i4R8mGPmBBy9ifeObPTk 7y3fklIIJ+EvqtQTyZbBlA3KfeIrKUjPTGvsdmbFEflNV8HrxevpE8l60oBAS2csb//i yuPeRtl6HoYqwVEjlzGres/fVIor8LJHgnhKoGKrEbT009qw4bWIQDOiOISkPzVj8gZM 3D+S7+fhvkJlAnFot2ajiekdwJ/mIurLsb0q2eFpiJx2kpG89NILg9z8H23CSY4uvbYO p3+O2/+kerunb0d/C+WNDcrKQtiA9mzojAAYnPXkcuIFid5pNJpAh1mApicic6hS+Tpq 4q+A== 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=VsTFgXcfCpO8/hyDwfYb1FDhkYhY9rassK2hKUboKbQ=; b=Uj27Oy1YvWvdjFk5NgyR7wxvO9o8r/BOSIaQbUU/EdfJNBh/CyJCgBAaOxiEo4icGu My82i46NXORbUMcJC83BmYJ2L2AYUXeq+iKp9SLkKuEt4Joe47wP/3sSEmOV9MvEXdLc 71IUNfikvoQB+Pr0MbUcrB1vLjh3ENSIjHmtWdVExEHvuuHG1x5qN2ldO16W0NJuzKnS O1B+GLh7evOSjpzx3VvrRykHSN4Ne0nu04ghzHcG7eCqz9qZtT+VZtft+MOZyK6qW/3d uT0Z5BfGmTZ05NZhCCbgGfQnCzZVb+il4j/8nwxnWHClcJ4dGK2LEmQcvRsigmiKrPzj //HA== X-Gm-Message-State: AHQUAuY3FCxl3acI4K1mP0TUlXJ03XVN4PIGV5eo4KVY/unibsKerx0j 8O9tfLr9FzS1phuARRYzO993xA== X-Google-Smtp-Source: AHgI3IbhU+xKQ3OJBTd+Cq6IXMoZYtl/qyVSiu+3t+PrlUbb6WGX0+5th2nlk0r4I4eRwLe2eT1bFA== X-Received: by 2002:a1c:f319:: with SMTP id q25mr9395298wmq.151.1549890321439; Mon, 11 Feb 2019 05:05:21 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u17sm5355931wrg.71.2019.02.11.05.05.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:14 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 77BF71FF89; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:04:58 +0000 Message-Id: <20190211130507.8710-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 Subject: [Qemu-devel] [PULL 09/18] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée 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): with open(binfmt_entry) as x: entry = x.read() + if re.search("flags:.*F.*\n", entry): + print("binfmt_misc for %s uses persistent(F) mapping to host binary\n" % + (binary)) + return None + m = re.search("interpreter (\S+)\n", entry) interp = m.group(1) if interp and interp != executable: From patchwork Mon Feb 11 13:04:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039791 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="hHeDmCug"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymRk74mWz9sN1 for ; Tue, 12 Feb 2019 00:12:50 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBOC-0003dF-KJ for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:12:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHZ-0007S3-17 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHO-00047D-1g for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:51 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:51606) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHI-0003qO-FW for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:41 -0500 Received: by mail-wm1-x32b.google.com with SMTP id b11so17638349wmj.1 for ; Mon, 11 Feb 2019 05:05:20 -0800 (PST) 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=2+MelR4KT5S9gb68buZxTVHCeI3TD9oWTrbM+yRenTY=; b=hHeDmCugBbPZlHyB/4VZnGn5j3YZyRXtxTcD6SXB6xEAuJk1GIi48aONj7uvI5s+qT K/e07UdlRNvOYmbspyz/JUqgOG5pSZxI7iqihCl9TcI0Sx7Wo7YckN0QZ1Bytu9S5Va+ cv7L/rK1h8cJ7YdpcTvIbJ7TqlSh73Z/Zu1VKuTWXmxJ7TAm0Lg0Od8WKWMoitsLyn5i WI3WdYR0ssrs2dkivWF0yGgqDyT2Sutyfs9dXmomsiw4giM3wiomfQUIhwQHRhZDWUv5 bOOWYzQEYJQosbE18I4ZLMM9Hzu3uBp+RcZSv22Z5XM7zP8BNt0jdVjyZH96god1AZ73 SeOA== 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=2+MelR4KT5S9gb68buZxTVHCeI3TD9oWTrbM+yRenTY=; b=cRQwUXm5EbinAe39/vd+MQOABs/hOval7tEoPZr27BlX/L/5sLTMe3TMtbIh/3KFr5 FnLv6y09UBzoj72fvT/u+1QpSLGFLwqUXx4RJuhKfeQJPfs/4Kffzd/TspR6OUWXGfmx QcijCPanRxd3ylb484cqcLY/piLYoWdKLsdKTK+92k07znrSQ3kXLfcCPmVtdVmhK8Rv SsTu86IOtb49nAjnPSEYvRvp4Jg3ki/Yg58rtxOYqPTZOITu5h0m0m/hKB6uwYBOKHtH oyw+aHJe6SF0NB90xvGpcoGCl9rVCT+VwO9Uefmr+uSKcc1BL9c3+LhE24Ex7JC7qDmC HUqg== X-Gm-Message-State: AHQUAua7cEUIm0WqT5GFc78vIZfjXovwqTfx/ESURAvmOhixu0BPkoOX Rr9rQbEtPaM346bo8eRGP5qdfNKw/kU= X-Google-Smtp-Source: AHgI3IbG2oLaHGk5Sve/e0lLjgFmWuSRucVM4XeImUcS38w76zAJIbfCGhzcPCEFkwXd+jBLjY+hQg== X-Received: by 2002:a1c:43:: with SMTP id 64mr9928366wma.72.1549890319513; Mon, 11 Feb 2019 05:05:19 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q15sm6472690wmj.46.2019.02.11.05.05.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:14 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 848511FF8A; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:04:59 +0000 Message-Id: <20190211130507.8710-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b Subject: [Qemu-devel] [PULL 10/18] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée 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): return libs -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. 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. + """ - _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)) libs = _get_so_libs(src) if libs: @@ -116,21 +125,26 @@ def _check_binfmt_misc(executable): 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. + """ binary = os.path.basename(executable) binfmt_entry = "/proc/sys/fs/binfmt_misc/%s" % (binary) if not os.path.exists(binfmt_entry): print ("No binfmt_misc entry for %s" % (binary)) - return None + return None, False with open(binfmt_entry) as x: entry = x.read() if re.search("flags:.*F.*\n", entry): print("binfmt_misc for %s uses persistent(F) mapping to host binary\n" % (binary)) - return None + return None, True m = re.search("interpreter (\S+)\n", entry) interp = 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)) - return interp + return interp, True + def _read_qemu_dockerfile(img_name): # special case for Debian linux-user images @@ -345,7 +360,8 @@ class BuildCommand(SubCommand): # Validate binfmt_misc will work if args.include_executable: - if not _check_binfmt_misc(args.include_executable): + qpath, enabled = _check_binfmt_misc(args.include_executable) + if not enabled: return 1 # 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 linked # libraries, once the image built any change of this executable # 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 += [(filename, _file_checksum(filename))] @@ -400,14 +418,16 @@ class UpdateCommand(SubCommand): tmp_tar = TarFile(fileobj=tmp, mode='w') # Add the executable to the tarball, using the current - # configured binfmt_misc path. - ff = _check_binfmt_misc(args.executable) - if not ff: - bn = os.path.basename(args.executable) - ff = "/usr/bin/%s" % bn - print ("No binfmt_misc configured: copied to %s" % (ff)) - - tmp_tar.add(args.executable, arcname=ff) + # configured binfmt_misc path. If we don't get a path then we + # only need the support libraries copied + ff, enabled = _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=ff) # Add any associated libraries libs = _get_so_libs(args.executable) From patchwork Mon Feb 11 13:05:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039785 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="E2P3vQ4G"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymJv4b5gz9sML for ; Tue, 12 Feb 2019 00:06:55 +1100 (AEDT) Received: from localhost ([127.0.0.1]:49943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBIT-0007T3-H4 for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:06:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHV-0007On-Sx for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHO-00047H-1o for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:47 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:38833) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHI-0003qe-D1 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:41 -0500 Received: by mail-wm1-x330.google.com with SMTP id v26so17165442wmh.3 for ; Mon, 11 Feb 2019 05:05:21 -0800 (PST) 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=vqsq91uqQypy+qfBMXYCU9y7IkJi5s3myovMUvUFn7M=; b=E2P3vQ4G3HSlgjdNqAHUVkPqsbVrg4/Jy35d6cCe7pcTDvfocN3iKSyh7Pm3BzChNO 2T/3WgugdkGW7BBSuxKq3l8fw3dMBX9sPD5lyF9Uk/7RH/fShdZaAWDG8dlt+c0fpro/ 7PMWTE+LWDwiLHlVy4+AUXbwRhIv9Z8Z9BTNUm6nyLalis0C/puNFQO5WThHkLmMxZ9w HTRiepleIHKcsTcggoD0SFRsgX0wTefJTGNOL78fr4R11yIv0mo+h6Q74G6EOCP+uYU2 9sbVroWYvg9/uBFE78OHdN4kLb/dEVv998zzA0YGsHxNpmWx5qtKOiNEnP3I8gbVGxKS u/EA== 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=vqsq91uqQypy+qfBMXYCU9y7IkJi5s3myovMUvUFn7M=; b=SaMYXAaYTtSv57U9zwOKEw/2Ug1oEWO+vKmZ453/1HqGCP07insZGuL12cT5FsOYNo sVeX734IV+ouWqs7RAWGTivuMyrqthAGJDpWv93fTXJ04+054KAU0abyj5OohPi3G8Zi 2ypjsv/5q5Im61PnR2bX5G8k5Mb7vuHLuc5s6CxEyW5k5KRsWmihru9W4dkFZ5HFrZrd usILfZQCoRcvSCLaxNhuQ8f3Aos5sqGP97UwpG6jwM6gU/ypC7xzxKQZZmCQ778tdXQJ LA33itLJ5tqyOlPnI+gROSwHqz0fQKoG8rFFgpHVcnlgjSlGx5EirZQVkxl3JwhsvXIg OHmg== X-Gm-Message-State: AHQUAuau5raEy6JBOrYKCXSnJ8QKqp8XybnId8hkbm+0ImiEOzX2EAxl xayknVWwdNpl7tn4nlXttk5I6w== X-Google-Smtp-Source: AHgI3IYWE+o5tlYnoNdvSznyCBzRphv+WVdz/l762V+f2vX2KWI9UE8hlDtTzKoFLd+e4ThifjQkww== X-Received: by 2002:a05:600c:2:: with SMTP id g2mr5733060wmc.109.1549890320481; Mon, 11 Feb 2019 05:05:20 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y145sm10389692wmd.30.2019.02.11.05.05.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:14 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9060E1FF8B; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:00 +0000 Message-Id: <20190211130507.8710-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PULL 11/18] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée 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 FILTERED_ENV_NAMES = ['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() + def _file_checksum(filename): return _text_checksum(open(filename, 'rb').read()) + def _guess_docker_command(): """ Guess a working docker command or raise exception if not found""" commands = [["docker"], ["sudo", "-n", "docker"]] @@ -59,9 +61,10 @@ def _guess_docker_command(): except OSError: pass commands_txt = "\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) + def _copy_with_mkdir(src, root_dir, sub_path='.'): """Copy src into root_dir, creating sub_path as needed.""" dest_dir = os.path.normpath("%s/%s" % (root_dir, sub_path)) @@ -96,6 +99,7 @@ def _get_so_libs(executable): return libs + def _copy_binary_with_libs(src, bin_dest, dest_dir): """Maybe copy a binary and all its dependent libraries. @@ -117,7 +121,7 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir): if libs: for l in libs: so_path = os.path.dirname(l) - _copy_with_mkdir(l , dest_dir, so_path) + _copy_with_mkdir(l, dest_dir, so_path) def _check_binfmt_misc(executable): @@ -142,7 +146,7 @@ def _check_binfmt_misc(executable): with open(binfmt_entry) as x: entry = x.read() if re.search("flags:.*F.*\n", entry): - print("binfmt_misc for %s uses persistent(F) mapping to host binary\n" % + print("binfmt_misc for %s uses persistent(F) mapping to host binary" % (binary)) return None, True @@ -164,6 +168,7 @@ def _read_qemu_dockerfile(img_name): img_name + ".docker") return open(df, "r").read() + def _dockerfile_preprocess(df): out = "" for l in df.splitlines(): @@ -181,6 +186,7 @@ def _dockerfile_preprocess(df): out += l + "\n" return out + class Docker(object): """ Running Docker commands """ def __init__(self): @@ -248,7 +254,7 @@ class Docker(object): def build_image(self, tag, docker_dir, dockerfile, quiet=True, user=False, argv=None, extra_files_cksum=[]): - if argv == None: + if argv is None: argv = [] tmp_df = tempfile.NamedTemporaryFile(dir=docker_dir, suffix=".docker") @@ -269,7 +275,7 @@ class Docker(object): tmp_df.flush() - 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=quiet) @@ -299,9 +305,11 @@ class Docker(object): def command(self, cmd, argv, quiet): return self._do([cmd] + argv, quiet=quiet) + class SubCommand(object): """A SubCommand template base class""" - name = None # Subcommand name + name = None # Subcommand name + def shared_args(self, parser): parser.add_argument("--quiet", action="store_true", help="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 + class RunCommand(SubCommand): """Invoke docker run and take care of cleaning up""" name = "run" + def args(self, parser): parser.add_argument("--keep", action="store_true", help="Don't remove image when command completes") + def run(self, args, argv): return Docker().run(argv, args.keep, quiet=args.quiet) + class BuildCommand(SubCommand): - """ Build docker image out of a dockerfile. Arguments: """ + """ Build docker image out of a dockerfile. Arg: """ name = "build" + def args(self, parser): parser.add_argument("--include-executable", "-e", help="""Specify a binary that will be copied to the @@ -392,8 +406,8 @@ class BuildCommand(SubCommand): cksum += [(filename, _file_checksum(filename))] argv += ["--build-arg=" + k.lower() + "=" + 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=args.quiet, user=args.user, argv=argv, extra_files_cksum=cksum) @@ -402,9 +416,11 @@ class BuildCommand(SubCommand): return 0 + class UpdateCommand(SubCommand): - """ Update a docker image with new executables. Arguments: """ + """ Update a docker image with new executables. Args: """ name = "update" + def args(self, parser): parser.add_argument("tag", help="Image Tag") @@ -457,16 +473,20 @@ class UpdateCommand(SubCommand): return 0 + class CleanCommand(SubCommand): """Clean up docker instances""" name = "clean" + def run(self, args, argv): Docker().clean() return 0 + class ImagesCommand(SubCommand): """Run "docker images" command""" name = "images" + def run(self, args, argv): return Docker().command("images", argv, args.quiet) @@ -539,7 +559,7 @@ class CheckCommand(SubCommand): try: dkr = Docker() - except: + except subprocess.CalledProcessError: print("Docker not set up") return 1 @@ -578,7 +598,8 @@ class CheckCommand(SubCommand): def main(): parser = argparse.ArgumentParser(description="A Docker helper", - usage="%s ..." % os.path.basename(sys.argv[0])) + usage="%s ..." % + os.path.basename(sys.argv[0])) subparsers = parser.add_subparsers(title="subcommands", help=None) for cls in SubCommand.__subclasses__(): cmd = cls() @@ -589,5 +610,6 @@ def main(): args, argv = parser.parse_known_args() return args.cmdobj.run(args, argv) + if __name__ == "__main__": sys.exit(main()) From patchwork Mon Feb 11 13:05:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="TJMVYw+D"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymRX1qxlz9sML for ; Tue, 12 Feb 2019 00:12:38 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBNw-0003RZ-Fy for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:12:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHg-0007Xs-S3 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHf-0004ED-4L for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:04 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:40102) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHd-0003pn-8P for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:02 -0500 Received: by mail-wm1-x32b.google.com with SMTP id q21so17151771wmc.5 for ; Mon, 11 Feb 2019 05:05:19 -0800 (PST) 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=PDoEy3tWqWX2zs5EXNjyUHgCRsrAEehklQidcFOYNf0=; b=TJMVYw+DMOKbiy/JipE5XnA22tK0ElBpnfRWrSk7PRasmF0g3RsBbRB/ryU9YIJxqL MEKtaLc2McsKY5wGzCbrOEb8zFabTF5e5NlLs8W7kEnAMTUk9gNPgWplU0/7ECxUKL9g Y7wBNG7vLt105RwUJGQWDkKb8dX619piSMjnthCR0AL2jBYoJKUmv2wJNkdL2gt5WjK1 rHPkWCM/lIiCPe6Kk50fLmUYBIU6IekzogluGvUA2bIZ2PgzRhNUipdFG75xm2FWukS9 tJxZa+gVXzD+BraDppY/QEjYtv1V9kMaRtQOnRiwTZU2rBTSOtPPIsY7sX/Ns41N1RDw Q5MQ== 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=PDoEy3tWqWX2zs5EXNjyUHgCRsrAEehklQidcFOYNf0=; b=ntmArTh7jQwzcmysV5tnMzhQnhEb/qUf/wqN7R+rZk3KsBGuLzHv1K58JU7tzoaq2F 2oBBYWtWnkAESv1of3LRkLhP1Ty+snFARqeewMrBPKNsG544UABrs/RNwomb7O+6dMxq pGps/KJ+/NFw/FpcNEzPnwOKP0JJg2Pk8pg4svIQyj5lWvAUGc2bdG7a+w7w1wDuJkVr TEH4FcK5G1sm1fc7/G1zHENljO3MANGTAdxPUwG4zeSFyneFiTaCDB2YK9alhqg+tRYM q5UUj+ufiuH1I7L3yYLO/uJoD/TWk4Pk8Ee3yF2o1zsFEehHEO8eaRNwTdMHFsfGgzNm 3Wrw== X-Gm-Message-State: AHQUAub12MTEg7v/nZE0uuB1w0yoFN7ptzUunWPN16+qBeHZVSqvfE2c 9EZmCWOCqDGi3MzpxC0k0gdJGQ== X-Google-Smtp-Source: AHgI3IbNxAliDpalQIHeJUCeN+HpTMmntNYyz3jovB9AWEgt4FZJYMz2U12wnjijHOzEe5WLJWSPLA== X-Received: by 2002:a7b:c3c3:: with SMTP id t3mr9462265wmj.120.1549890318561; Mon, 11 Feb 2019 05:05:18 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x10sm5951355wrn.29.2019.02.11.05.05.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:14 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9E2181FF8C; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:01 +0000 Message-Id: <20190211130507.8710-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b Subject: [Qemu-devel] [PULL 12/18] 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_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é Tested-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée 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 IMAGES := ubuntu.i386 freebsd netbsd openbsd centos -IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES)) +IMAGES_DIR := $(HOME)/.cache/qemu-vm/images +IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) .PRECIOUS: $(IMAGE_FILES) @@ -24,9 +25,10 @@ vm-build-all: $(addprefix vm-build-, $(IMAGES)) vm-clean-all: rm -f $(IMAGE_FILES) -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/% \ # 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) \ From patchwork Mon Feb 11 13:05:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="AOvmtKGN"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymdk4bnRz9sMr for ; Tue, 12 Feb 2019 00:21:30 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBWa-000225-9u for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:21:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHm-0007f1-LF for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHg-0004Ez-QU for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:10 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:55182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHe-0003rM-SL for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:03 -0500 Received: by mail-wm1-x343.google.com with SMTP id a62so17612950wmh.4 for ; Mon, 11 Feb 2019 05:05:23 -0800 (PST) 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=pO6PllOU4U1lklvhXFrabky8PLBB/bvZOVB7GJcLJic=; b=AOvmtKGNqa18Iip7hVUtvShMmIE1I15O4sEO/kHHzp7xRybGQpG3SSs0WaICy7DwOH HMqXzuhBOOHYvyG/WP/0uQJckbKF+o5RED2eUCJF5YYcOGnFsAaa6C+U2dKPcrotj+1Z RFwhx3q11FEETTdN2IWNt7V3Ol3Y5RrOeaJgMbasUx/h+C54TU++TtgK+kfSL37LGwTW fVK2v6RSUON17tfsUxNadJQpf8wpH5/hj+FN8pILHlgm9KPbWeHlgoWRHQ1ljwy4O30V j4xUyJturpOYWznO2Sj8QrPLSQ+TodxUsZN2BvGuYzWsYXOdYbNPAgsv+ayq5IFNM1B+ Pimw== 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=pO6PllOU4U1lklvhXFrabky8PLBB/bvZOVB7GJcLJic=; b=ue7g5U6MXKLkQLG1ndplRZJh/VY1KolWLu7VOm+ItqRRLKY0ZV2XsHYi1LmxoKLBEi bLOhZ5CtJqiUZFlAuTafbbHGf3dbyN3lAegVxFxTa2tXNUyaDSe/ByWQTwejO2hhuXYB Bo8iQRab4RxuGuRxplOAYWyR5x1ZoZhxxLYCtfl6ts0o94SlGMKBUgzxYf0VJFrAIeRf JCBsxXBZ3TTAKhMvrNCEPzC5q3MVNxF4aXXoP3XkkG8Nia0d1L+TJwtIK4/LZpLcVX87 9fQk4neRiYwF6HGpxdN7OEYmbrld8Nx739qcWhhJ/xAot9hWmJD8B7acamautXINUj+d L0OQ== X-Gm-Message-State: AHQUAuaFYufmFMrF2GGA5HG57H8tMaCR8bQ+mzBdz8cO45DYHPTWwCwf YfniT/O/XGpRLlxSo9mZ+sYOTw== X-Google-Smtp-Source: AHgI3IbQvu2l9mTpiL9pMbI0nnzGSUikF7K0NZhmn9pKjFP8ycOaEqXg/fXTUNj8FoGlOvZSUxbVmg== X-Received: by 2002:a1c:99ce:: with SMTP id b197mr9743554wme.75.1549890322663; Mon, 11 Feb 2019 05:05:22 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q9sm6508812wrv.26.2019.02.11.05.05.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:21 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AA6E11FF8D; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:02 +0000 Message-Id: <20190211130507.8710-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PULL 13/18] 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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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}; """ 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=python2.7 {configure_opts}; - gmake --output-sync -j{jobs} {verbose}; gmake --output-sync -j{jobs} check {verbose}; """ 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}; """ From patchwork Mon Feb 11 13:05:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="UCtx3UUD"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymht5zx0z9sMr for ; Tue, 12 Feb 2019 00:24:14 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBZE-0003JP-SD for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:24:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBOX-0004YG-SS for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBOV-000099-GF for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:09 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:40919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBOU-00007f-BS for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:06 -0500 Received: by mail-wm1-x341.google.com with SMTP id q21so17181214wmc.5 for ; Mon, 11 Feb 2019 05:13:05 -0800 (PST) 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=BOJIJj/cmWiIVTwMN8xEqo2TSIwXOH3IlTuxHWOcZXs=; b=UCtx3UUD55z8cijO1ngiFfRBa3wonrsDFxZndYi57g/Z1q4bdXDoHsqauIElX2DX+1 gZu180/trvWr7cDASmccugbpStUx9WG12j9iFnyMegcMjS1p7q7gKVOk0cnICSM/ba7o /UltFGcNrtTXgSlxTrBqEuro8X98cOI3u4sdZnXczBlLzR7dqRDigvIs2EOM5Eikdzxa ro2a1v9xfL3kklQCmMBI0nbDcY5bVFftjl6W1jHaiwdoBBHJekBE7yEw0fSJ3ijhk0Ym L6D82LButdAMyhBsAqUGEhEbZ8ws4Q5uQ1By/+7Q6A3vggGajk9WCaKQtHMl29Ca2CGl seUg== 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=BOJIJj/cmWiIVTwMN8xEqo2TSIwXOH3IlTuxHWOcZXs=; b=pMpJ9z0dmMI5YMFITbFm/+bj4odkuAlJmQvBvpykAaU728+zwFZXnrysB27vCYkhxU oLrhYs0pc8adRIB2kitwAa21lr98Upq4D1mqYEQze/EHFSieal02z5rR2efuH2dHFee5 zSrCKmXKBbWaXLlyZ6yVdtthzV/Oj/YTtucBaHX0FHNyDzsyDghfqZu7wl9s4sMdqsX6 wcBb3SzKczkkiu2tlDF8Qn7RSG6RiEc6sz6kEomZYmpzh73KsOg73gmzuhAg7wmD53EU xUup0UCpFNV/1eEX3iQchyVfRuLYSUSRw1xQdWVkmxEJG/e5sl9QTrShhCcVkHS2sjRg I1yg== X-Gm-Message-State: AHQUAuZ3wZGFfvQzoz7rXBrbFCiG+Rg/8cWjSRutnBWGe1Pd0HiL3vUT BIrCgK/aW7DrISgxp1xiMFWCTw== X-Google-Smtp-Source: AHgI3IZ9GKRcCQIdsmH0F0HbCKUOyU9Y6htS497+DaMcoK02pRfdzxUYHmhD2ycfG5GBXXBkrh8jcQ== X-Received: by 2002:a1c:c303:: with SMTP id t3mr8466287wmf.94.1549890784056; Mon, 11 Feb 2019 05:13:04 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c129sm10808259wma.48.2019.02.11.05.13.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:13:03 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B69D21FF8E; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:03 +0000 Message-Id: <20190211130507.8710-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PULL 14/18] 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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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="build image") parser.add_option("--build-qemu", help="build QEMU from source in guest") + parser.add_option("--build-target", + help="QEMU build target", default="check") parser.add_option("--interactive", "-I", action="store_true", help="Interactively run command") parser.add_option("--snapshot", "-s", action="store_true", @@ -255,6 +257,7 @@ def main(vmcls): cmd = [vm.BUILD_SCRIPT.format( configure_opts = " ".join(argv), jobs=args.jobs, + target=args.build_target, verbose = "V=1" if args.verbose else "")] else: cmd = 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}; """ 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=python2.7 {configure_opts}; - gmake --output-sync -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} {target} {verbose}; """ 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}; """ def _gen_cloud_init_iso(self): From patchwork Mon Feb 11 13:05:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039813 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="EL7J2ohO"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymm571Cqz9sML for ; Tue, 12 Feb 2019 00:27:01 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBbv-000517-Lt for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:26:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBOZ-0004Zs-Ta for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBOW-00009d-1N for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:11 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:34792) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBOV-00008R-Hx for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:07 -0500 Received: by mail-wr1-x429.google.com with SMTP id f14so300332wrg.1 for ; Mon, 11 Feb 2019 05:13:06 -0800 (PST) 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=mc3pV3b1jBXM/8K9gtWNv641oRMxvhjcT/Mlx3V8vIc=; b=EL7J2ohOwnXSiWg8SxkP8pdg2e1KSD62mP5J+4HtZGWphhpa/I30CoP3OwCKJdSVg7 tEH2sh6MFf11VWfpfmF4mFwnYPNhnPcBZsInFgrDU0kdu4L3kKSIAYJpU4+B+m2dFjaH 0k7dIp1wR1xF+TtGuczfkMNU9/HMQsTcg5mZ7UKX1f1Ismltzl6HBRnPY7HJRICnXEQt q6x6NfaJDgORQDh2/0fgXH7fvzh1RuYKdc0RDyHTf3Q1Gik5o0j9cfUWG4P4IOs8kCON /dAr/sl1YFkv/vU9hoz3x3Rs8kORQ3i/TfzwDQkCE9PkeKg4IDhJ5/chVHvTN+w7bI3d nLTg== 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=mc3pV3b1jBXM/8K9gtWNv641oRMxvhjcT/Mlx3V8vIc=; b=Diqr6PWpQ59ci+mXLzmRyRObp8jOqcZgaiqLy11FnQbBsYIUMpBzKcz8MDopDL+DTB rW3vwS/XC65WU3w27QBhXzF2lRGZKHW6yIYM35OlyN7LdqXYCC4bxrhwF+L8Y8UW+tKg 7Gk7Gq7+8w9zCz4hmeGX1mUt0qunfxPQEkXbtOScwlclWnpI5Bq3gWlveR6E12+13thC 6rhmlTcXHIrQRoyWigzuTRA828bIXX9sodlDrWIhp3CrifGBpYrTvqeSTOO5z3txTHQb yABDw+WXEviIIaRyJdRTeDgYLRsb7b7yH3TJNl8xGBqi5UvQiqVKegLzrgzidCj26YRf G6FA== X-Gm-Message-State: AHQUAubm5PM9kO9tZyF5ZCCIecMtBA5pzkagncfAVqM1G7THzd6CUu9F feBvpIONTcXLUHe6X2bW3fI/6DEDN+w= X-Google-Smtp-Source: AHgI3IaMfqSf9t3lRM+i7xzPPEW8ng9ngPzgI8lmwDW7o66hZknVVVFixMunuSvtvKHDJqqlKd+QlQ== X-Received: by 2002:adf:ff09:: with SMTP id k9mr25907933wrr.97.1549890785738; Mon, 11 Feb 2019 05:13:05 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p5sm6265619wmh.16.2019.02.11.05.13.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:13:03 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C27641FF8F; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:04 +0000 Message-Id: <20190211130507.8710-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PULL 15/18] 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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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=aarch64-softmmu \ EXTRA_CONFIGURE_OPTS="--disable-tools --disable-docs" \ BUILD_TARGET=check-softfloat Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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=foo - override the build target" + @echo " TARGET_LIST=a,b,c - Override target list in builds." + @echo ' EXTRA_CONFIGURE_OPTS="..."' vm-build-all: $(addprefix vm-build-, $(IMAGES)) @@ -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=$(TARGET_LIST)) \ + $(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \ " VM-BUILD $*") From patchwork Mon Feb 11 13:05:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="fhkIxTTh"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymgP4qbKz9sML for ; Tue, 12 Feb 2019 00:22:57 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBXz-0002hQ-MG for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:22:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBOX-0004YH-Ss for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBOW-00009v-8U for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:09 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:39315) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBOW-000090-1f for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:08 -0500 Received: by mail-wm1-x329.google.com with SMTP id f16so17208130wmh.4 for ; Mon, 11 Feb 2019 05:13:07 -0800 (PST) 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=1vPprptAUo+PfFXMQ/irpBZhbxCI/5X6gbXjJfvsHD0=; b=fhkIxTThkdr55mNPNTxM90fclH69efMHR7146mwAYiZasvb5xp7ByxzYmfIDQ86cR/ Zv0YIJ/LFMvs7Sf2VGXRMZv1PODdGTHA+wz4RjoOAATxTWQCl+3tArBmeUD+s+6jKDS5 RaU70DIu8PJ3jQvaJhprrs1e4VJHyd3q3R0nSFxEhKfw+uoK/nSDWtICjcrZTS+U+h9K LHIw435sdpZZnpvt4qQC/ILS0emqUieQAHdZRbMDglnkKWs4Q7dC3TrwHzTyIHX3QdFO nZDpXNTseamVa8cfBrlZiFgzuTw59qqhXYjXuVfR+kFhvv1U4DaeBqWVGjCbuN6YHxRR klxQ== 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=1vPprptAUo+PfFXMQ/irpBZhbxCI/5X6gbXjJfvsHD0=; b=jWthK7N6t1eOok/rn3fxjqsdSDOSZuW/EBZjeiA0LtKQ3EHRXYFJQyi9hKSbilRfL1 1K40eLJthNWaNkAIHfZA1ud6bTlwC9zY21S4DNSm9hv6uiCT00KecLtaagK7i5wUOu9P NhM04p4syps4x1e7W6Wets91LRW5hyXjFiQRDiUT8B/O6iFvwq3mIBri+gu8Eif/VkUk 7F00MTdK8+bfZ8CLueAM9MPCodvzXfpfA5yd7oLv1JVRqm4vn/GcbPrGDPfGOhzw+B4q LfMAi4FonJqgm4jVTLc1oU7FaIrkE2FWdih07W5kCeKUjfMgCN3szrFNvJVvan8mNpQx +Cdg== X-Gm-Message-State: AHQUAuYBUFfKvs5jggysQ0R+/Y3nwmAbhvmmYLq9lhfDJbq0BXNVbaDa W+nmj7OHNZfcZOxTXYSoe/hXifI2I00= X-Google-Smtp-Source: AHgI3IZO1XlhyKyr8Uhk9COs/+35zdAqQg5p0K93eu/YccOwyMfz4PcMYogpV00mrL5UKGzcy7d1Uw== X-Received: by 2002:a1c:c303:: with SMTP id t3mr8466443wmf.94.1549890786878; Mon, 11 Feb 2019 05:13:06 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m4sm11570791wrq.6.2019.02.11.05.13.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:13:04 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CE3941FF90; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:05 +0000 Message-Id: <20190211130507.8710-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 Subject: [Qemu-devel] [PULL 16/18] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée 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 LOG = logging.getLogger(__name__) +# Mapping host architecture to any additional architectures it can +# support which often includes its 32 bit cousin. +ADDITIONAL_ARCHES = { + "x86_64" : "i386", + "aarch64" : "armhf" +} def kvm_available(target_arch=None): - if target_arch and target_arch != os.uname()[4]: - return False + host_arch = os.uname()[4] + if target_arch and target_arch != host_arch: + if target_arch != ADDITIONAL_ARCHES.get(host_arch): + return False return os.access("/dev/kvm", os.R_OK | os.W_OK) From patchwork Mon Feb 11 13:05:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039788 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="VVTOyD3X"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymN96MlKz9sML for ; Tue, 12 Feb 2019 00:09:45 +1100 (AEDT) Received: from localhost ([127.0.0.1]:49963 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBLD-0001Ck-MT for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:09:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHc-0007UG-VS for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHb-0004C4-1E for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:00 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:34174) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHZ-0003rV-9q for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:58 -0500 Received: by mail-wm1-x32b.google.com with SMTP id y185so14539541wmd.1 for ; Mon, 11 Feb 2019 05:05:24 -0800 (PST) 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=GzWjQ/ZFc5riiSufmyolljmsAwA5/pdBwRd25HGBN8c=; b=VVTOyD3XRBv0xICob574R88ZA+QtHgLYFhkk9XmaRv+ZaOtNP1E6zx1rHDOxKgGdJf Lcau5kDH/g1aZ3C2xGFoI8TeIQ4GAvYYUA7FiLEfarc8RUq78l/mWLmTXO+g07RLFgkf bOrCfiLKknHHvyBh2JJvkuAJZ0wE8a9ei6Krr8VMtnE5zbFOhD1wSY1P0Yi8F6yJI+9c WR1Kg4AlJpQuu0P9qYVo6LuOityjhLTRQ8OZPC0QVatSP0S2XWeolhA/eEWJpsnyRS/Z N17e5UIDccRm4TiUeQ76BCg7EUw6euxEqgOiXFaRUWCzAacrJQOwGUuuAMiWEOqnEW9g Qc+A== 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=GzWjQ/ZFc5riiSufmyolljmsAwA5/pdBwRd25HGBN8c=; b=Ub39jKP0MulRu2sjn+XBk94DX744mGdJgHokR2V15L834nC0j/K2V+G8lY9VY4r8YB BnEMPqoOhqDVJ+aYzWtsqFxfkcbvnSqtsyA7VdpHWRdMXFOFsPHZ/Efv2uW8Jq1MXudz fWgkmm6GCAwBcnNhFqwIyOgQk59HqK7esJNuSf1IHHBP8VJCFCj06gRg7SSJYT6JAh95 GN9onTyXFZvN0MiaKNw/7qUA7SdmdkIhiRQThcNqSlfhLs4qHy//aiRUQTiAc8LcqR+6 5u/CseyUUhC0tpJvqJtJTqqkmpp6qfI+dLQhjX4czpAgjYcaC1X6Ly8E909LDXQY7394 ND4A== X-Gm-Message-State: AHQUAuYrisH79ur3MGtHlQB6UAzZc4kevOPMK6m6GBtawwM4ng05APUH hPPEWlv1w2olJw0vSZI59ngLSA== X-Google-Smtp-Source: AHgI3IZbT7bPv+89LFLpQXlGzB6GDQzffzxJZ6oJjwjTdLpCCfpWX9Dw8GlbBOpfpzxT+QP82v05BA== X-Received: by 2002:a1c:2c6:: with SMTP id 189mr9032125wmc.21.1549890323299; Mon, 11 Feb 2019 05:05:23 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k2sm1132861wmj.45.2019.02.11.05.05.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:21 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DA2771FF91; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:06 +0000 Message-Id: <20190211130507.8710-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b Subject: [Qemu-devel] [PULL 17/18] docs/devel/testing: Add -a option to usermod command on docker setup 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-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Murilo Opsfelder Araujo Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Murilo Opsfelder Araujo The option -G of usermod command will remove user from other groups not listed, i.e.: $USER will belong only to group 'docker' after following the documentation as is. From usermod(8) manual page: If the user is currently a member of a group which is not listed, the user will be removed from the group. This behaviour can be changed via the -a option, which appends the user to the current supplementary group list. This patch improves the situation by adding the -a option to the usermod command, which will just append user to the supplementary group list. Cc: qemu-trivial@nongnu.org Signed-off-by: Murilo Opsfelder Araujo Message-Id: <20190207184346.6840-1-muriloo@linux.ibm.com> Signed-off-by: Alex Bennée diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 18e2c0868a..135743a2bf 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -301,7 +301,7 @@ An alternative method to set up permissions is by adding the current user to .. code:: $ sudo groupadd docker - $ sudo usermod $USER -G docker + $ sudo usermod $USER -a -G docker $ sudo chown :docker /var/run/docker.sock Note that any one of above configurations makes it possible for the user to From patchwork Mon Feb 11 13:05:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1039811 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="jSZFlEkt"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymkF05TSz9sMp for ; Tue, 12 Feb 2019 00:25:25 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBaM-00043W-W5 for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:25:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBOX-0004YI-T1 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBOV-000093-Fd for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:09 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:37300) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBOU-000080-9t for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:06 -0500 Received: by mail-wm1-x342.google.com with SMTP id x10so11807030wmg.2 for ; Mon, 11 Feb 2019 05:13:05 -0800 (PST) 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=CYr2xPsykPj/7p5MvFTdAIDU/Wma9drz6MHg7aOm5k4=; b=jSZFlEktD8LSU/ygopxo/zleDtd8qm+l4mLETHGNA6jXCCQHJ+vlVyZAREy0a+wZ2d VuzSF/C988kWh/PAvIGpF3Rrs712DGDHeUTCM9TUFp9x/eyDYV4NYjblWkVXAnELF/kn XzynsetcceQwke5JNnsPvL3l8Mps/68TBeTgYZaCrUj9SkLMQ+YIRKQUTqx0Y4Dju7TO /ZKcwJh5BSUfiyob4iQ4I05rbYq/VyjUhgWul2G9dQyM1BCfzfmnkC/c8k5G/fKQj9qA 2f0G2+t3ynXT9SGBc9E8scwseHv7EPkIGQeNb0c+fOjD/FZ3hJ9nQGgDEbw4g3/piPhq ZM0Q== 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=CYr2xPsykPj/7p5MvFTdAIDU/Wma9drz6MHg7aOm5k4=; b=FZQrOPW/tQoMdget5UmA8DKAvsyYoeW9OCPi8L+m3N+GvUJ56HyWeCftdpQfZEExT/ CUz6Mhot1peH9cjlvlKfQEMkGg4Ab41lKIIwmPsoOD43hihfz6I3rUi3XpPpD0jt64Cn Ir9LK26P+QnCoMOHqVXdjPLrvmQn3TZhoA9GZcREOUKZiaSs8rrUDuarULzVbME7yVOK I2aG0ZemCn30xJIP1OJfkSDA7xv+Yt2cKMUuvuRiDLeQ17AiQVPzTwgx7nUogvdnrb+Q PWvcAZujufYmSgK2Y6Erb7fDCGyp1cBLWVkjm2cxzE+qUvn18KHQXGcj6nwHaol1BTqN uDuQ== X-Gm-Message-State: AHQUAuYUIVPNlHys6FCBjG6PTmMyav5bN57zJZBKeB1yqNuJjO0jJSu1 jJYEVkHbu+w9UazqcEzuj3fm7g== X-Google-Smtp-Source: AHgI3Ia1xjG+Anm0IsTJdb9x6Eju47G0KVtfuAknnjNAgwae8aBFRnCoXICIyZcbQfjLvx5gipVh7A== X-Received: by 2002:a1c:a9d0:: with SMTP id s199mr2904649wme.142.1549890784796; Mon, 11 Feb 2019 05:13:04 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c18sm15536388wre.32.2019.02.11.05.13.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:13:03 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E69301FF92; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:07 +0000 Message-Id: <20190211130507.8710-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PULL 18/18] tests/vm: Be verbose while extracting compressed 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_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Depending of the host hardware, copying and extracting VM images can take up to few minutes. Add verbosity to avoid the user to worry about VMs hanging. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190129175403.18017-2-philmd@redhat.com> Signed-off-by: Alex Bennée diff --git a/tests/vm/centos b/tests/vm/centos index daa2dbca03..ba133ea429 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -65,8 +65,9 @@ class CentosVM(basevm.BaseVM): def build_image(self, img): cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz") img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp + ".xz"]) - subprocess.check_call(["xz", "-df", img_tmp + ".xz"]) + subprocess.check_call(["xz", "-dvf", img_tmp + ".xz"]) subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"]) self.boot(img_tmp, extra_args = ["-cdrom", self._gen_cloud_init_iso()]) self.wait_ssh() diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 1d64c31b7c..b0066017a6 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -33,8 +33,9 @@ class FreeBSDVM(basevm.BaseVM): sha256sum='adcb771549b37bc63826c501f05121a206ed3d9f55f49145908f7e1432d65891') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index a2c3d13af4..4c6624ea5e 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -33,8 +33,9 @@ class NetBSDVM(basevm.BaseVM): sha256sum='b633d565b0eac3d02015cd0c81440bd8a7a8df8512615ac1ee05d318be015732') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) diff --git a/tests/vm/openbsd b/tests/vm/openbsd index cfe0572c59..2105c01a26 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -35,8 +35,9 @@ class OpenBSDVM(basevm.BaseVM): sha256sum='8c6cedc483e602cfee5e04f0406c64eb99138495e8ca580bc0293bcf0640c1bf') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)