From patchwork Fri Mar 5 09:23:20 2021 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: 393472 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp263051jai; Fri, 5 Mar 2021 01:23:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzj0u/16CVJJSFIj7jQwj46XkyOWKKGs0We6kIU85flQqbWEbAOH65YmkvnQWq7k9jg43S3 X-Received: by 2002:a92:ce89:: with SMTP id r9mr7219382ilo.191.1614936237419; Fri, 05 Mar 2021 01:23:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614936237; cv=none; d=google.com; s=arc-20160816; b=kqaC35aljIzF+G4DFzjK5SVSQ7z/QYKk/8Lga14HixGeSSOvKyBPYl6T+1+IohTDMY rgwqLBQv4EI+UZfeyZX+5JoWNsELXlKrcVUsc6aKVWN+SAQxzDGrqyKh9PL7jMQfiIWM a4Jm0Imn6v/UWInc6EpaBNvzXibQ79lgz4uhxxUwwVIQW8nkG8V2Umd+2dx/BhKa857n EQDiVmk+JJNq0lrsY/OtG9/OuLwKw1NMEJdmqaEbAeiiSoGIOjhgba16j5YPlZZcTB+r wB0deN+xPx2gjlvc3e8yL+ejjvDuxXGJenkkNXauv0sQIlo4WBjcANGVcE4rO1MICCe0 nbpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=QEfIOEPful5NjNoG4+Pf/ZTRrzPfAxfv9TXcP60ZkCg=; b=anMnW9izPvG3Vn7oia77RLMIeM7qtk07XV1DZhZcYETaApnp0Gm7VVLWXVNzvZ327i syunob7tM+4Jtod9KkAakkGfTlVln6Hfoo0S8XkIkah+ru77DyzZpsN8QXUW5DkHezZn B8ula/Ky+C229OO5fhLyQ4w7eF7YBi/uEPBXAe+z70s9405qjiZO702CBcXGYeFfeBhD xUludCwO7iy7mepzJrNvI5dqjzBd+q6f2PxVHXK6KPKNkJ3cHKE5pjgWEw4vfkU/ri5/ NEBnhPIH1Ma2Az6zlntFGBazLGeXtQ6W1tfWJwqRCAqPhH+5ojePeBxDvBoqW1MTy94O pgGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PCWLajtn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b7si1726088ilo.93.2021.03.05.01.23.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 01:23:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PCWLajtn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI6ge-00013R-QQ for patch@linaro.org; Fri, 05 Mar 2021 04:23:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI6gL-000136-7N for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:37 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:33747) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI6gG-0004GQ-Ro for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:35 -0500 Received: by mail-wr1-x42e.google.com with SMTP id 7so1301516wrz.0 for ; Fri, 05 Mar 2021 01:23:32 -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=QEfIOEPful5NjNoG4+Pf/ZTRrzPfAxfv9TXcP60ZkCg=; b=PCWLajtnZTQ6J9nFVfwFRFeQ7a+D2OX2q3uEh5exF/hBD5leWbJReuYHaonc/bjjJD Gx0vY9nScDbKcDYU15pM7PhfUbEweaxnv4OhcEjSOxSlW/a3tTubQLP30/S2OsuACtd6 PzrvVHHbm1jJYSn/ci5nfSY174H+lfT1V9saiNSmY4OCCKxxcovqOihHluOzmkS94397 +o6FpPYEgp75vchPm9m4leBfKmCQLxPTSvNSapLd64crNlrsNJv09+BbO8C55yPrkGFa 4PqqlMBkvf+8qE5Q2YOoeW71kN+JCL+nwImcdSrdbyEGiagbQx4/NHn0fuDLZLwQ0t/D v/RA== 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=QEfIOEPful5NjNoG4+Pf/ZTRrzPfAxfv9TXcP60ZkCg=; b=pzAIvASTv8ywJP+q07/iWG8N88IG8eNEKzCeHSe5pNlQNrwZ/Ge8EyMOwxKeVrUScB VadaACmc4sadQTeN4pUfTN8zGWbZzhSzmypM3km0X+VKwVqyIrV60bzy0wZxl7ElGZYQ C0i4697hYp/jJR7Uqk1JKXpZqkBqFnvSGjGDPzMbKhw2h1/H94OTTiskQVvIRbaejYau AOruOnzcxgCwi2JiyFmb5nY+50wdD1WbIW5LnCNVNaaCZoLzAM9pFdYeNkqptbVwJpuw PoVUYkYh3BesFkbACwKtuzNxrqMMdamCpLltV0zkD8YyZnCqbeDQ0ew6K6BkFIEUJfcm eOBQ== X-Gm-Message-State: AOAM532JNMgt7LFBIsueMEBP3pmxjphaizIUtfsOytX2GEI4UDNOjYqF d33zNidMHnnYi8//KrAtdY9INw== X-Received: by 2002:adf:e409:: with SMTP id g9mr8031007wrm.423.1614936210466; Fri, 05 Mar 2021 01:23:30 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o10sm3332428wrx.5.2021.03.05.01.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 01:23:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 083B31FF87; Fri, 5 Mar 2021 09:23:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/9] docs/devel: re-organise the developers guide into sections Date: Fri, 5 Mar 2021 09:23:20 +0000 Message-Id: <20210305092328.31792-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305092328.31792-1-alex.bennee@linaro.org> References: <20210305092328.31792-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The list of sub-sections was getting a bit long and sporadically organised. Let's try and impose some order on this hairball of documentation. [AJB: RFC because I wonder if we should make a more concerted effort to move bits of the wiki into a canonical maintained document. There is also probably a need for a quickbuild or tldr section of the build-system for users who just want to build something.] Based-on: 20210223095931.16908-1-alex.bennee@linaro.org Signed-off-by: Alex Bennée --- docs/devel/index.rst | 32 ++++++---------------------- docs/devel/multi-thread-tcg.rst | 5 +++-- docs/devel/section-apis.rst | 16 ++++++++++++++ docs/devel/section-building.rst | 13 +++++++++++ docs/devel/section-concepts.rst | 21 ++++++++++++++++++ docs/devel/section-process.rst | 11 ++++++++++ docs/devel/section-tcg-emulation.rst | 19 +++++++++++++++++ docs/devel/section-testing.rst | 20 +++++++++++++++++ docs/devel/tcg-icount.rst | 6 +++--- docs/devel/testing.rst | 6 +++--- 10 files changed, 115 insertions(+), 34 deletions(-) create mode 100644 docs/devel/section-apis.rst create mode 100644 docs/devel/section-building.rst create mode 100644 docs/devel/section-concepts.rst create mode 100644 docs/devel/section-process.rst create mode 100644 docs/devel/section-tcg-emulation.rst create mode 100644 docs/devel/section-testing.rst -- 2.20.1 diff --git a/docs/devel/index.rst b/docs/devel/index.rst index ae664da00c..2af7bf8736 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -13,29 +13,9 @@ Contents: .. toctree:: :maxdepth: 2 - build-system - style - kconfig - testing - fuzzing - control-flow-integrity - loads-stores - memory - migration - atomics - stable-process - qtest - decodetree - secure-coding-practices - tcg - tcg-icount - tracing - multi-thread-tcg - tcg-plugins - bitops - reset - s390-dasd-ipl - clocks - qom - block-coroutine-wrapper - multi-process + section-building + section-testing + section-concepts + section-apis + section-tcg-emulation + section-process diff --git a/docs/devel/multi-thread-tcg.rst b/docs/devel/multi-thread-tcg.rst index 92a9eba13c..5b446ee08b 100644 --- a/docs/devel/multi-thread-tcg.rst +++ b/docs/devel/multi-thread-tcg.rst @@ -4,8 +4,9 @@ This work is licensed under the terms of the GNU GPL, version 2 or later. See the COPYING file in the top-level directory. -Introduction -============ +================== +Multi-threaded TCG +================== This document outlines the design for multi-threaded TCG (a.k.a MTTCG) system-mode emulation. user-mode emulation has always mirrored the diff --git a/docs/devel/section-apis.rst b/docs/devel/section-apis.rst new file mode 100644 index 0000000000..ab1f6bed60 --- /dev/null +++ b/docs/devel/section-apis.rst @@ -0,0 +1,16 @@ +********* +QEMU APIs +********* + +There are a number of APIs in QEMU and the following sections document +some of the most important ones. For tose that aren't documented here +you can also find notes on usage in the header definitions. + +.. toctree:: + :maxdepth: 2 + + atomics + bitops + loads-stores + memory + tracing diff --git a/docs/devel/section-building.rst b/docs/devel/section-building.rst new file mode 100644 index 0000000000..e6e9fa1d6a --- /dev/null +++ b/docs/devel/section-building.rst @@ -0,0 +1,13 @@ +************* +Building QEMU +************* + +The following sections deal with how the build system works, how it is +configured and some basic guidance on how code should be written. + +.. toctree:: + :maxdepth: 2 + + build-system + kconfig + style diff --git a/docs/devel/section-concepts.rst b/docs/devel/section-concepts.rst new file mode 100644 index 0000000000..566c52e90a --- /dev/null +++ b/docs/devel/section-concepts.rst @@ -0,0 +1,21 @@ +************* +QEMU Concepts +************* + +There are a number of high level concepts that are useful to +understand when working with the code base. Perhaps the most pervasive +is the QEMU Object Model (QOM) which underpins much of the flexibility +and configurable of the project. The following sections document that +as well as diving into other concepts that are useful to know if +working on some areas of the code. + +.. toctree:: + :maxdepth: 2 + + qom + clocks + reset + block-coroutine-wrapper + migration + multi-process + s390-dasd-ipl diff --git a/docs/devel/section-process.rst b/docs/devel/section-process.rst new file mode 100644 index 0000000000..3b0ae4f19b --- /dev/null +++ b/docs/devel/section-process.rst @@ -0,0 +1,11 @@ +=================== +Development Process +=================== + +The following sections detail aspects of the development process. + +.. toctree:: + :maxdepth: 2 + + secure-coding-practices + stable-process diff --git a/docs/devel/section-tcg-emulation.rst b/docs/devel/section-tcg-emulation.rst new file mode 100644 index 0000000000..81fa131de7 --- /dev/null +++ b/docs/devel/section-tcg-emulation.rst @@ -0,0 +1,19 @@ +************* +TCG Emulation +************* + +QEMU was originally built as an emulator capable of running binaries +for one architecture on another. The following sections describe the +internals of how the Just In Time (JIT) Tiny Code Generator (TCG) +works. You only really need to read this if you are interested in +adding new architectures or fixing existing architecture emulation. + + +.. toctree:: + :maxdepth: 2 + + tcg + multi-thread-tcg + tcg-icount + decodetree + tcg-plugins diff --git a/docs/devel/section-testing.rst b/docs/devel/section-testing.rst new file mode 100644 index 0000000000..c93ff4c4dd --- /dev/null +++ b/docs/devel/section-testing.rst @@ -0,0 +1,20 @@ +*************** +Testing in QEMU +*************** + +QEMU is a large and complex project which can be configured in a +multitude of ways. As it's impossible for an individual developer to +manually test all of these we rely on a whole suite of automated +testing approaches to ensure regressions are kept to a minimum. + +The following sections give a broad overview of the testing +infrastructure as well as some detailed introductions into more +advanced testing topics. + +.. toctree:: + :maxdepth: 2 + + testing + fuzzing + control-flow-integrity + qtest diff --git a/docs/devel/tcg-icount.rst b/docs/devel/tcg-icount.rst index 8d67b6c076..eb990b0976 100644 --- a/docs/devel/tcg-icount.rst +++ b/docs/devel/tcg-icount.rst @@ -3,9 +3,9 @@ Written by Alex Bennée -======================== -TCG Instruction Counting -======================== +================================= +TCG Instruction Counting (icount) +================================= TCG has long supported a feature known as icount which allows for instruction counting during execution. This should not be confused diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 1434a50cc4..af98efec8c 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -1,6 +1,6 @@ -=============== -Testing in QEMU -=============== +======= +Testing +======= This document describes the testing infrastructure in QEMU. From patchwork Fri Mar 5 09:23:21 2021 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: 393475 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp264437jai; Fri, 5 Mar 2021 01:26:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJzdXUA7M1jLuJDuIfTkdiWlwucTovGRNAGejmbnzb5Dz/rmOniRXsHP83DuFQ4Y0R1XWZ73 X-Received: by 2002:a92:b50e:: with SMTP id f14mr7502407ile.77.1614936398998; Fri, 05 Mar 2021 01:26:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614936398; cv=none; d=google.com; s=arc-20160816; b=q2ZjbJqhdcqx7VXZ7lhRa82ryz5HgbTfpGmbJM6PNY1xxXEk+Md8clgvwRPtHqgxa/ BsrawBCmYnBsKFA2BODCXfHw845O5a2av1VpE4Crvt4ab8n9b6QcUO5KCnB2rnb1f61m 2rdhXOOygjWe4CC24i5FNF/rVRN7JjpcHc8U4uq3OBktVXAaUBCt57nhAmdLxpMPyKTn cBvrFubPkIsk6/oDZYslKpWQ1Hq01NTPV4uPlJAOJg6Ww6ZJTG5Q3mJ/BN3y5780jDfW kK6pnsB5V81MC3zBvDjQ8smf+77D2bAePqAepRc8rEo5bu7KraXLvbsnLFkkdBi5n5ym kQaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=SI1BWVRHAX1ErzEiSC9pkD2SXvG3GEi5CNrymtvJHJ8=; b=NYV+J4W8L8pUxu6y2HOofcSXc8iejVWG1FaUGRZaaBjVyTMk8jvvcxnHVHJNyXu1yl AVqkjah/Zc9dxPC3xa/n3gpv6DaaTmDgYaWGQGt39P7U/Yyjkgn60XW1dEbCH7qkbmzh p8sZAC9JYb4+yRrm8TKiA2q9GuXjkQkM5UQwmf6Jo4Ih2TacRJr0zoadXoYv/XyldB0R nRGedjV4Ohj++gO2IzywPfQ0EldAm0qNTljHMtTcB3yh/NWUY0m2DQAtmvWbMa/wQk+a ckO3SndvYCDMKVCEPv1oboHD3P3AJSabuQLnJp4G9hdAmE880Elc46rK1X8rD1Ipf60v G75A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mf6XOrUG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x10si1879645ion.14.2021.03.05.01.26.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 01:26:38 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mf6XOrUG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI6jG-0003sz-Df for patch@linaro.org; Fri, 05 Mar 2021 04:26:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI6gM-00013v-Q9 for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:38 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:38964) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI6gI-0004IS-OE for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:38 -0500 Received: by mail-wm1-x333.google.com with SMTP id u125so798935wmg.4 for ; Fri, 05 Mar 2021 01:23:34 -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=SI1BWVRHAX1ErzEiSC9pkD2SXvG3GEi5CNrymtvJHJ8=; b=mf6XOrUGS70exrv9Iu2BUc6AO0TYS7JQWfEEhEnudOhOQWz0t530NlVcce0SAnd2Il eBAfwSx8cVLkabE5LuqPqHSRO83tQtWXlHtam1Ihgvv3iIW7BNUiCLGGN1hcKdxeyd7W pwfT5Az2/dvqtyyyuX7cV0fA5H/ARKl/r8sxIOrzGv43wZJ3YeqwBbbs7CRnhKGy1jCw 8K6wosyClvO2TKeeNSO8yCYSTNx2szbhyxOqQKbeNwSHT9NvK85Aag8GIR+WN27vVYSe xw5cVUER9bfYJVB7Pr+GvzCuvjgNgISa5vCv/ltBZul7TmtLJppKdZWEeoWkyEQB9TOo ElnQ== 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=SI1BWVRHAX1ErzEiSC9pkD2SXvG3GEi5CNrymtvJHJ8=; b=blmPo6WF1DYzXjW6F2ZJPRvyYcufBi5faLxLTKbLtjpQJmxuiVqLkpPPCYqY20GxNa lk3TD42PyNEdmfbUOXE+LPMSVDQRiKRNgIi2TetSOVSBAG8w+r3T7a5W+9qwsiv3WIb5 dYF8vGSOwK9sZ5BWgOTh1zMIYQMdqAKw28LfA7srxEt1JP2R3O6XoSV4YwfYsVTMyV7T JtsNDh0te8TCdInoWMZGBK5mGQxdwv5tuA7umCK18kXm3qZQuSx6n17eK56FKsCuaUUL APWq/6KGjmIrFXJx+aSVXOCHNei+cihRjs7QEy3PTq51GGtdbFaaPRJHTLEoK69urALn 9I9g== X-Gm-Message-State: AOAM533WraU0o3TYrScBuL17uCRGE2e+Jy/rZvBCZofaVUTBk8TTt6ld xm7G4TKE26+FxllmCTGGpC9Ffg== X-Received: by 2002:a7b:cb81:: with SMTP id m1mr7929445wmi.117.1614936213212; Fri, 05 Mar 2021 01:23:33 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r7sm3671116wre.25.2021.03.05.01.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 01:23:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 209BD1FF8C; Fri, 5 Mar 2021 09:23:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/9] docs/system: add a gentle prompt for the complexity to come Date: Fri, 5 Mar 2021 09:23:21 +0000 Message-Id: <20210305092328.31792-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305092328.31792-1-alex.bennee@linaro.org> References: <20210305092328.31792-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, John Snow , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We all know the QEMU command line can become a fiendishly complex beast. Lets gently prepare our user for the horrors to come by referencing where other example command lines can be found in the manual. Signed-off-by: Alex Bennée Reviewed-by: Stefan Hajnoczi Reviewed-by: John Snow Reviewed-by: Thomas Huth Message-Id: <20210301112741.31047-1-alex.bennee@linaro.org> --- v2 - minor grammar tweaks suggested by Thomas and John --- docs/system/quickstart.rst | 8 ++++++++ docs/system/targets.rst | 2 ++ 2 files changed, 10 insertions(+) -- 2.20.1 diff --git a/docs/system/quickstart.rst b/docs/system/quickstart.rst index 3a3acab5e7..681678c86e 100644 --- a/docs/system/quickstart.rst +++ b/docs/system/quickstart.rst @@ -11,3 +11,11 @@ Download and uncompress a PC hard disk image with Linux installed (e.g. |qemu_system| linux.img Linux should boot and give you a prompt. + +Users should be aware the above example elides a lot of the complexity +of setting up a VM with x86_64 specific defaults and assumes the +first non switch argument is a PC compatible disk image with a boot +sector. For a non-x86 system where we emulate a broad range of machine +types, the command lines are generally more explicit in defining the +machine and boot behaviour. You will find more example command lines +in the :ref:`system-targets-ref` section of the manual. diff --git a/docs/system/targets.rst b/docs/system/targets.rst index 560783644d..145cc64551 100644 --- a/docs/system/targets.rst +++ b/docs/system/targets.rst @@ -1,3 +1,5 @@ +.. _system-targets-ref: + QEMU System Emulator Targets ============================ From patchwork Fri Mar 5 09:23:22 2021 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: 393479 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp267991jai; Fri, 5 Mar 2021 01:32:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZ2axr2qUoIYClnv6CYqMJF8u6Egwc8x6L6/60VTbawiv5HFHcpVkaKTPYjI98vvrK8Gc2 X-Received: by 2002:a9d:881:: with SMTP id 1mr4850168otf.329.1614936753839; Fri, 05 Mar 2021 01:32:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614936753; cv=none; d=google.com; s=arc-20160816; b=WUwLZjt4J5zU+Dt3J7DHbW3Tn+snoqNIhxUKg1wbLJ+Wr4kRhve09xm3tNC6P2KFwO uRlgvigO/OxlZftm0ZUYIEtvr8+XzS4v9llFiMOY8pbODMNzTwT9qgT105fArLIEp5ig WveJK1+jFMYb4OdpwplpGMX1dbncwaU7d/BjLmtTkVY9iOEYi8SpRaITIkK1Jx1EidZX 4YtNJZiwVpBnDPeQTDYvWDMqA0BRaOwFPe6RyrCbIkg8EPYiDvepx0Bl1gShC459Uqss x5pZPTtGqPSfUCcpy7jds/RAytjFKtZ22zNEOsd4fej0XbhHMX8fFcC+0q5VlDFGUMk7 E4kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=uKQWxVwgxygYQ7LgI/xiLI0s1GHCcjX+cZ0DX5HRE4c=; b=JmpW/cIKL6vc64/c6U6+XWdnqC/0Jbf+LKA5QVB0OQTKcjaljdk3ZPMZgUWK3jT1WV IyaM026ivT6/P8DyDVidthVht9V6ikbV/muhXCif0//JqvCrSozVC58h/cu+DcUfgPuo UFrgkyOWvQFErTPqB+hwwDRBPSWL4jNcTQkUAJ2lAEpPmb/bQKQsMZTuOmQrp0RhGSOw AxACeZBNN7Ns7yI9mrCVmVj3ILgAz0ILSaumVduxIIiihzrnqH0mk+wkSiFP9ndEGh6l Jcd2lVC4DYq98ewKkZsu82IgukANiRyvjGjcfUcmIrwdOyxnyU/y0YUJ3tRgDcHzvw1j aVyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PEul8SeB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c36si2024694otu.243.2021.03.05.01.32.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 01:32:33 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PEul8SeB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI6oz-0008JO-9T for patch@linaro.org; Fri, 05 Mar 2021 04:32:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI6gT-0001CP-De for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:45 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:38420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI6gJ-0004Ig-9H for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:45 -0500 Received: by mail-wr1-x430.google.com with SMTP id d15so1284329wrv.5 for ; Fri, 05 Mar 2021 01:23:34 -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=uKQWxVwgxygYQ7LgI/xiLI0s1GHCcjX+cZ0DX5HRE4c=; b=PEul8SeBRF04WvhZkrBDUjl9y8unFA/utvpRXk5BZ33ANwtrodLk2rWh2x+cQknW2b KWiXo9TtLndDOCi0WKjxn4H+yczCSXmFmUVmyQNsrEPt8+ro2E2NzImXCZOBCRH7oDmR CWx9GMEKT++bPqGvz+bdhBzlvf/ktyvXgjPlAgjEl61nkBDpdqS40ST+Q0TrZo9hPYVa wNsOJOgl7OHkymJO2l+wqUJAWUhrMrwM5IJzwzToFIhXNCvU1KZA/PtI/JsSSbcraVgn CgiUth7R8Et8fwZcpU9NOPaT1XTNVd0DGKdH/ruioovaTuSKUe0/67U/K7WjLPHXn0yk TUzQ== 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=uKQWxVwgxygYQ7LgI/xiLI0s1GHCcjX+cZ0DX5HRE4c=; b=c4cxyR+mwHFRosJMyicvH2XEy9Y72onSWfjugi+AxfVXvMabAtLzUI0zGeOmvfm3cs vvXRtVVyZXX3jEh/b0mKbOpm9uQmzPXHqxOs9ZcW+xMVrskEY3/1EDN/yha/i6VbsOr7 oU24dWzoMvXdgZhEbFq/rFpReVr8D2EFSpxdm8EBW82ZsEglx4N4W8/+Ky8f19kHlaUy cO9kJOWjIoCctGTvGXH3m3B+6BuH3WCe07n+jRX80NTvVUbBy2YIQmcjKOCRobI9RZid zvaqo1G1DWTo3LK431Q8BSAAlhN8XZ5/yAznuqGj8r6QUE9Hi5T8zcyxb6mpj008GX+H amPw== X-Gm-Message-State: AOAM531F7JrJOtiU8IH0tpKGxr6bgKIO2KYehVRnbRrPxngBlZdEck9F msAYlYF8+G3RZDcx1oamALWdoA== X-Received: by 2002:adf:e94a:: with SMTP id m10mr8231068wrn.55.1614936213780; Fri, 05 Mar 2021 01:23:33 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m11sm3527749wrz.40.2021.03.05.01.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 01:23:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 378CB1FF8F; Fri, 5 Mar 2021 09:23:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 3/9] tests/docker: add a test-tcg for building then running check-tcg Date: Fri, 5 Mar 2021 09:23:22 +0000 Message-Id: <20210305092328.31792-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305092328.31792-1-alex.bennee@linaro.org> References: <20210305092328.31792-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is mostly useful for verifying containers will work on the CI setup. Signed-off-by: Alex Bennée --- tests/docker/test-tcg | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 tests/docker/test-tcg -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/test-tcg b/tests/docker/test-tcg new file mode 100755 index 0000000000..00993b73ba --- /dev/null +++ b/tests/docker/test-tcg @@ -0,0 +1,22 @@ +#!/bin/bash -e +# +# Build and run the TCG tests +# +# Copyright (c) 2021 Linaro Ltd. +# +# Authors: +# Alex Bennée +# +# This work is licensed under the terms of the GNU GPL, version 2 +# or (at your option) any later version. See the COPYING file in +# the top-level directory. + +. common.rc + +cd "$BUILD_DIR" + +# although we are not building QEMU itself we still need a configured +# build for the unit tests to be built and run +TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ +build_qemu +check_qemu check-tcg From patchwork Fri Mar 5 09:23:23 2021 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: 393473 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp263085jai; Fri, 5 Mar 2021 01:24:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJyC6B/M0yve0CfSma06RH1UH4191+36eK2dSbczcChu/dYtmRzaThQQCIMZyDHT0K1mJRaX X-Received: by 2002:a25:4906:: with SMTP id w6mr12589694yba.324.1614936241229; Fri, 05 Mar 2021 01:24:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614936241; cv=none; d=google.com; s=arc-20160816; b=FcwmTdBQprwOv4zkIcaiZ0Af9oD7lWTL8kkX+nnpsIBIsRuKIU2Gju0WMCROdU6Tg1 nUy6V+h2nTMwgNRZXDppq7kyJfZXkLqdY7ysrXWy9/mXtBRgykja4igX9Nu8lNB701WE UhC7fShP4B48c7h27Lel3GtzjvuXiTERAqYiOA9S6ouYGIuxbPTNHcmeU4nRANnjViL4 ohqLaXfydm0CNhV+sjzZWgcZgA5bT1HpA1XnriJpgRnlouK/+x1jcErEh8F2ydZq5yIl jS6l9NWfpZp1BlQ6YbA6oQ3+S4rkN9d27TdscNFwahbvlP3PaIY5Sy0dL/+n+eSEwFdY HeIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=+UzYDP9cQ1V8C20NjMVuBOgS/p/If5huR1Br4L+1ZEM=; b=mEqFXXdBNdlHpwnN4608sAjOSv2Qh2FmZYg5wtcxoz4DnkLW/XCwnf7aQNkHGvGYzM TiLUdXk6xMPVG36NRlAEaB6d+5/IQHQAGUIcc0cOhLs+s8aPNypn8gJj8js8p45qDOYc ulTOoClNMwA2qORoPFecfaleBIpN/hrs2zdnzBukZ/UmrbUnckVgQEvEjmiwgT1U4UjY v0Fy9gfiJb2G0JHCnXcOrAx+Uvn31u09inyn+litpesCV6Ma32s/6u9agAbt16J6f874 C8YLUed/G7mgB0FD1yjvWu8vNGUzeWWUco9opNO5f/jwz67I4gK0vgNtTiXGJdPIdc0H ifkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=efRWbJUl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w8si2167868ybq.399.2021.03.05.01.24.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 01:24:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=efRWbJUl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI6gi-00016t-K8 for patch@linaro.org; Fri, 05 Mar 2021 04:24:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI6gN-00014Y-Hk for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:40 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:39886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI6gL-0004Jy-5n for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:39 -0500 Received: by mail-wr1-x432.google.com with SMTP id b18so1277782wrn.6 for ; Fri, 05 Mar 2021 01:23:36 -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=+UzYDP9cQ1V8C20NjMVuBOgS/p/If5huR1Br4L+1ZEM=; b=efRWbJUl3SG3Mhcd3Hld7DqLL3H/uJmkN/rBTZBe51s/E3Ci1eGboiTa7SzxcJohnS 0X/oF9qE1ILud5/4J38m3eg9reviPZASyrq70Y2535sQxglU9ab5BGn5cUbWDvVqYWt9 UXisgbV9fb8bRSK62FBkZBeDq4XD5UenHzCZuOFVKXY90BZqm/jJXOPjVc50LQZ9v2c7 ZvaLKCKIIgOlKMRtEEs4Pt5SiUNZRp0/hp+z1JIgqUyXp1m9WZKhwHmZiJyneN+aAOU8 s6Ov1RfyllSqu5FOiAn1KOxOLoLW8/3Y3jMxWJBzRJHUMSd+Y7iOsDe2cRQPlf4sW/Hk HKGQ== 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=+UzYDP9cQ1V8C20NjMVuBOgS/p/If5huR1Br4L+1ZEM=; b=Hv5ASwnaCTLOe1FpsQ/30Otox0/rZcOzx2iiLdnkwZMthIQrAeHRsopi7nw9UUwAmh RvXkiTvGurAi5CY3BRC+6zgbiVPq1XjNMU9m27cSjBRS8taSvbWKP9qL9JC0krSg/3sN JPdXqmSaawrYB6JcJoeGaiCRc8tAUDAZnVY6ZVR+gMXFL3nkvOVKRmpgPKcnpwDEFTnV erj3Uly5HBvcrBLPvuI2nEZWa3/9ZQ9iQDKWghjyJZ38OEVNM0PwKEzkMG6AnSZpuj2q 8yol2EnepmhtPxvaRXZk0bovKPnYbAoNCOy7WUmdD0uksihpvZzKiWjGzhFCk2muY8ve Z2FA== X-Gm-Message-State: AOAM5301jrGPsDLjXVADLRkrngkdXPC3N6R3cG7HXi5rgQDiwABK/G/3 tNx10G6lqjeXCnQUT0usdIoq1Q== X-Received: by 2002:adf:e84f:: with SMTP id d15mr8273713wrn.394.1614936215821; Fri, 05 Mar 2021 01:23:35 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c128sm16325664wme.3.2021.03.05.01.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 01:23:34 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 543AD1FF90; Fri, 5 Mar 2021 09:23:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/9] docker: Add Hexagon image Date: Fri, 5 Mar 2021 09:23:23 +0000 Message-Id: <20210305092328.31792-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305092328.31792-1-alex.bennee@linaro.org> References: <20210305092328.31792-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Alessandro Di Federico , berrange@redhat.com, Brian Cain , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alessandro Di Federico [PMD: Base on qemu/debian10, add missing EXTRA_FILES, remove X86] Signed-off-by: Alessandro Di Federico Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Brian Cain Message-Id: <20210228222314.304787-2-f4bug@amsat.org> [AJB: add build-dep for QEMU, include in MAINTAINERS] Signed-off-by: Alex Bennée squash! docker: Add Hexagon image --- MAINTAINERS | 2 + tests/docker/Makefile.include | 2 + .../dockerfiles/debian-hexagon-cross.docker | 27 ++++ .../build-toolchain.sh | 141 ++++++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-hexagon-cross.docker create mode 100755 tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh -- 2.20.1 diff --git a/MAINTAINERS b/MAINTAINERS index 9b2aa18e1f..1443278059 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -196,6 +196,8 @@ F: linux-user/hexagon/ F: tests/tcg/hexagon/ F: disas/hexagon.c F: default-configs/targets/hexagon-linux-user.mak +F: docker/dockerfiles/debian-hexagon-cross.docker +F: docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh HPPA (PA-RISC) TCG CPUs M: Richard Henderson diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7cab761bf5..3aee031c4e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -144,6 +144,8 @@ docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 +docker-image-debian-hexagon-cross: \ + EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker new file mode 100644 index 0000000000..bf32536896 --- /dev/null +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -0,0 +1,27 @@ +FROM qemu/debian10 + +# What we need to build QEMU itself (as this is used in CI as well) +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy qemu + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + bison \ + cmake \ + flex \ + lld \ + rsync \ + wget + +ENV TOOLCHAIN_INSTALL /usr +ENV ROOTFS /usr + +ENV LLVM_URL https://github.com/llvm/llvm-project/archive/3d8149c2a1228609fd7d7c91a04681304a2f0ca9.tar.gz +ENV MUSL_URL https://github.com/quic/musl/archive/aff74b395fbf59cd7e93b3691905aa1af6c0778c.tar.gz +ENV LINUX_URL https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.18.tar.xz + +ADD build-toolchain.sh /root/hexagon-toolchain/build-toolchain.sh + +RUN ( cd /root/hexagon-toolchain && ./build-toolchain.sh ) && \ + rm -rf /root/hexagon-toolchain diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh b/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh new file mode 100755 index 0000000000..19b1c9f83e --- /dev/null +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh @@ -0,0 +1,141 @@ +#!/bin/bash + +set -e + +BASE=$(readlink -f ${PWD}) + +TOOLCHAIN_INSTALL=$(readlink -f "$TOOLCHAIN_INSTALL") +ROOTFS=$(readlink -f "$ROOTFS") + +TOOLCHAIN_BIN=${TOOLCHAIN_INSTALL}/bin +HEX_SYSROOT=${TOOLCHAIN_INSTALL}/hexagon-unknown-linux-musl +HEX_TOOLS_TARGET_BASE=${HEX_SYSROOT}/usr + +function cdp() { + DIR="$1" + mkdir -p "$DIR" + cd "$DIR" +} + +function fetch() { + DIR="$1" + URL="$2" + TEMP="$(readlink -f "$PWD/tmp.tar.gz")" + wget --quiet "$URL" -O "$TEMP" + cdp "$DIR" + tar xaf "$TEMP" --strip-components=1 + rm "$TEMP" + cd - +} + +build_llvm_clang() { + fetch "$BASE/llvm-project" "$LLVM_URL" + cdp "$BASE/build-llvm" + + cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${TOOLCHAIN_INSTALL} \ + -DLLVM_ENABLE_LLD=ON \ + -DLLVM_TARGETS_TO_BUILD="Hexagon" \ + -DLLVM_ENABLE_PROJECTS="clang;lld" \ + "$BASE/llvm-project/llvm" + ninja all install + cd ${TOOLCHAIN_BIN} + ln -sf clang hexagon-unknown-linux-musl-clang + ln -sf clang++ hexagon-unknown-linux-musl-clang++ + ln -sf llvm-ar hexagon-unknown-linux-musl-ar + ln -sf llvm-objdump hexagon-unknown-linux-musl-objdump + ln -sf llvm-objcopy hexagon-unknown-linux-musl-objcopy + ln -sf llvm-readelf hexagon-unknown-linux-musl-readelf + ln -sf llvm-ranlib hexagon-unknown-linux-musl-ranlib + + # workaround for now: + cat < hexagon-unknown-linux-musl.cfg +-G0 --sysroot=${HEX_SYSROOT} +EOF +} + +build_clang_rt() { + cdp "$BASE/build-clang_rt" + cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_CONFIG_PATH="$BASE/build-llvm/bin/llvm-config" \ + -DCMAKE_ASM_FLAGS="-G0 -mlong-calls -fno-pic --target=hexagon-unknown-linux-musl " \ + -DCMAKE_SYSTEM_NAME=Linux \ + -DCMAKE_C_COMPILER="${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang" \ + -DCMAKE_ASM_COMPILER="${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang" \ + -DCMAKE_INSTALL_PREFIX=${HEX_TOOLS_TARGET_BASE} \ + -DCMAKE_CROSSCOMPILING=ON \ + -DCMAKE_C_COMPILER_FORCED=ON \ + -DCMAKE_CXX_COMPILER_FORCED=ON \ + -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_BUILTINS_ENABLE_PIC=OFF \ + -DCMAKE_SIZEOF_VOID_P=4 \ + -DCOMPILER_RT_OS_DIR= \ + -DCAN_TARGET_hexagon=1 \ + -DCAN_TARGET_x86_64=0 \ + -DCOMPILER_RT_SUPPORTED_ARCH=hexagon \ + -DLLVM_ENABLE_PROJECTS="compiler-rt" \ + "$BASE/llvm-project/compiler-rt" + ninja install-compiler-rt +} + +build_musl_headers() { + fetch "$BASE/musl" "$MUSL_URL" + cd "$BASE/musl" + make clean + CC=${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ + CROSS_COMPILE=hexagon-unknown-linux-musl \ + LIBCC=${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ + CROSS_CFLAGS="-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=hexagon-unknown-linux-musl" \ + ./configure --target=hexagon --prefix=${HEX_TOOLS_TARGET_BASE} + PATH=${TOOLCHAIN_BIN}:$PATH make CROSS_COMPILE= install-headers + + cd ${HEX_SYSROOT}/.. + ln -sf hexagon-unknown-linux-musl hexagon +} + +build_kernel_headers() { + fetch "$BASE/linux" "$LINUX_URL" + mkdir -p "$BASE/build-linux" + cd "$BASE/linux" + make O=../build-linux ARCH=hexagon \ + KBUILD_CFLAGS_KERNEL="-mlong-calls" \ + CC=${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ + LD=${TOOLCHAIN_BIN}/ld.lld \ + KBUILD_VERBOSE=1 comet_defconfig + make mrproper + + cd "$BASE/build-linux" + make \ + ARCH=hexagon \ + CC=${TOOLCHAIN_BIN}/clang \ + INSTALL_HDR_PATH=${HEX_TOOLS_TARGET_BASE} \ + V=1 \ + headers_install +} + +build_musl() { + cd "$BASE/musl" + make clean + CROSS_COMPILE=hexagon-unknown-linux-musl- \ + AR=llvm-ar \ + RANLIB=llvm-ranlib \ + STRIP=llvm-strip \ + CC=clang \ + LIBCC=${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ + CFLAGS="-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=hexagon-unknown-linux-musl" \ + ./configure --target=hexagon --prefix=${HEX_TOOLS_TARGET_BASE} + PATH=${TOOLCHAIN_BIN}/:$PATH make CROSS_COMPILE= install + cd ${HEX_TOOLS_TARGET_BASE}/lib + ln -sf libc.so ld-musl-hexagon.so + ln -sf ld-musl-hexagon.so ld-musl-hexagon.so.1 + cdp ${HEX_TOOLS_TARGET_BASE}/../lib + ln -sf ../usr/lib/ld-musl-hexagon.so.1 +} + +build_llvm_clang +build_kernel_headers +build_musl_headers +build_clang_rt +build_musl From patchwork Fri Mar 5 09:23:24 2021 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: 393476 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp264459jai; Fri, 5 Mar 2021 01:26:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJy12iJH9neW+GUMo3fijtLjGjI9qU9ftkTRBNeKTDaOK54so0Vi9pI6gqrvwDlBlAEB0PtE X-Received: by 2002:a25:1e82:: with SMTP id e124mr12754781ybe.505.1614936401203; Fri, 05 Mar 2021 01:26:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614936401; cv=none; d=google.com; s=arc-20160816; b=FJezl4lP9LzI0RXHYaazWgcfdoP4omvO0wDvYihUQaXChq43vG5Q6ctSJbFgSSXkep lcs24Vbp975PbeOwA/FV30jt6hlv5qqQMlH8WV37j6bX9MVIhNsPJ5leWBr5wbTGnGKW bl2JMXvAmekMhNLErpLpQwa5cO6iMZM8k+ynBdavkhIstG/AaHmzi1Y/rSuPneoI/Clg /m5p+in4ZUrUicggyIuodmSZ+MioJh9eNAsUrcp/OA4ChctQjj1eTrC3kETwJe8RmOm9 srue7rSxrnZavyaEsrMPS9/6De2+2rtYa8L7NJ6W4SyKagrieUsXf2IGB5zBP0qqwCpQ a3Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Nqr4DpgZIAeEnBFTTz1bmXe9GvqU+b3OtGdJf4zXv2o=; b=k6MMn+ehxgKxAYMSojKmqsA54WyOxN+zac1j0zrKh1Zb6Q/39k6usk8J0rvkEAVLcB /sc8VJrB6ERZ5IkRynBjjukrRZ4C0D6rYfBJkjh0vGyIHOW7ZJppoUPrfI0rdYv/ti2N lo6ANxZBd5y8w0i9vRpUbOvrze3g2gW2EPTbtEFsMyri1deAQlv0FF3uMMmIGbfsHZzH fz+MgaU185CcTfJ8F8nRJse5DARjmSS94fh3Bf90/oKvtnEJvJ7dt+nwLO0C+nXQRRfF wEFn7m6kZRtDtdWlRn9tb5lNRo8j9G0BU8JMLDIJl0ujPLoyzjcodBX373aNlFrHpAhC sDYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TiPn3D6k; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d37si2422235ybe.379.2021.03.05.01.26.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 01:26:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TiPn3D6k; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI6jI-0003yu-JM for patch@linaro.org; Fri, 05 Mar 2021 04:26:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI6gR-00017M-42 for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:43 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:37319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI6gM-0004K4-58 for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:42 -0500 Received: by mail-wm1-x32d.google.com with SMTP id m1so811142wml.2 for ; Fri, 05 Mar 2021 01:23:37 -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=Nqr4DpgZIAeEnBFTTz1bmXe9GvqU+b3OtGdJf4zXv2o=; b=TiPn3D6k1Zm+5wP8HcXoPrK70hZ3mZxAMAOlhdypzA5CnXN3u1BygtQOwc93Cd8JA8 O6nSZ+yvGTOTVVb61nfRJ9N3LJlYL9o/es22lwYPj60HDr5BxU+N7rMHIiODmWBZzTUr NNHuAbwItuf7k9AjL/V5xkck4RVFG5az0bMLigkKN7wBAzSZSIO9BWaQMljaaZpRmxB4 sA1XsrtI+4jiM8YLSlkP8k5KL5gtS7JMLGUrTzqrpOCfLpTVzTecswADRuf2QyQoF6+f S7ezCZFjsZBO4zHwZida0IQkTYg5xLtle119AJkO8M7gsRF8quyXDkLA+CI5xtp8cbcR eajg== 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=Nqr4DpgZIAeEnBFTTz1bmXe9GvqU+b3OtGdJf4zXv2o=; b=DeA4pA1DciMT9FbmOEDTMxZFl/UfraTDENe+XkV497HQ7deN91imFvCSJkEFHj81yJ Uh0f818fzWm8q5gW0hYqVX/7bk48LliKRjaYPUUf3ckzFptj2JwJreK6q8+EdaAD8E4S v+0rWUuNn7r5Tb46ACLgavClyWJRrrYd7GurcQ8EzJH5xT7qSu/ScPRpR0mHcIBwpv+X DxLqC+0VSukW+m1oh1wfxMDou2gdf/Cvg6w7mXFtTqoGGXwLWo+vOwl1uh3jKy0Mv0ZJ PuCgxwk6wPnPP3xBUQoI1Pp0qiBeQvRsdBRRM/tUTn6Nm34N10wL8GB8cnKAxLK41mjV 5E9A== X-Gm-Message-State: AOAM530KJ6kau+YvgFU15P1mtqAvDeSx8m1Bxj9xUY+fc3TKkizF1oeY sxdGTwDkZOZ9zYwsX9Ki73JHlA== X-Received: by 2002:a1c:3b42:: with SMTP id i63mr8020979wma.124.1614936216342; Fri, 05 Mar 2021 01:23:36 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a17sm3018964wmj.9.2021.03.05.01.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 01:23:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6B47A1FF91; Fri, 5 Mar 2021 09:23:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 5/9] tests/tcg: Use Hexagon Docker image Date: Fri, 5 Mar 2021 09:23:24 +0000 Message-Id: <20210305092328.31792-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305092328.31792-1-alex.bennee@linaro.org> References: <20210305092328.31792-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Alessandro Di Federico , berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alessandro Di Federico [PMD: Split from 'Add Hexagon Docker image' patch] Signed-off-by: Alessandro Di Federico Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210228222314.304787-5-f4bug@amsat.org> Signed-off-by: Alex Bennée --- tests/tcg/configure.sh | 4 ++++ 1 file changed, 4 insertions(+) -- 2.20.1 diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 36b8a73a54..f70fd7435d 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -124,6 +124,10 @@ for target in $target_list; do container_image=fedora-cris-cross container_cross_cc=cris-linux-gnu-gcc ;; + hexagon-*) + container_image=debian-hexagon-cross + container_cross_cc=hexagon-unknown-linux-musl-clang + ;; hppa-*) container_image=debian-hppa-cross container_cross_cc=hppa-linux-gnu-gcc From patchwork Fri Mar 5 09:23:25 2021 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: 393480 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp268721jai; Fri, 5 Mar 2021 01:33:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJxq9u04sopDGeQGmEWlqjUHe/yCtaKpZXCgZiFd33bN0TPa2VvlEkg85tRG28Sc9Bs0xNKU X-Received: by 2002:a25:d016:: with SMTP id h22mr12637220ybg.278.1614936825941; Fri, 05 Mar 2021 01:33:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614936825; cv=none; d=google.com; s=arc-20160816; b=Q+F3fBnZlaifvk4BmolTtq2h9JWTp/xG2SznvRh/YhkBu4ORbE7cGeaKOfcHhF+crd nYo7ZZtk5O7zSfXnX1m4LbcXkzk5532oHgAwpddhbGZuwrmyhwvZwaOAExRYto5eGOEL /jSiGCVP3yjG+OFNKeYSAPavS5nBqGgsP/L+brCWx+7RAkDOWMvLkhMb28994XJ73fyf AfhiLxcGKh49TRd/w328WDnSZg/DHPUXLMuLGdo1o3zlL3PZLqEZntlP4KJf52SRK3Om hTC/Cj28EOeVnEu6VawUcQLf9j9Lym5FK8GpvCfvNvEaERFKNkRfsNT4YD5q8Ys79Nqc jWcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=FjPLHR2X9UYJehWsCedSbfMVoyAVoUPt0kPUSCJRhEo=; b=uUVcW5zknjEQuwOC1yauqt702pVDXjRzGbdqpC+w42it58zNtII/xG8DTsfbtN+z5d iVyDcJItQ6yElWEx6lz1MWyMMOkg8obJgXFExlu7TlwJ45YPHJRc8BslPDYxxfahrsto XeDX16KMwyAAX5NONQ769UUiXxZC0e0xtn3LRY0yEA1NRDrrTACufRyMIWLktOEHjXIj rRILsByfIvVZhpZaH7MT7XSNxdDCZPWF+9y4KgFGh7XdCeNBRkKp38JN7LFQSYsnIui8 zqliV/39CWuf4ttLSDhYWYkoq0ZW98ZQC3fhIiy1vsKee0nMgof3O2zTmMG+R7RDh72Y 90aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CRm0VzPT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o18si2013024ybq.281.2021.03.05.01.33.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 01:33:45 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CRm0VzPT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI6q9-00012A-CM for patch@linaro.org; Fri, 05 Mar 2021 04:33:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI6gT-0001D0-P6 for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:45 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:40110) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI6gP-0004M8-Pi for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:45 -0500 Received: by mail-wm1-x32d.google.com with SMTP id o2so800796wme.5 for ; Fri, 05 Mar 2021 01:23:41 -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=FjPLHR2X9UYJehWsCedSbfMVoyAVoUPt0kPUSCJRhEo=; b=CRm0VzPTUgwJS6tsEymVjX/1mxzo8IhFBFOg1IQ98wqb56NROR39IyRv68NqnHY/PL lObj/rC6IPodMk6tA6s/miFYqsRNUWlpdv9cxxZpB6GUn0WQdtCNaOib9vlcC6qE9X8n 28DPkxkO43Kut6Kj1JmPAfC/vPnFSwPiypg0VWVJFyoOfGi3ue4voPH12KVIuAooKVzx JaBZsP99LZif/GtVjtZxGml8Um0AES4zyVIgQzhcSdhuRJYHBbWWYhFBpKanoY7SocLD adDdp2nNDaIovf6gLGXoV3TcnOAwlrxONi/Mf3sKhAZRconf7RD1VK0De73dfDbxwvC9 hLiQ== 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=FjPLHR2X9UYJehWsCedSbfMVoyAVoUPt0kPUSCJRhEo=; b=QS6S2NGu4EPXo5IPKMcEwv3oOCtRSQv0ewetkT3v/9unp4nQzjD6GJlIbB45TTmX6d Em69vgJUZIwpMarijivuWfBfUeQhG9BZrCMTuNl0IRaMxKf89lyXdGnQuxKUSduLykbS pKnfJPKnE/G6N7u9yiJdzgDDVkkcs2hAz/ArJ0X6KfM8gaAPCaCFX9j8S2r+524/YA0Q AWznZ6luEAOl2J0vnGa5LyjNExCaKHl+AZbPt+ecFKeVl3o6BlST4oO2DspoQ89bsD47 Ug0ZWTZ915xngesHSqXF9fsZLnkWInGHtDLwO8Ds8fpZdXeXxqgYI6zwMlPabVQIWiP3 NYng== X-Gm-Message-State: AOAM532hjbtFKr7y2mqW6oYcmchm6sU7bXZU+L/5wc2ERnEeOkwmj1OU ANOZ84NLVpT+EuvdQXWgWLsGEA== X-Received: by 2002:a1c:448a:: with SMTP id r132mr7858812wma.157.1614936220576; Fri, 05 Mar 2021 01:23:40 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i11sm3740735wro.53.2021.03.05.01.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 01:23:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 80C0C1FF92; Fri, 5 Mar 2021 09:23:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 6/9] gitlab: add build-user-hexagon test Date: Fri, 5 Mar 2021 09:23:25 +0000 Message-Id: <20210305092328.31792-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305092328.31792-1-alex.bennee@linaro.org> References: <20210305092328.31792-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , f4bug@amsat.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We special case this as the container with the cross compiler for the tests takes so long to build it is manually uploaded into the registry. Signed-off-by: Alex Bennée --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Wainer dos Santos Moschetta diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b6d495288..c2c5196b8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -417,6 +417,17 @@ build-user-static: CONFIGURE_ARGS: --disable-tools --disable-system --static MAKE_CHECK_ARGS: check-tcg +# Because the hexagon cross-compiler takes so long to build we don't rely +# on the CI system to build it and hence this job has no dependency +# declared. The image is manually uploaded. +build-user-hexagon: + <<: *native_build_job_definition + variables: + IMAGE: debian-hexagon-cross + TARGETS: hexagon-linux-user + CONFIGURE_ARGS: --disable-tools --disable-docs --enable-debug-tcg + MAKE_CHECK_ARGS: check-tcg + # Only build the softmmu targets we have check-tcg tests for build-some-softmmu: <<: *native_build_job_definition From patchwork Fri Mar 5 09:23:26 2021 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: 393477 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp265640jai; Fri, 5 Mar 2021 01:28:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwt476aiKAM/3o2b5JWPiMH0zXTI1p8Bi6VO+k37E3WqqGPGE2prn3uv+68XxO/LxMKxpXj X-Received: by 2002:a6b:b7d7:: with SMTP id h206mr7600049iof.56.1614936526470; Fri, 05 Mar 2021 01:28:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614936526; cv=none; d=google.com; s=arc-20160816; b=P88vkagfS5NMFTrMoPYDt9ByA8qJCiDBooXguV2BzIokqMErrY7685quvWlmWyJA0u 8OzX5+l24iaC7YmMLJlBGQGB1Ky+uiZBgP7GCpPPfydz/aLSJHVQGff20HyBo1QOgKnO EdEeP4u5k2ki0HBp68zLZdxaKgm9OxJFVN7jN256JCE7rvlpaglUrAefNZxSm32Zjzm/ QksschUEUGBS/L5W6UCTTra2cEtEiNaWKr9jGimjE27MbFO+TDmEuYnPT6rClvy6VFcO vT40WrKt+S+CZkGO08KBBSJ3iVIO3fwv+oNvMJ4BHn+8oykp0bOM27Gz8Y1smBv2AfaA N2FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=FibiVfMaIQ72ptryoYOeLZu6cNQdcbDp88Mmd4bbS28=; b=TUC9rynCaqjhSlN85RqCsBU6CpyuoNoBPbXnnFl5cw1cpCB/5GyVNvMoJ4FBnTMhRo E+dtPgzaTHtKs6rPFJyuKg1zSaz7vlVZGjqXnOhbW+4sdBeIMakCwBvLgoocv8bVm5qx C5CcisunupuJD2kk8xOvFqHZgCnBEk1W/6t/9K4oyan3GrClJcz8kcmJS+Hz1xaR4oHd 3KAWowdgz2CxO6WuxHNhYZl6bxLPVMD3kg6tENJk4KTVp0VTIdKqRjZjzlzDmYrLOlOb xMUys04u2mMpc7Qykla/VFpYwsdkstkatcFlnYFJoZ67OU/U+uf2iMpg/A7exABe3xef 7Btw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="eXSnm/Xy"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m26si1945060jap.40.2021.03.05.01.28.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 01:28:46 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="eXSnm/Xy"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI6lJ-0005xW-QJ for patch@linaro.org; Fri, 05 Mar 2021 04:28:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI6gR-00019O-WE for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:44 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:45100) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI6gO-0004LK-V3 for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:43 -0500 Received: by mail-wr1-x433.google.com with SMTP id e10so1247555wro.12 for ; Fri, 05 Mar 2021 01:23:39 -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=FibiVfMaIQ72ptryoYOeLZu6cNQdcbDp88Mmd4bbS28=; b=eXSnm/XywBcs0uSOP2HyC4frWTLLuzMHTIgcevYlB3k/UPsXAm7w8a5aLrVevs7L7t b/84r33VcpAqrnMmPh8ZY7fA3/hyd9t5OAbEgTUIcMgUuLXZ5BL8paXSozfSVBvP3HOE bqki1tNOlsvSzGk7TTj7SZPULtlZm9JeTWU00YRHSvUSLJQqOjvHD5CqgTzmEcn6AQFF 183BFdVwYezloL31DfIXqHRo4ygxhT3V9u0/0BVpvF5wLbWIIarWC1I5fh4uENRgwx1I ruOsfd3gs+ZABsIjsAqVSKcAoezlGYF3pu2R9KBBIBG6XrJBuR879RDjyfHs8B7On3Yc Fznw== 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=FibiVfMaIQ72ptryoYOeLZu6cNQdcbDp88Mmd4bbS28=; b=RA9vmy+sk2+4Zfw6hRfTd8hpbLCBd1PnWNbUtUkjOsVWdEKFtfSJmvCHPwD1OUkAMV FCZUrKGCql/F3Ov66jrJo3AShMyk43uH239tpLj51igbzeRZ9a384cloZzpJ3iePX89H 7fc2EMbvjGrOHHRGjp6Pr/QmIqLq1YAe8OgkdhDJfBSHuMvH5QJ0LeY95SJSwja9QVqP HzinHrH8m0XtaxSJ92kjmRYf8wTE8048dEPblShUCU35AJD2pUTa22Ig2+skyu53ZUp5 WmlTPBdnC7M+veX7E/PeMA54SrI3in4p1rDePXYaIt4oPe27bsEzH7qOy/cffxqqIF81 upwg== X-Gm-Message-State: AOAM533NpvVFzhLuaiQ+aAHqYjP5VIrycUdafrOYrYkD0PyAX2DYbgSS 3P6f3DI+gj5Ldvg/siW2YzaHZw== X-Received: by 2002:a5d:6290:: with SMTP id k16mr8391451wru.264.1614936218728; Fri, 05 Mar 2021 01:23:38 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 36sm3761926wrh.94.2021.03.05.01.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 01:23:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 976EC1FF93; Fri, 5 Mar 2021 09:23:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 7/9] gitlab-ci.yml: Allow custom # of parallel linkers Date: Fri, 5 Mar 2021 09:23:26 +0000 Message-Id: <20210305092328.31792-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305092328.31792-1-alex.bennee@linaro.org> References: <20210305092328.31792-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Daniele Buono , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniele Buono Define a new variable LD_JOBS, that can be used to select the maximum number of linking jobs to be executed in parallel. If the variable is not defined, maintain the default given by make -j Currently, make parallelism at build time is based on the number of cpus available. This doesn't work well with LTO at linking, because with LTO the linker has to load in memory all the intermediate object files for optimization. The end result is that, if the gitlab runner happens to run two linking processes at the same time, the job will fail with an out-of-memory error, This patch leverages the ability to maintain high parallelism at compile time, but limit the number of linkers executed in parallel. Signed-off-by: Daniele Buono Reviewed-by: Daniel P. Berrangé Message-Id: <20210304030948.9367-2-dbuono@linux.vnet.ibm.com> Signed-off-by: Alex Bennée --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) -- 2.20.1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2c5196b8b..1ea944eb91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,10 @@ include: else ../configure --enable-werror $CONFIGURE_ARGS ; fi || { cat config.log meson-logs/meson-log.txt && exit 1; } + - if test -n "$LD_JOBS"; + then + meson configure . -Dbackend_max_links="$LD_JOBS" ; + fi || exit 1; - make -j"$JOBS" - if test -n "$MAKE_CHECK_ARGS"; then From patchwork Fri Mar 5 09:23:27 2021 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: 393474 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp263613jai; Fri, 5 Mar 2021 01:25:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJyM3u4fniMfKZGIqzldZ3fuSe89cCY3ou7b6aIFz6Gms3+Oz6SaLfgBUe1BLQUpoH8DKt/S X-Received: by 2002:a02:9003:: with SMTP id w3mr8743483jaf.31.1614936301334; Fri, 05 Mar 2021 01:25:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614936301; cv=none; d=google.com; s=arc-20160816; b=BL0R//LamMEoILkOGwhU+5a97d7fx5aksBipoF/9rzQAxvzXsy3f+lSJXCCHfIuJbM K7CyCcx6unAHSAtlgDHjRNgV+Nyk1vdBvxFJl+xGEJA3OOIRQyfZnY/366ou6CgAtKSb xWU6pxyt0NAa9OzkYsG1UWbwKFBY3YBWlPqKYtynRViGZlRfqoLdaLbVWz85cgl7mlYT 2wgrhBBRc8c4nuNlGvdF2ykyYGuQ/kE3TBU+nKtZdBA4q169vCaUp90yxXRMmy2L7jYD TCzYQ5iAsRBsQ82cTyOu0Ze0S5jUCZ2J3etCWp2phOQnQImQK2lGeQWTcUcEhWXoGjfC v+LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=72D9Jy5CJJNVD1AtWucx1rIrJFM00v3oHS4BU4E4eAs=; b=kC/ryBmZROAG34cIHKw+62GJaBEpZDA+ncChk+a6PvZnxVXhPLsvORl/1Eoa+evG6b B0yrL+1R2OgLQLFATfTkXyNCyiSvlKI89G/A62A54LgKfdvUEzwqGVCuSKFD7A77rm2S 6du7DElaY8FPuVqxrQ4MicVjFbqgRcsL15hYEpXmg9p3+MysQMN31aIQp9SDcNTMUVCm Eqz3bbyzd74ed0dV7wJvAxao9TwdMh1DV9Mu0lELXOla2GtEkiyFoOiKB1UeFEGehJwf p9Q4HLrv/1hgK3glhxKkHMPvI+/ehOSQN8prehF+PcIl5/iF9B425bGPtH9/8yxhPW35 Fl5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZCawgAsp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t31si2211216jal.89.2021.03.05.01.25.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 01:25:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZCawgAsp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI6hg-00017q-Ef for patch@linaro.org; Fri, 05 Mar 2021 04:25:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI6gP-00015N-P8 for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:41 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:46141) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI6gN-0004KU-8o for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:41 -0500 Received: by mail-wr1-x431.google.com with SMTP id a18so1249566wrc.13 for ; Fri, 05 Mar 2021 01:23:38 -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=72D9Jy5CJJNVD1AtWucx1rIrJFM00v3oHS4BU4E4eAs=; b=ZCawgAspMWtMT53fQFPXd4QoSfYht2qf3zxrdJ42eNSwXXGn2gRfoqOInX8Ck0cUwg HnWqWDWPeoiWtCCxov1Rc5Py9Xir9GnYx1oxwr/8vNwfQGQWjX2557wTXqxQnjzUfF9K uZe+UOsRxqzK10UEGbBiYazE7VcgUbbzTBbQTdBDoXRUaL6qNBlHGnhvOjGhQrtDQMJZ f6VeJTeh1lF8AlLnZGzvWrhmt6KcpYVoLe1x72f0i5SKY+dJFzQ2O+RAboECxeoL/WFp pbTEVXae5yJRHRfHr2UfG6wWE/RE1aoCuNrZ6WgCzskLmiIu90gfmRKtz1vL7nvs+Ue9 RcCg== 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=72D9Jy5CJJNVD1AtWucx1rIrJFM00v3oHS4BU4E4eAs=; b=H442lG2+86JHWmxjKinHH8G0BYjL/gAT8tT/+qzhWO0v81onKg2HTMNF0lAcgO41s0 yv15RBGaERv11mQ9iIrzMaSyzJBMEjIfvR+8EzBE7nlxs5poxUbv/edkSAVIKHjnnJBs EUR1aW832ig15IgxQfozxAJElq6NtWKNjrtS9C+ade173dn+rF86Gva0Ki7nSKTbaO8H oDODq+O9AVnVPGh6T2U8VoSPQtnlEh/ON0P+3/oaKPxrkfHROAYMuWG43nPoZVcHNjHd rDzQ4i0mRYqf91eSI/neE/kM7BczjNH4AG15k5DAOoSzmUH4JPsf8tcLvj2cW8oyUp2G l6jw== X-Gm-Message-State: AOAM532vGmInyw4ResvX1i0rCmSkQZKZnSag2oVvlnw1QUAc6hUjf2Cq SfpiaZ6yS8zq13MPvJ6uXh7ALw== X-Received: by 2002:a5d:4ac6:: with SMTP id y6mr8200484wrs.160.1614936217860; Fri, 05 Mar 2021 01:23:37 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v5sm3642019wmh.2.2021.03.05.01.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 01:23:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ADD7D1FF96; Fri, 5 Mar 2021 09:23:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 8/9] gitlab-ci.yml: Add jobs to test CFI flags Date: Fri, 5 Mar 2021 09:23:27 +0000 Message-Id: <20210305092328.31792-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305092328.31792-1-alex.bennee@linaro.org> References: <20210305092328.31792-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Daniele Buono , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniele Buono QEMU has had options to enable control-flow integrity features for a few months now. Add two sets of build/check/acceptance jobs to ensure the binary produced is working fine. The three sets allow testing of x86_64 binaries for x86_64, s390x, ppc64 and aarch64 targets Signed-off-by: Daniele Buono Message-Id: <20210304030948.9367-3-dbuono@linux.vnet.ibm.com> [AJB: tweak job names to avoid brands] Signed-off-by: Alex Bennée --- .gitlab-ci.yml | 119 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ea944eb91..5625265ef8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -494,6 +494,125 @@ clang-user: --extra-cflags=-fsanitize=undefined --extra-cflags=-fno-sanitize-recover=undefined MAKE_CHECK_ARGS: check-unit check-tcg +# Set LD_JOBS=1 because this requires LTO and ld consumes a large amount of memory. +# On gitlab runners, default value sometimes end up calling 2 lds concurrently and +# triggers an Out-Of-Memory error +# +# Since slirp callbacks are used in QEMU Timers, slirp needs to be compiled together +# with QEMU and linked as a static library to avoid false positives in CFI checks. +# This can be accomplished by using -enable-slirp=git, which avoids the use of +# a system-wide version of the library +# +# Split in three sets of build/check/acceptance to limit the execution time of each +# job +build-cfi-aarch64: + <<: *native_build_job_definition + needs: + - job: amd64-fedora-container + variables: + LD_JOBS: 1 + AR: llvm-ar + IMAGE: fedora + CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug + --enable-safe-stack --enable-slirp=git + TARGETS: aarch64-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-cfi-aarch64: + <<: *native_test_job_definition + needs: + - job: build-cfi-aarch64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-cfi-aarch64: + <<: *native_test_job_definition + needs: + - job: build-cfi-aarch64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + <<: *acceptance_definition + +build-cfi-ppc64-s390x: + <<: *native_build_job_definition + needs: + - job: amd64-fedora-container + variables: + LD_JOBS: 1 + AR: llvm-ar + IMAGE: fedora + CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug + --enable-safe-stack --enable-slirp=git + TARGETS: ppc64-softmmu s390x-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-cfi-ppc64-s390x: + <<: *native_test_job_definition + needs: + - job: build-cfi-ppc64-s390x + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-cfi-ppc64-s390x: + <<: *native_test_job_definition + needs: + - job: build-cfi-ppc64-s390x + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + <<: *acceptance_definition + +build-cfi-x86_64: + <<: *native_build_job_definition + needs: + - job: amd64-fedora-container + variables: + LD_JOBS: 1 + AR: llvm-ar + IMAGE: fedora + CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug + --enable-safe-stack --enable-slirp=git + TARGETS: x86_64-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-cfi-x86_64: + <<: *native_test_job_definition + needs: + - job: build-cfi-x86_64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-cfi-x86_64: + <<: *native_test_job_definition + needs: + - job: build-cfi-x86_64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + <<: *acceptance_definition + tsan-build: <<: *native_build_job_definition variables: From patchwork Fri Mar 5 09:23:28 2021 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: 393481 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp270140jai; Fri, 5 Mar 2021 01:35:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDe1oAtCuO8acSH56WtbqiJLSIU2iBVmt/naxykiG6rF5ooh+6NIt1XBAz2kbDJ0FUAo/Y X-Received: by 2002:a02:3846:: with SMTP id v6mr9131369jae.7.1614936958760; Fri, 05 Mar 2021 01:35:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614936958; cv=none; d=google.com; s=arc-20160816; b=VRRjJ1LQImilMtY7lOXlA8foz7BCfWwC0AJes9M8zJb0DguY9H5o6w4jsOjJZEuGgH FJRpCGzPVfSHDYTutxflltsFNnC35Kw46Hu0lEUOAUKMIOIuiXbH4Cv3MaAeS07V4iza q611m48Yx7dmwHQ+6I3Ays+RZ+/x6gRR7L74hwcJYutsfus1NT6VqRpnFkJQ4qxW2hCm 9Dqc6OWM5P1hriIyR8qi86N1eEIPgGfSCLfuhA1Ir/7f1vHMAmkiMU0Uk9rIj1Fo9DYs EjOOuAaRj5vXyCnGYfFLRjqnhmPJEMBccTKCyeMiPh/KB22TGWdEWPlbaJ5p8aWWTvpe ulBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ahXq8b+kzCw8zl3xGMhjbhyEJn9Nfqg8y+beqdse18o=; b=Pv5M2xqjEn1XzeYI0jXJm7oQ5qDJU74niyQhyFw5fHWJfO/IHmvp0vH0GyNXDgREkZ pMf5wf7cHKnfcs/7DP2zjCdiQ5PjPqgPGum0C1MLXA1PuCzjoSO/rRruhwETxg2D4q/m Ff732xJIFirfHCjgXysrgOuCKz48qiby1GyTPBLrYLletOilftZ0ID4Z4EQs8HY+tuJQ pCnCWuvxxha/eVhtMBim3j0NSuMK7ToQoKumAQ8osHktEPh1WBF7d8/X9xXLxHA3FFj/ RRxg6RepFhWEzLg5KqTf8cG/+Dl+ExI806d6P69smJuUFeo6dVqROCtF/PWRAggdukL0 8EOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gT6GeLEz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g18si1719335ilk.155.2021.03.05.01.35.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 01:35:58 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gT6GeLEz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI6sI-0002Z4-7S for patch@linaro.org; Fri, 05 Mar 2021 04:35:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI6gU-0001EN-86 for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:46 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:37318) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI6gQ-0004Mu-Qz for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:45 -0500 Received: by mail-wm1-x32b.google.com with SMTP id m1so811327wml.2 for ; Fri, 05 Mar 2021 01:23:42 -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=ahXq8b+kzCw8zl3xGMhjbhyEJn9Nfqg8y+beqdse18o=; b=gT6GeLEzp+D055NDAQ7QSjXldI4YwCpYAJvaa0kBKZNIAFzd0ELIrr3kYf5zfmr/m9 kBQEhLwpHxw0xxefL4HFWBLtUuUbUMRoOA3LplovwBwKncqhMCD4/a+VS/dI91QBp37q D8y3TRlVo+Fn7VWZ9aGOrPdLlkBoLjXMZbGCn/5gV2E/jBLUAZ7L3L50Of2iYQR12T/C Pea/OoeQSayJ+YrbdFYYDCBRXce8hm8QohdCFLL60bIe2ckhvgcQMRUS1IXvMQzizmKH XbCipbjpX5lZbnDTYpwcYm3bvwsrrZcdQ7HJjDWpXf5ViUU2Tqc5GFCSN7YYiGvamHmW 2bXA== 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=ahXq8b+kzCw8zl3xGMhjbhyEJn9Nfqg8y+beqdse18o=; b=glvDq/DWmCW4u9o3cODqrusjQbvSDcjzIMGFtBtXBhQsTwzDS5KXDe4D0/txPxX0ng 3h7e5N9F1HqS6vZh+lAd59l7TG1eN6aKwgqrZzdO/bWi8k46S1d/OL9AbIMWjk4o2qNA rAS6Ji8HAZN2YEX5YkQbUC6ztW3ngh4fA5hAuwM277UYiD67QC+DZJN+h8/dlSJQiYUB zdRYhLQQ2r4OPQYiJMwbIX5q78KrU53HESIjJSS28ruI/rYIRWOldvLPzLFJgO0/rdgz GwSw1wC3iUQjx5jsC0Rm9ezwu/L7Xzuk1Lrdb5eQSVSsxuTBcSNsnZZQ6/DuUP7Uv3uc L2cA== X-Gm-Message-State: AOAM532HT/ANoiaHmrod4nO6M+Q7h10Nurd7FmBQvMU+/TZI3Nz9J1X8 r2JwBsaY85kv+yHXH2P16TAfwA== X-Received: by 2002:a1c:32ca:: with SMTP id y193mr5186093wmy.56.1614936221469; Fri, 05 Mar 2021 01:23:41 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l6sm3565217wrm.71.2021.03.05.01.23.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 01:23:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C38851FF98; Fri, 5 Mar 2021 09:23:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 9/9] tests/docker: Use --arch-only when building Debian cross image Date: Fri, 5 Mar 2021 09:23:28 +0000 Message-Id: <20210305092328.31792-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305092328.31792-1-alex.bennee@linaro.org> References: <20210305092328.31792-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , f4bug@amsat.org, Christian Ehrhardt , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé When building a Docker image based on debian10.docker on a non-x86 host, we get: [2/4] RUN apt update && DEBIAN_FRONTEND=noninteractive eatmydata apt build-dep -yy qemu Reading package lists... Done Building dependency tree Reading state information... Done Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable distribution that some required packages have not yet been created or been moved out of Incoming. The following information may help to resolve the situation: The following packages have unmet dependencies: builddeps:qemu : Depends: gcc-s390x-linux-gnu but it is not installable Depends: gcc-alpha-linux-gnu but it is not installable E: Unable to correct problems, you have held broken packages. Fix by using the --arch-only option suggested here: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1866032/comments/1 Suggested-by: Christian Ehrhardt Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210223211115.2971565-1-f4bug@amsat.org> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian10.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker index 9d42b5a4b8..d034acbd25 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -32,6 +32,6 @@ RUN apt update && \ psmisc \ python3 \ python3-sphinx \ - $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) + $(apt-get -s build-dep --arch-only qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) ENV FEATURES docs