From patchwork Thu Apr 1 10:25: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: 12177753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9D3EC433ED for ; Thu, 1 Apr 2021 10:32:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6404660234 for ; Thu, 1 Apr 2021 10:32:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6404660234 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRucn-0001ex-E0 for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:32:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWZ-0002kv-If for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:08 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:45619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuW8-0001jf-LN for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:25:51 -0400 Received: by mail-wm1-x32c.google.com with SMTP id r10-20020a05600c35cab029010c946c95easo626292wmq.4 for ; Thu, 01 Apr 2021 03:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UUd4r76RZdIJQegFZ5ruGUZO9+fRBe7z4dq6+5SfFjQ=; b=K38lZCL1LpGQtTxKIEZTZKDJCSxufuyNY8SuI9r7lEs+WxKlHx6C2cNTO81qI+HXhd 7O0zM5LLT78YPaOSMuj/t6tfB9njcGPJSgM/x/kC+2mVtQn9voPWJZWZZ4V4pBghYRjv hnd02pJbn6bXOyT2csKLdS0IPzJntxioaW9rXNh8la9GhV3QaTh4zKwIpl9bfux86DmS X+tSZXWi/fdXOiEUkNI1et+Loq/xMmL4JvvbyibuiHK1gDh1cdX3FAN7/VQjUAIh+eM7 F5OQORfydh9pQXBCXpt7TusBRUk0DQH+GdvcWyPpV8wOGhlNXpd1Y16gA3fEPiH6uTaG aFlg== 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=UUd4r76RZdIJQegFZ5ruGUZO9+fRBe7z4dq6+5SfFjQ=; b=AcQ4zOvkcr89A16VdMtKT64ydMFhrCHmc50QXKM5BeQ9QJwZkTl4l9b4SjQE+F/xlC OfyKfhQuOGTNZKi4WQY8Ml2Vs00QvGZGgw8IDZsv9Sg0zLojDXbisDrnBVhHbk+sSByl r5dSkuVSt5pFSskDqYqsNILUvDM7uNlRDbbAjhvejgpurX5GtMlX/rJpFq+CEnJca/2e 8ellJEdRHYWiOCZKu7XabxNwdZCjQwe1g86TkBW/Bo8EfH/rgKy4ebWFUlrs1qk/vynB nVZ3MLRFmxlCQjZu2r4LOrnDp3wucPIF6+lHbLxuDWwc0Xp3CUGHkfKx4XWCm0TEJjto JhuQ== X-Gm-Message-State: AOAM532/dwwAnM8ywopzgaPfOLTkP3i9kYG9AebGSabfNHvqXb74geWG ECWs9HqJJmIj9IboKdIpjkKOjg== X-Google-Smtp-Source: ABdhPJwqDdVfBvQREdQsDV5z9Aj3829ixSgOULnO7YSMu8NglZzw8PC9xxstomiQT4leHY1kH0NfjQ== X-Received: by 2002:a7b:c2fa:: with SMTP id e26mr7227607wmk.102.1617272734618; Thu, 01 Apr 2021 03:25:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g16sm9697474wrs.76.2021.04.01.03.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 846371FF87; Thu, 1 Apr 2021 11:25:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/11] tests/tcg: update the defaults for x86 compilers Date: Thu, 1 Apr 2021 11:25:20 +0100 Message-Id: <20210401102530.12030-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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=unavailable 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, Richard Henderson , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" You don't usually notice this is broken on developer system on x86 as we use the normal host compiler. However on other systems the -pc was extraneous. Also for 32 bit only i686 packages exist now so we should use those when available. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- tests/tcg/configure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index ce304f4933..af4aecf14e 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -52,7 +52,7 @@ fi : ${cross_cc_hexagon="hexagon-unknown-linux-musl-clang"} : ${cross_cc_cflags_hexagon="-mv67 -O2 -static"} : ${cross_cc_hppa="hppa-linux-gnu-gcc"} -: ${cross_cc_i386="i386-pc-linux-gnu-gcc"} +: ${cross_cc_i386="i686-linux-gnu-gcc"} : ${cross_cc_cflags_i386="-m32"} : ${cross_cc_m68k="m68k-linux-gnu-gcc"} : $(cross_cc_mips64el="mips64el-linux-gnuabi64-gcc") @@ -69,7 +69,7 @@ fi : ${cross_cc_cflags_sparc="-m32 -mv8plus -mcpu=ultrasparc"} : ${cross_cc_sparc64="sparc64-linux-gnu-gcc"} : ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"} -: ${cross_cc_x86_64="x86_64-pc-linux-gnu-gcc"} +: ${cross_cc_x86_64="x86_64-linux-gnu-gcc"} : ${cross_cc_cflags_x86_64="-m64"} for target in $target_list; do From patchwork Thu Apr 1 10:25: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: 12177711 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8062AC433B4 for ; Thu, 1 Apr 2021 10:28:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D0088600D1 for ; Thu, 1 Apr 2021 10:28:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0088600D1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRuYS-0004Xt-L2 for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:28:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWT-0002j3-CQ for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:25:59 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:33377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuW6-0001iq-IK for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:25:46 -0400 Received: by mail-wr1-x42c.google.com with SMTP id o16so1311554wrn.0 for ; Thu, 01 Apr 2021 03:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yYro9+doI0v6QdY4ETT7gw047cu/gwITcrYScrukAOc=; b=zloWy0+b0V8RriSsEbQtj9nmfMLCGOWC4DZgsA1rRLwxL51WSu7lYNPJjhMAVukmT9 Jq2bkWUODB1xUoKfYpgrcBFNHEnpo9pJDfYFKHrZ3npOhFYXi40ViWM9NoEP9YFJaUlX +wj37cz+OEWSuloaBZXssz5aY60te/rX2P9vV7+3tQjHl2TA524xLrSaIQgPDGI4hQ5M D9623O5NWnvnWRrCKH6Dm0Di1qTzTn9hAQlAE7rSI7AQDJWCz6VnO87z09CCBpSlOivF 1BcESTFnGX3+mH9wqaUrQx407OO0ozFvYtc9ngJ3ql3ozd/TElVe/uDxwwnQR6iayOJM pqoQ== 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=yYro9+doI0v6QdY4ETT7gw047cu/gwITcrYScrukAOc=; b=oHSsfym6tV7sNKK56s4V93E90Nf8pCx9s1SDol4jubDNhfBivDCDgrunvjzm7QxVUR c5uz+D4nm5/PlbDQeRgEUtDXb36HbVxp5zUWxBoUQ4J+WxPbaSlpdy8KPdrzrq7ppVSB bng/hn3nTCNeeV1fIDPwt8Sa1ZRKO4rCPYLbzOqYKZXhlnrJGC4FTRG3Kq+pMdIpcB2t Xb4RaZBZIP7aKnkNiuNrYZkKvfF3429Mi5g1Oj1fUdKe+qmTb7WIlbxlScC5JXJwC9Pb IOUp4kTEnbQTWmQ5B6i+x4ESBGhG0uVFNsrRk/5PlNGrn7rD10EgI0K/SIDuyJB/8t8J brpQ== X-Gm-Message-State: AOAM533+Z1VhzlAMq5RtsCZkE1HYiid2D7YfqhPNG3rso0NwQq8M9nct 8EYEjDUwePK/sz3WarZi5JzpRQ== X-Google-Smtp-Source: ABdhPJzSYCK0kGTMFfZ9gNE5PtWqd52wcdjnM/rzG3IgofhqBQF1sWDeT6ITJgJBDczVNOUocIot8w== X-Received: by 2002:a5d:4532:: with SMTP id j18mr8663387wra.239.1617272732907; Thu, 01 Apr 2021 03:25:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n8sm8555367wrm.70.2021.04.01.03.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 992F51FF8C; Thu, 1 Apr 2021 11:25:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64 Date: Thu, 1 Apr 2021 11:25:21 +0100 Message-Id: <20210401102530.12030-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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, Richard Henderson , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Currently our gitlab registry is x86_64 only so attempting to pull an image from it on something else will end in tears. Reviewed-by: Willian Rampazzo Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7cab761bf5..9f464cb92c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -16,7 +16,10 @@ DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.doc DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache -DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),registry.gitlab.com/qemu-project/qemu) +ifeq ($(HOST_ARCH),x86_64) +DOCKER_DEFAULT_REGISTRY := registry.gitlab.com/qemu-project/qemu +endif +DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY)) DOCKER_TESTS := $(notdir $(shell \ find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) From patchwork Thu Apr 1 10:25: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: 12177755 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA892C433B4 for ; Thu, 1 Apr 2021 10:32:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2F97A60234 for ; Thu, 1 Apr 2021 10:32:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F97A60234 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRud8-0002Cg-6z for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:32:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWc-0002l8-V3 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:14 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:37525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuWA-0001jj-Nf for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:25:50 -0400 Received: by mail-wr1-x429.google.com with SMTP id x16so1281844wrn.4 for ; Thu, 01 Apr 2021 03:25:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AYugguvZY758PcKs/PdSeUMvYaWOhfGF5y8PoXI3cIc=; b=idQ0RiOVaSVEc/U9EK5wZ7J8gUpIFM9pfQtXVB7nSJe0s0hIT+nGMf53xbnSNJBV4y fXWIdwg1bVteuYaE7iebTYmGBwyR6nzEJIrNba5ab75mGp8jwEOzWKHMJsrJQ7oP/Ygc fYAQUmaZN54cZA5AL2SmTVND62rugm4yegQzqHKknoDCOagVcvZH6dJQM0iAfeWp1UG0 3ClOEmQBHHGp1+dev6BkG2eKJvsszCOgRknTthC2DN0e2+yIoJnB374rpwhS3bDJXYIs EiESZy4FcZ2IeTo5q8HZQtggYzvm+3ZoGR8QI+7LfzRuBhH0cqok6bceOXsFcyIYh9rK gQYw== 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=AYugguvZY758PcKs/PdSeUMvYaWOhfGF5y8PoXI3cIc=; b=ZrcTE+QLUCuDOpyxfZsVlHjxQrch7yJ/ZyJMnr+j1QBE7AyYg/U+39/sVZ0fogsL/8 QnakJl+V4dZF/hVmzEuE9AZH6jX3kAl09HM100yjGIQaMaJeNQuBwNucCi+UWY+G8BSk IG8FVx2eKXSmcLrBS7TzgeATMgi+s4wgrppW2ye5wOi37JMccySH/rv3QPjNTkFsH4L7 QU1knQt1+9QnhsG0OAbTr7l7WvE50F0mEReTYnUHEVo7yCpUfRcmaHuSzTU+OghYAk68 GkoctubBfYGtQkGS8QebNwoO16UKbdVXU+304x/LZ4HhK3/NQl9ToZHZesV7kcyyOg7Z MweA== X-Gm-Message-State: AOAM532TCr24E+Ly3SPpGl8ZJeA8jnT6PHgHNOh448jqGsT5fnDwRpr1 T6GkgzrwWDKCtsQInF0FO+P5iUECGOVBHQ== X-Google-Smtp-Source: ABdhPJxNN12VNH4+Vk2ZETfOe1df2iG+jcfeLyhZVK16wzhP4TsS9nULK8VTYTDuC0rlyXBpSXAxMg== X-Received: by 2002:a05:6000:2af:: with SMTP id l15mr8959975wry.387.1617272735522; Thu, 01 Apr 2021 03:25:35 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l15sm9071526wru.38.2021.04.01.03.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B0CDC1FF8F; Thu, 1 Apr 2021 11:25:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/11] tests/tcg: add concept of container_hosts Date: Thu, 1 Apr 2021 11:25:22 +0100 Message-Id: <20210401102530.12030-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" While docker is nominally multarch these days it doesn't mean our distros actually package all cross compilers for all architectures. The upcoming Debian bullseye release will improve things further. At least for now we can get things like the 32 bit ARM compiler on it's 64 bit cousin. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 2 +- tests/tcg/configure.sh | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 535e6a9269..7df7750a14 100755 --- a/configure +++ b/configure @@ -6299,7 +6299,7 @@ done (for i in $cross_cc_vars; do export $i done -export target_list source_path use_containers +export target_list source_path use_containers ARCH $source_path/tests/tcg/configure.sh) # temporary config to build submodules diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index af4aecf14e..87a9f24b20 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -108,79 +108,98 @@ for target in $target_list; do case $target in aarch64-*) # We don't have any bigendian build tools so we only use this for AArch64 + container_hosts="x86_64 aarch64" container_image=debian-arm64-test-cross container_cross_cc=aarch64-linux-gnu-gcc-10 ;; alpha-*) + container_hosts=x86_64 container_image=debian-alpha-cross container_cross_cc=alpha-linux-gnu-gcc ;; arm-*) # We don't have any bigendian build tools so we only use this for ARM + container_hosts="x86_64 aarch64" container_image=debian-armhf-cross container_cross_cc=arm-linux-gnueabihf-gcc ;; cris-*) + container_hosts=x86_64 container_image=fedora-cris-cross container_cross_cc=cris-linux-gnu-gcc ;; hppa-*) + container_hosts=x86_64 container_image=debian-hppa-cross container_cross_cc=hppa-linux-gnu-gcc ;; i386-*) + container_hosts=x86_64 container_image=fedora-i386-cross container_cross_cc=gcc ;; m68k-*) + container_hosts=x86_64 container_image=debian-m68k-cross container_cross_cc=m68k-linux-gnu-gcc ;; mips64el-*) + container_hosts=x86_64 container_image=debian-mips64el-cross container_cross_cc=mips64el-linux-gnuabi64-gcc ;; mips64-*) + container_hosts=x86_64 container_image=debian-mips64-cross container_cross_cc=mips64-linux-gnuabi64-gcc ;; mipsel-*) + container_hosts=x86_64 container_image=debian-mipsel-cross container_cross_cc=mipsel-linux-gnu-gcc ;; mips-*) + container_hosts=x86_64 container_image=debian-mips-cross container_cross_cc=mips-linux-gnu-gcc ;; ppc-*|ppc64abi32-*) + container_hosts=x86_64 container_image=debian-powerpc-cross container_cross_cc=powerpc-linux-gnu-gcc ;; ppc64-*) + container_hosts=x86_64 container_image=debian-ppc64-cross container_cross_cc=powerpc64-linux-gnu-gcc ;; ppc64le-*) + container_hosts=x86_64 container_image=debian-ppc64el-cross container_cross_cc=powerpc64le-linux-gnu-gcc ;; riscv64-*) + container_hosts=x86_64 container_image=debian-riscv64-cross container_cross_cc=riscv64-linux-gnu-gcc ;; s390x-*) + container_hosts=x86_64 container_image=debian-s390x-cross container_cross_cc=s390x-linux-gnu-gcc ;; sh4-*) + container_hosts=x86_64 container_image=debian-sh4-cross container_cross_cc=sh4-linux-gnu-gcc ;; sparc64-*) + container_hosts=x86_64 container_image=debian-sparc64-cross container_cross_cc=sparc64-linux-gnu-gcc ;; xtensa*-softmmu) + container_hosts=x86_64 container_image=debian-xtensa-cross # default to the dc232b cpu @@ -265,7 +284,11 @@ for target in $target_list; do done if test $got_cross_cc = no && test "$container" != no && test -n "$container_image"; then - echo "DOCKER_IMAGE=$container_image" >> $config_target_mak - echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> $config_target_mak + for host in $container_hosts; do + if test "$host" = "$ARCH"; then + echo "DOCKER_IMAGE=$container_image" >> $config_target_mak + echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> $config_target_mak + fi + done fi done From patchwork Thu Apr 1 10:25: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: 12177715 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF2C6C433ED for ; Thu, 1 Apr 2021 10:28:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 439BB600EF for ; Thu, 1 Apr 2021 10:28:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 439BB600EF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRuYU-0004b0-6L for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:28:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWc-0002l9-Vi for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:14 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:43804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuWC-0001kZ-Px for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:25:56 -0400 Received: by mail-wr1-x42f.google.com with SMTP id x7so1262426wrw.10 for ; Thu, 01 Apr 2021 03:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HDXuUnUxtCz/PU0/mLdc7zRzMRtv8NDpCUEdED4RHtw=; b=bzljo8ZbfnzmpUabhEWJ5piXmZmtdrSUE934WkcJ5WCZy7CtG6+JrFlm+YG/00EXqI JkjRRUmw8bNK8QNHFTfFE1HzH1DqfL/kghOS6/ZCIInDJw1M+NbAbFut1s/z6g1RgklD /+tQd3YSfRgbvCdwLOix4zWjTSHz/67OxVvG7q1702RxKKPimqR2pvgrRyew7iCZlvdx zt24JDJqwfVZogmAAY4AQMHwjV4Oc9DhATTmLiF9R6nphjhRZ92B+W8PJf2BEo8jAlC0 o45uvNKnOHiNBG8uht2FMuge1dcq52zsD7FUNw1E3XuYPnWMwiIC0DWlZPAed//FQf9o Ycsg== 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=HDXuUnUxtCz/PU0/mLdc7zRzMRtv8NDpCUEdED4RHtw=; b=D9SzqVkRukCVjPkQZzjAIH4YelsIG7LM8s+iNfOvNDxpCa4cWWvT2OQyvNtfGU189M BAvT5NFQUTvLWboMOnAeCXs+jEQnf+L7UVwS1njMN1H6DKpm5va1cuTsAIntKQJiW6s/ /I70yRh8xiVxpkQmC4XfCLcpX8xcOVbAMIx1VPf4TwrrfbNMG2ZFSVfq/Tr0Htkxaqui Wpixc+v5ZsuWshYqKIayFXbO5n5eUh1whL/H6ArJTR/mMJtD42/6xEbh2an2TyER+Bas PV7B27S/6rpTX50SAJFRw/Z95HgDj6Y6zxf+tKNfxW01H12G3XFAj28eZduFeUEkJEM2 Gc5A== X-Gm-Message-State: AOAM530IdX25v0mjIyg9QqXBthvcZ5wWLfU3O53bmVfD1a9ipIksNGSA xIbADBszVqe+qkww0KOt1YKLKg== X-Google-Smtp-Source: ABdhPJxXLogNKb6RvA/NBFje+JrJBPT50uTyiFj4mRKMJ3p+T3oB9eqlSdNo3ypDGHM1LwB6JFa/bg== X-Received: by 2002:adf:fbc8:: with SMTP id d8mr8953707wrs.94.1617272737500; Thu, 01 Apr 2021 03:25:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f2sm8162005wmp.20.2021.04.01.03.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C5BCF1FF90; Thu, 1 Apr 2021 11:25:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/11] tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers Date: Thu, 1 Apr 2021 11:25:23 +0100 Message-Id: <20210401102530.12030-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" While it's hard to find cross compilers packaged for arches other than x86_64 the same cannot be said for the x86_64 compiler which is available on Debians i386, arm64 and ppc64el release architectures. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/configure.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 87a9f24b20..90fd81f506 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -198,6 +198,11 @@ for target in $target_list; do container_image=debian-sparc64-cross container_cross_cc=sparc64-linux-gnu-gcc ;; + x86_64-*) + container_hosts="aarch64 ppc64el x86_64" + container_image=debian-amd64-cross + container_cross_cc=x86_64-linux-gnu-gcc + ;; xtensa*-softmmu) container_hosts=x86_64 container_image=debian-xtensa-cross From patchwork Thu Apr 1 10:25: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: 12177747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29B62C433ED for ; Thu, 1 Apr 2021 10:30:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ACBCB606A5 for ; Thu, 1 Apr 2021 10:30:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACBCB606A5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRuaU-0007cH-DP for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:30:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWZ-0002kw-Ic for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:08 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:39855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuWC-0001kd-PP for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:25:52 -0400 Received: by mail-wr1-x42d.google.com with SMTP id e18so1272350wrt.6 for ; Thu, 01 Apr 2021 03:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=opeUC5C6r1uSuiB1pagYN0HxujmEfcF2QxH/SrfIY8s=; b=ihEAYnp5QBgAqTxahQhTM2GAusz0DEWk3xQQdy9nGKRe9profCKb2icMuF3Ilz3kd4 Nn5BQEiNqMjTr9Elc3+z9FNpbI6/+ZbRN0lV0Zdx9Q9m0ecBU6dQD7BdLtLYiRqXJGX2 Z49lqrFJsGasSQR+rNc8jnqL4ReC1LZZqQZ5fJsmH6FOvwcBs2NwPY6oyTnIbA0o2sVh ua1Cj69Ba16dUM/fp5D4c88dPQVzUksHUkkgq+gQsE+zs48kSg2bZz1pzw5PYTObATQp k1wANjfQuhVVfRkjxy8o35eAdBK2gVIUa876oI8zA5/IlNxzQBvGekkrhbaBreZHsBrs Ho0w== 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=opeUC5C6r1uSuiB1pagYN0HxujmEfcF2QxH/SrfIY8s=; b=IeOXTV84lL1bqeVlvVdU7kERMGqc0s6winSNL2ixwdGSTL5mUau9Yo/kGO1BUIQgVM 5ho1fID6GCREJbyMUvx18DbCe24DOuDZGyQe/Efk32j2amZFQi5UdyVr2Hxj9Sjmx/jD sRY94WfwTqDEk8GHo8AR3p8B2T3i93DXHdjYh/ob0s2xVAKiMnCEodJB6652SenljHTI NHLShVfwZ9ou7uCHO1OoTIJ1G5CErLw2M+VXlgSyBYNAR5MnG/jTC6I8wKPeZdzo4ndH w3X1yN7vXfzW/QT1POlpYCJEBKPAjk4rfpVP6Z+V9l6v9LDgmLXYS0YMh0Ppm7oeTp9E nrzg== X-Gm-Message-State: AOAM530bGutZYxttJeYiqntgth3DQDdBKI9y8oy3EGsu9NfvmvfRdllD vPPjqx0L4V9HbyUl/QQzq+QB0A== X-Google-Smtp-Source: ABdhPJwKgj7gjs28xQy/ASVIeZgFzd3zB+MD5KlA2kbga/5O8OQ57NsjpdkrSm1IxG8lsAl731DpHA== X-Received: by 2002:adf:d1cd:: with SMTP id b13mr8749557wrd.47.1617272738509; Thu, 01 Apr 2021 03:25:38 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l6sm10266300wrn.3.2021.04.01.03.25.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:36 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DAF951FF91; Thu, 1 Apr 2021 11:25:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/11] tests/tcg/i386: expand .data sections for system tests Date: Thu, 1 Apr 2021 11:25:24 +0100 Message-Id: <20210401102530.12030-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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=unavailable 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, Eduardo Habkost , Richard Henderson , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Newer compilers might end up putting some data in .data.rel.local which was getting skipped resulting in hilarious confusion on some tests. Fix that. Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée --- tests/tcg/i386/system/kernel.ld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/i386/system/kernel.ld b/tests/tcg/i386/system/kernel.ld index 92de525e93..27ea5bbe04 100644 --- a/tests/tcg/i386/system/kernel.ld +++ b/tests/tcg/i386/system/kernel.ld @@ -12,7 +12,7 @@ SECTIONS { } .data : { - *(.data) + *(.data*) __load_en = .; } From patchwork Thu Apr 1 10:25: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: 12177787 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3097FC433B4 for ; Thu, 1 Apr 2021 10:36:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 92CD56108B for ; Thu, 1 Apr 2021 10:36:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 92CD56108B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRugn-0005QH-5V for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:36:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWp-0002oR-8k for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:19 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuWI-0001lJ-JO for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:12 -0400 Received: by mail-wr1-x42b.google.com with SMTP id j9so1261352wrx.12 for ; Thu, 01 Apr 2021 03:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rTMdnuZrQXPhdMtK6L8H7oKEdE7GRmWL93bfr6A1xC4=; b=ejM5JhYT3GN9/p0ZMFH1Qi0ADcPvFOiQ/xXH5PYgtSHQTw6mAEGeJgY/zbsXzqFxrB +Wlu62aNhX0/EB4mKnDZhFv8Oc8ae0x6yoD7qTs7hOIGQVVdw8LgdbA5KPWryvxz/wIR K3Ti3CIsqmpI5lRBcjGrUpi25yzO/TNLOjZPap1CRuQGE92ZCq6ilO/NkwONSNdLyfxM QxA7FGSPJZsMGzHouPoxfTkVqOHwpokeGmcv4zuuwFlPvHnljcSMM7RmVC0++yPs2qBE vAA9ltf4SZbO3KxmR6kq5UwxejRK+PgRYg862aK9+vAh4LAxyqZkKv2JQbr45EDXJxVY /dQQ== 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=rTMdnuZrQXPhdMtK6L8H7oKEdE7GRmWL93bfr6A1xC4=; b=QmYU4zhlzxdi9dehKydMrPJWCdlQsBAqLMIP1ErF+TuPi7uchXEYOMLWT1BuHx0Jp/ zvr5jDN7qZLq9yw+nO0X+ndhJ2z0t2D4hPNq50OvQ++PQwXySx9WuS+u0wqfor8SqUyH L+p4UtUP9aYeqHZnESsIHyr5SksnMqAH25w0Zpm39v7rAZQVUd1Co8lEwD3RgMY+o0FP dOAJINMkDCcQUh/i6ju+y4ommbm8rdn1NfbP8RG3uzpWCFrAl+WJ3SIR0QUcx5EIZIyH y9AOXZqyFX0JcJmqW4Vmzf1Y0VwhRIIWKAgIS+DJLD36vpFVSzQKEPoQtECzF7UZyCLe PWpw== X-Gm-Message-State: AOAM532u8w8q/5vmx0S9PhOBzm1hpVgokAogAc2Nm0YpdI7W+6aJf56x hCrLYcQUoBoY95Y+/0mTn6cCKA== X-Google-Smtp-Source: ABdhPJwzQDoYrvV+Fq7vURIwxPs3G+Trg7ZOLfbMWoMTd7j0JuCyS5fMlfYRnY44QwpJITjwd8N32w== X-Received: by 2002:adf:f4c1:: with SMTP id h1mr8883548wrp.71.1617272742678; Thu, 01 Apr 2021 03:25:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h10sm9064001wrp.22.2021.04.01.03.25.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:36 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F1E191FF92; Thu, 1 Apr 2021 11:25:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/11] tests/tcg/i386: force -fno-pie for test-i386 Date: Thu, 1 Apr 2021 11:25:25 +0100 Message-Id: <20210401102530.12030-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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=unavailable 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, Eduardo Habkost , Richard Henderson , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The containerised compiler defaults to no-pie anyway but if we are relying on the users installed cross compiler we need to check it works for building 16 bit code first. Signed-off-by: Alex Bennée --- tests/tcg/configure.sh | 6 ++++++ tests/tcg/i386/Makefile.target | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 90fd81f506..46bc8634bb 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -281,6 +281,12 @@ for target in $target_list; do echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak fi ;; + i386-linux-user) + if do_compiler "$target_compiler" $target_compiler_cflags \ + -Werror -fno-pie -no-pie -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak + fi + ;; esac enabled_cross_compilers="$enabled_cross_compilers $target_compiler" diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index c4a6f91966..f7efaab918 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -27,13 +27,23 @@ run-plugin-test-i386-bmi2-%: QEMU_OPTS += -cpu max hello-i386: CFLAGS+=-ffreestanding hello-i386: LDFLAGS+=-nostdlib -# -# test-386 includes a couple of additional objects that need to be linked together -# +# test-386 includes a couple of additional objects that need to be +# linked together, we also need a no-pie capable compiler due to the +# non-pic calls into 16-bit mode +ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_I386_NOPIE),) +test-i386: CFLAGS += -fno-pie test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386-shift.h test-i386-muldiv.h $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ \ $( X-Patchwork-Id: 12177751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C01AC433B4 for ; Thu, 1 Apr 2021 10:31:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3011860234 for ; Thu, 1 Apr 2021 10:31:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3011860234 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRubh-0008Oz-5d for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:31:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWi-0002lK-4u for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:14 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:46873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuWG-0001kv-TR for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:01 -0400 Received: by mail-wr1-x434.google.com with SMTP id v4so1253122wrp.13 for ; Thu, 01 Apr 2021 03:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CpLm1kUZyBISIhBEEKQZmPYby9LYdqEZ3YfXq/Sye7M=; b=NLSJZvY0eA1rdSOHCMlUH12q0H0dMuxBaHzuXSwMofXvY1s5B7eYkRa0kjK8pAb/o8 CjuXA2JweYrhHAvbwv6Ecd/UNmL5uewRs//jx8ZRBM3T57zxaZy/gfSVG+7TvE0SFe85 l5h6YnEqZIq0E63nm+7Y3TnzXpwMKfPdFx87LKT4l9sH5y0/CD/udiK24w4p2IBjWh5T kW+N/zrzYYrVsAh79ryt9k0qYymxlWOHVaBwJrM7en/3PBW83PLuWAuBg1jajbVCjTk1 zpeGVdtpaIUXzIwvtwATgACKybwZW33MHpuLNw+2NzibFpiilM4dma9zXnqhEMtLXD5w zU+Q== 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=CpLm1kUZyBISIhBEEKQZmPYby9LYdqEZ3YfXq/Sye7M=; b=sAQ8A9p4QBtXQPIU2lDdYPDSl8TqS5CPj1/OU7Yz7MfM87A3F+Z2WyGjEP4RwBdhfq DSZfeDQluVmfJcZxjW0f4eouR/a2VssomiyEamrf/dbKCyZ/DvaAi50eQckFzMpjpFYW 7JlzgKxNjGdK4Ox0LU76nPR3/qNvOJN2xbaoaeNL/YGVSn+/4FOnt/iTPiL01T/tQIgr 6671EjrWKdaIJWrvr9ox65KWVD6P+BFnVQEmU6TwhUN+Xb+JbdPu9keh6v0JIiVqFYec +S+mv/5pyEezE+PahmQ/bwjDPecj0aidq+S1xU9f+fkeHSOEotps3Ce7sEvgHmAdtTJb RHVg== X-Gm-Message-State: AOAM530Jl1oLSX9ZC4OxK+5DL+wPE/gTLertYHPpyzcLENgO9P4NgPnF BmlbhkezFjHAV2frabaua6jP9Q== X-Google-Smtp-Source: ABdhPJyVFAb5eG9uIE9pnGWI6sooywaXGauqIss0z3bZYW6fxRovWgZXpjfvcCatlXvw4O85U+36Jw== X-Received: by 2002:a5d:6b86:: with SMTP id n6mr8728625wrx.52.1617272740069; Thu, 01 Apr 2021 03:25:40 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j16sm26373325wmi.2.2021.04.01.03.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:36 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 12A7E1FF93; Thu, 1 Apr 2021 11:25:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/11] tests/tcg: relax the next step precision of the gdb sha1 test Date: Thu, 1 Apr 2021 11:25:26 +0100 Message-Id: <20210401102530.12030-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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=unavailable 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?q?=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Depending on the version of gdb we may not execute the first line of SHA1Init when executing the first "next" command - instead just stepping over the preamble. As we don't actually care about the position of the PC after the steps and want to be sure the context->state[] has been loaded before we inspect it do a double next at the start. Signed-off-by: Alex Bennée Tested-by: Richard Henderson --- tests/tcg/multiarch/gdbstub/sha1.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/tcg/multiarch/gdbstub/sha1.py b/tests/tcg/multiarch/gdbstub/sha1.py index 2bfde49633..423b720e6d 100644 --- a/tests/tcg/multiarch/gdbstub/sha1.py +++ b/tests/tcg/multiarch/gdbstub/sha1.py @@ -40,7 +40,10 @@ def run_test(): check_break("SHA1Init") - # check step and inspect values + # Check step and inspect values. We do a double next after the + # breakpoint as depending on the version of gdb we may step the + # preamble and not the first actual line of source. + gdb.execute("next") gdb.execute("next") val_ctx = gdb.parse_and_eval("context->state[0]") exp_ctx = 0x67452301 From patchwork Thu Apr 1 10:25: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: 12177783 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90BF6C433ED for ; Thu, 1 Apr 2021 10:34:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E30C461004 for ; Thu, 1 Apr 2021 10:34:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E30C461004 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRueT-0003Se-PW for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:34:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWi-0002lL-5Q for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:14 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:35340) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuWF-0001l9-2n for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:02 -0400 Received: by mail-wm1-x333.google.com with SMTP id a132-20020a1c668a0000b029010f141fe7c2so2613279wmc.0 for ; Thu, 01 Apr 2021 03:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DDM7zLw72jwQGNOFBTGTvh0L6SEF/PDzTwXwQAd4aYo=; b=E7/NwBFqfI6c2ItQJy9XITnE5VDD3Lg/fw/RyeIzDfXdn1vs/DlcW8YbVJrckERjPZ O+eFLUTJE4W8YggfdinYIp0QX7juxnSJBhMdDPFrhxeCFBfLil+7cZaxXC5vyWI8zFD0 ZZfo7p6YT1f18C+Ar7affdnfQFwIfhnKXUzfSdgT8N4w8ppBO3GGh/7/68XkUZutjeqb r2YXub09i0EdpOYb1W6t42A6BhRToU8NbkBZ2WrH10jw9qcwzjQeNKtA0EH6IeyblYjV GsYdTvlaNkYE3p+XtX8FmzjbfFSuQxPIACIyB7/2k9qkBrGYdIPkfBZY2JxBx4+Qkc5f YVXg== 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=DDM7zLw72jwQGNOFBTGTvh0L6SEF/PDzTwXwQAd4aYo=; b=dILwtRUhXn/xV3NJz/Uvo6af5Xkvdf5Z3HCFUxU8O8Z1jxOC3fAA0PUbsTOiZt9LQC drK+BrPkSHqf4803odqpqK8xSrIz/lXos7rzPh4//cd7MbrHSqHtl5DzQ59wvdJ2BZaA hkFveJQKDa/LvzfL0hMWIcLU0ZyynhvuvA1Bf9xChFcOnB856tRQ7eQFkWhyr5GOjchF OrNbqkjy+mqeW8Qzf8Z1pHdS1zrI24PkjrU5QhHCbAg4exTkybTyjZ96wcStxmvFDpU+ MBGavm2D+z0kAhQt3+JO0VNMUSruc7K7EWLVfn6DSyD9zrb7c38mkecyYf8l5bRb8d0J f6Hg== X-Gm-Message-State: AOAM530GJs1WUQ+5AwQdMgDXT/cyrPgc0bV5ar12RjfLBTomkZsV32ba jQaL7gm938F3tGA/lZFuZjKudALKwTEEeA== X-Google-Smtp-Source: ABdhPJxomChLZvFObKV9qg3HWlotQEYRvrPHjVbj08AOhxSky9urjblPIgmzOTdqFoBiT7/fgwl+sQ== X-Received: by 2002:a1c:df46:: with SMTP id w67mr7260502wmg.176.1617272740962; Thu, 01 Apr 2021 03:25:40 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l4sm6106717wmh.8.2021.04.01.03.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:36 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 275361FF96; Thu, 1 Apr 2021 11:25:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/11] docs/system/gdb.rst: Add some more heading structure Date: Thu, 1 Apr 2021 11:25:27 +0100 Message-Id: <20210401102530.12030-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-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=unavailable 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, Peter Maydell , 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell We're about to add a new section to gdb.rst. In preparation, add some more headings so it isn't just one huge run-on section. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210325175023.13838-2-peter.maydell@linaro.org> Signed-off-by: Alex Bennée --- docs/system/gdb.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/system/gdb.rst b/docs/system/gdb.rst index 72b1e68f4e..0bb1bedf1b 100644 --- a/docs/system/gdb.rst +++ b/docs/system/gdb.rst @@ -45,7 +45,11 @@ Here are some useful tips in order to use gdb on system code: 3. Use ``set architecture i8086`` to dump 16 bit code. Then use ``x/10i $cs*16+$eip`` to dump the code at the PC position. -Advanced debugging options: +Advanced debugging options +========================== + +Changing single-stepping behaviour +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The default single stepping behavior is step with the IRQs and timer service routines off. It is set this way because when gdb executes a @@ -88,6 +92,8 @@ three commands you can query and set the single step behavior: sending: "qemu.sstep=0x5" received: "OK" +Examining physical memory +^^^^^^^^^^^^^^^^^^^^^^^^^ Another feature that QEMU gdbstub provides is to toggle the memory GDB works with, by default GDB will show the current process memory respecting From patchwork Thu Apr 1 10:25: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: 12177713 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 009F7C43460 for ; Thu, 1 Apr 2021 10:28:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4F1B9600EF for ; Thu, 1 Apr 2021 10:28:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F1B9600EF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRuYT-0004Xl-07 for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:28:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWm-0002nF-Sk for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:18 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:56059) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuWI-0001lN-Iw for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:06 -0400 Received: by mail-wm1-x334.google.com with SMTP id 12so779015wmf.5 for ; Thu, 01 Apr 2021 03:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gaEdWGiRTo1hlw6xzQuwByewAfSKuO+zL+10ye64N3k=; b=TY9Xe8r+RgBZn2tZc8Fc71wR1aPUsR/jhO1fiTRBcoyph7cD2FDnNG0nmXB5/C9AyG KLw964Fzmvr4HN7yCgRklSWSYhmdSDDyJBomYR5bAqIfWR4AL2rN4Ludm8QtIfB88kT5 QWEOKhoAPYKNpSTs2vqQ1/ksRadaoBx2DwWiWBfk2APObcAzAHDHZUZaAoq/cNCggzpd Ycxak0tligzQqIcsYoIdOOuTRb599hTqTrBHoFdutsHensC8eytH99h/54iH2Maay7N6 1SPTrurYw3amvstisnGxicbkJjkpYLUPv1LVbkYy9JevlAl6lu3BwS6uknt4dvulv7nj uSiA== 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=gaEdWGiRTo1hlw6xzQuwByewAfSKuO+zL+10ye64N3k=; b=SbY2txXJKN3w46azo6hQDjam2AF5mRp7C7HqLJVrLIs6casf/ty5mhVLAOOMM9Jtkl L53Gw3/AtFyZrZOCS578LYnsXH6h60heHUdKgIRxSwYnhgvhXFTFssm/ZEpGjIj6ob/L SQm7NLEycpRNwX+zMM7hZmDeJOR60GRkdjl75c1TkHGum571GIe0dUeY9Aq8S7HmhhY2 YFssMoUItDWPfaBQb3W+5iTQsv8g9eBU5obfqWbe2VQ0avFXYOfuKOW8dLcMWRnjSLOj EEBbs0KmZ2FlNFLn4tJXhpWcwZYrN+L+NS4Mwz59lnEWe09rh+n9+37EPIXTnXnMbeQX V6BA== X-Gm-Message-State: AOAM533sUWb7SxfMKfi/BYcApklsrDzmPkb3Hyozw6G+5i5pjIrNKcax 560q23hpIo2U2z+4FMqKh93gFg== X-Google-Smtp-Source: ABdhPJxTxfV/NbDI1Rp6Cv4keyU/UMSW71YssC9ZeTm5ZhDHumsulJ8tiuHRQ2fz+KXyGrsZuyRy5Q== X-Received: by 2002:a1c:bdc2:: with SMTP id n185mr7482848wmf.128.1617272743265; Thu, 01 Apr 2021 03:25:43 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x25sm9795455wmj.14.2021.04.01.03.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 421031FF98; Thu, 1 Apr 2021 11:25:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/11] docs/system/gdb.rst: Document how to debug multicore machines Date: Thu, 1 Apr 2021 11:25:28 +0100 Message-Id: <20210401102530.12030-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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=unavailable 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, Peter Maydell , 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Document how multicore machines appear to GDB when debugged via the debug stub. This is particularly non-intuitive for the "multiple heterogenous clusters" case, but unfortunately as far as I know there is no way with the remote protocol for the stub to tell gdb "I have 2 inferiors, please connect to both", so the user must set it all up manually. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210325175023.13838-3-peter.maydell@linaro.org> Signed-off-by: Alex Bennée --- docs/system/gdb.rst | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/docs/system/gdb.rst b/docs/system/gdb.rst index 0bb1bedf1b..144d083df3 100644 --- a/docs/system/gdb.rst +++ b/docs/system/gdb.rst @@ -45,6 +45,61 @@ Here are some useful tips in order to use gdb on system code: 3. Use ``set architecture i8086`` to dump 16 bit code. Then use ``x/10i $cs*16+$eip`` to dump the code at the PC position. +Debugging multicore machines +============================ + +GDB's abstraction for debugging targets with multiple possible +parallel flows of execution is a two layer one: it supports multiple +"inferiors", each of which can have multiple "threads". When the QEMU +machine has more than one CPU, QEMU exposes each CPU cluster as a +separate "inferior", where each CPU within the cluster is a separate +"thread". Most QEMU machine types have identical CPUs, so there is a +single cluster which has all the CPUs in it. A few machine types are +heterogenous and have multiple clusters: for example the ``sifive_u`` +machine has a cluster with one E51 core and a second cluster with four +U54 cores. Here the E51 is the only thread in the first inferior, and +the U54 cores are all threads in the second inferior. + +When you connect gdb to the gdbstub, it will automatically +connect to the first inferior; you can display the CPUs in this +cluster using the gdb ``info thread`` command, and switch between +them using gdb's usual thread-management commands. + +For multi-cluster machines, unfortunately gdb does not by default +handle multiple inferiors, and so you have to explicitly connect +to them. First, you must connect with the ``extended-remote`` +protocol, not ``remote``:: + + (gdb) target extended-remote localhost:1234 + +Once connected, gdb will have a single inferior, for the +first cluster. You need to create inferiors for the other +clusters and attach to them, like this:: + + (gdb) add-inferior + Added inferior 2 + (gdb) inferior 2 + [Switching to inferior 2 [] ()] + (gdb) attach 2 + Attaching to process 2 + warning: No executable has been specified and target does not support + determining executable automatically. Try using the "file" command. + 0x00000000 in ?? () + +Once you've done this, ``info threads`` will show CPUs in +all the clusters you have attached to:: + + (gdb) info threads + Id Target Id Frame + 1.1 Thread 1.1 (cortex-m33-arm-cpu cpu [running]) 0x00000000 in ?? () + * 2.1 Thread 2.2 (cortex-m33-arm-cpu cpu [halted ]) 0x00000000 in ?? () + +You probably also want to set gdb to ``schedule-multiple`` mode, +so that when you tell gdb to ``continue`` it resumes all CPUs, +not just those in the cluster you are currently working on:: + + (gdb) set schedule-multiple on + Advanced debugging options ========================== From patchwork Thu Apr 1 10:25:29 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: 12177785 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBE3FC433B4 for ; Thu, 1 Apr 2021 10:34:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4904061056 for ; Thu, 1 Apr 2021 10:34:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4904061056 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRuf0-00043h-Bt for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:34:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWp-0002oF-5S for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:19 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:40756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuWP-0001le-Be for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:13 -0400 Received: by mail-wm1-x332.google.com with SMTP id y124-20020a1c32820000b029010c93864955so2568027wmy.5 for ; Thu, 01 Apr 2021 03:25:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aAJIhwawTT8RrDu4up4oKMqj+bPU5YE2QSAzABibnW0=; b=sEUVc1ZAkv5JzcV4q6+w2YX+xb+hy+Obr6EI/2XH61EsQb8+FZHoBIEXzmiC44etYz 2hG4aJbwJf62uvtY6IjL9p3/TPmk72twQi/bu61j3mdoNS5vJlqvFGKavRUD5i7wSCLD GUFZWPmcpGxbuT9depyAGqBePbUWAJF4WEwTqoTMPR1mk+AmBxH4a2PS7gXioAZp5/vB 7Y/3NT67FD7ZZHRNM8kn+jSkUFZC6a2z5nOSY7XZL0IFbsDZzJuAVHna8giUHIH1sj1e j8hXOlKp1pm8iEodGs98rm/BoZ0Bq4h+mJNLmJcBGkg/BN4sGS5oHt9ef6SS/4c2NG2J MkQA== 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=aAJIhwawTT8RrDu4up4oKMqj+bPU5YE2QSAzABibnW0=; b=mtdG163xR+0Kh7KxYMcxA1FzUC26mU2aq6QKcNF8UOFxCJOxqykQ8YJVZDImk8n0Wd u3F4qgU+4aGjuAzJfnlWOQDpeEYA6D2Rq0jFfrzVgWFCszEKLC3tNMslUac9X4nUkoxg rVc4NTedjDNODOG4haBMfVGLIk8r5rj5fDE/uni8s3RoPPg0hqSTGx37lYbNqZJt8cx3 koM/I338hscer+mqjIOWBvhlp9RXG7u8UWMzkDYNC0XjflBUP9r90dshLH8rZtG+gXPJ osUgg3qkaMeJOJdm67dcfowC1Mn3r64N/XB56sVvphOzo25lml4YHJS22OSoJ97mmpaV 4PGQ== X-Gm-Message-State: AOAM530lcmdxZQ9wc6+Y3sn5LCFgCK32OGi77MyQAst3ZBVzSqSHWRQ9 /l3IapBd+I/i806NQ+1sZXeoWg== X-Google-Smtp-Source: ABdhPJxcarL1ph5w2tWkNDoThsoX4+NbTPWyws7oDewBBt9pDxQ/St+KgbRGt6iiEwXAw9daMfcJrQ== X-Received: by 2002:a05:600c:214d:: with SMTP id v13mr7423094wml.7.1617272746222; Thu, 01 Apr 2021 03:25:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x25sm9795456wmj.14.2021.04.01.03.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 566011FF99; Thu, 1 Apr 2021 11:25:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/11] gitlab-ci.yml: Fix the filtering for the git submodules Date: Thu, 1 Apr 2021 11:25:29 +0100 Message-Id: <20210401102530.12030-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Commit 7d7dbf9dc15be6e introduced a new line starting with "GIT_SUBMODULES_ACTION=" in the config-host.mak file. The grep that tries to determine the submodules in the gitlab-ci.yml file matches this new line, too, causing a warning message when updating the modules: warn: ignoring non-existent submodule GIT_SUBMODULES_ACTION=update Fix it by matching the "GIT_SUBMODULES=..." line only. Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20210331073316.2965928-1-thuth@redhat.com> Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3480d79db3..85b8e10b84 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ include: image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: - scripts/git-submodule.sh update - $(grep GIT_SUBMODULES build/config-host.mak | sed 's/GIT_SUBMODULES=//') + $(sed -n '/GIT_SUBMODULES=/ s/.*=// p' build/config-host.mak) - cd build - find . -type f -exec touch {} + # Avoid recompiling by hiding ninja with NINJA=":" From patchwork Thu Apr 1 10:25:30 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: 12177749 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 597B9C433B4 for ; Thu, 1 Apr 2021 10:30:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EBD8A60234 for ; Thu, 1 Apr 2021 10:30:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EBD8A60234 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRuaW-0007i3-VO for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 06:30:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWp-0002oZ-Aw for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:19 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:55054) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuWJ-0001lX-Jc for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:18 -0400 Received: by mail-wm1-x329.google.com with SMTP id k128so779732wmk.4 for ; Thu, 01 Apr 2021 03:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jl280ftsbGJDzLbgIATSWoh0jwVe1aZy+bZVBiUjAp4=; b=nwWpnuftyW2eIc8D9MWXqCZRkX5rs+Ep399vvRLnKnVtD+jfZP8uToGl5Iz0YZq64a Khehsy05a6POkLFYsq1Cwp1NZJ8OneruC0uda3gNQrRaE+qljM7a0lYwB7B6b6sziAU3 ZL9GWyhGK/66bZzJGU7Mmiy9qqPSZ51o6+5R+kRwfCv7728XwqNFyiRlOGHJjVf7UUg2 wv2MmleUFQdW9fGIpzuYEdNXLbAMqYn7OceivudaAKslWkiy6/6pC1xFpACFcJ9LbkTJ ZFqVEYR/qf8zJWb83AGbdCwF41BN5CA72i+5MJ3rbUF9f0ZSgxACivZWLklOHMsr0jSo AOsQ== 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=jl280ftsbGJDzLbgIATSWoh0jwVe1aZy+bZVBiUjAp4=; b=LbXug4DjylbMJhhO2Lg8mjZUJUnY+ri9eUA4qdEjEO9e0DV9eonzcnDtkDMRYPyuxg HMxFBGUaePGa0I18XmbocsHbdTns0H3xJlVjF+YDbNLHAilXR5sJaDR5/U5oQINMrZag xaAtUnVT+FvRFx31FoWKO7NCw1e7sO4mz5sJdPfD6miPaAgzLTFM6J6UXe8+PbCMohyf 5QPYsS/8amBbpTM579LTd+MSu+R99Pr8HQxCsyGuyMRTxF7w7ayAiLVGPOO+q2e7OvZO H7UBpWyNPpsk4joLMgy9nz6T/2gUilHipgieiAgAtKaPCeZCBcncT4SyaG3spCMB5Sv5 VsVg== X-Gm-Message-State: AOAM531aKVkKVbtADozv0Pt+A4R0FCXVjjTukP73hiobYdtkC23R2CZE YJ503iP5GW+pHP8oj6o9E9wU0MLo3N9Niw== X-Google-Smtp-Source: ABdhPJy1R9KkAFZUi/v2B7vMRGYHzuUfMGvtrFCiMzX+5kHk7Ok12zXdfsP0Y/4GEgzgS7WCLAeBkg== X-Received: by 2002:a7b:c75a:: with SMTP id w26mr7552241wmk.49.1617272745133; Thu, 01 Apr 2021 03:25:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j9sm7430776wmi.24.2021.04.01.03.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6F90D1FF9A; Thu, 1 Apr 2021 11:25:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/11] gitlab-ci.yml: Test the dtrace backend in one of the jobs Date: Thu, 1 Apr 2021 11:25:30 +0100 Message-Id: <20210401102530.12030-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.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, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth We are using the dtrace backend in downstream RHEL, so testing this in the CentOS 8 task seems to be a good fit. Signed-off-by: Thomas Huth Reviewed-by: Willian Rampazzo Message-Id: <20210331160351.3071279-1-thuth@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.yml | 2 +- tests/docker/dockerfiles/centos8.docker | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85b8e10b84..52d65d6c04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,7 @@ build-system-centos: variables: IMAGE: centos8 CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=system - --enable-modules + --enable-modules --enable-trace-backends=dtrace TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu MAKE_CHECK_ARGS: check-build diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index a763d55730..a8c6c528b0 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -29,6 +29,7 @@ ENV PACKAGES \ rdma-core-devel \ spice-glib-devel \ spice-server \ + systemtap-sdt-devel \ tar \ zlib-devel