From patchwork Sat Oct 28 10:32:55 2023 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: 738933 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301497wrt; Sat, 28 Oct 2023 03:35:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEc+KA9WtltpyymJA0UsBwbz3LXvcE2kkfw3idOMT1AG5wGtkmkf96pToTS9rz6Vk3PABVc X-Received: by 2002:a05:620a:2948:b0:76c:a952:c70f with SMTP id n8-20020a05620a294800b0076ca952c70fmr7081418qkp.35.1698489329286; Sat, 28 Oct 2023 03:35:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489329; cv=none; d=google.com; s=arc-20160816; b=KuRG3Isf6DGP5bHc24bLg5oMsVIjs8joEnyhHTJEeJ0QzpGD/ZMO/n9o8PP0Ig9QVV buOlHI/5Ryyk4FG4FlyrwXnBHN2dAhLwg/7WJaJGbKNtyk+H0xaD7rhaUSIjNtTG4hzq DJ5ESTVe70E4Mj9UFSFofTm7css702o2p5EEJ+Qge+bZml2S8U4x1Wfyen/IRPjtFtde vmCTi03lnaXlOUufPDsXjsesYwspE362F0kUW37KlePg7cFe7UxJFS5IO04KwJxO/BEe OtJyQsUMnKguig8hT44S2Q4bOZ1R3EVaZbDR1ZDl10u7n46/J2dDkaXyj035oEftd2M0 ZoKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=t+wjfKtC3t92gnbhw0BVnIQd/2GtTprk8NcwGcBfDuk=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=TFIIqUOVcon2eTVcILSlTeNG9NR3Sf0B2jE9LR+y5+iFRsnF0MpY6q+m8i2T71PSmz 4g7DiWXEm+beZ1jj1fFrddLX5oi10Ud/6G6pE2izgFbLjc7dP7H4yxq3DuySxWHYF9GH 04ssLfBaaxEcg6j58oW5e9sy+1Km9Uc+E1JYpNqXOcl7O1w/DZ2/McINO7f/m/LzA0JZ wF58scxPMQtt0764yUDFlmV77uRhlF0Q3NCR1DgWHh0mda/XeooTuSlYn1D/t5sNaiqd 9xIXZDz0WQql4X2/Qm/pKvGJBe6x1xYuKXEgIpxKNQsE4v4OQQATuwddflLWQdsOYtrg v4Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KDoWTs3k; 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=pass (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 bi33-20020a05620a31a100b00777258ef7a7si2002652qkb.644.2023.10.28.03.35.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:35:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KDoWTs3k; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdB-0006Ag-LR; Sat, 28 Oct 2023 06:33:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgd9-000694-Tg for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:23 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd5-00038n-Tu for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:23 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-408002b5b9fso21420015e9.3 for ; Sat, 28 Oct 2023 03:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489193; x=1699093993; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t+wjfKtC3t92gnbhw0BVnIQd/2GtTprk8NcwGcBfDuk=; b=KDoWTs3kx54w1GxP4wBNjXtT1BN1wgxbyAokjSxTmEwuRXVOLD5rAgf9EeVh27ubhJ /Kzfb3acSgPOH3laX3xsboRoyKyBbvLn4kesTHeXZd0WVRyomX4W1s2aAvPHXZWFAv6d Z+5+4gB7Vn0P4f7rM/eNVpoTXDaBkIppJYWzIwpREbkDD74IqNh+aj8YXJt6lxsBZ6DF YBZLMwJbJdfRy5f22ItRGJm+fHxNHd1fYo6B/wDqncHOuAxRmhDTNhYtvdsn8uoIQTlW drvkoQD6HWX9D4d5AccC1R51ixT9pSx1DwAJfZ+RMqvPW+2gEZtiwbD+n6RN9WdIDqd6 NnIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489193; x=1699093993; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t+wjfKtC3t92gnbhw0BVnIQd/2GtTprk8NcwGcBfDuk=; b=lko57Z9Md8GxsFCmW8rAnRVnPkp14lMOJvqH6rMkQB+xtNtCR9hYTSJ/nDMV6n8tsW jOPmMUFrMXZWGbE7p8LBR/Xdeo2HEzOuWQT9B/4jVAgdF7ovbG7clrX/kC4gxJDET2Qp ox6HUzpX39smxxG1jYAVCemskYGcFYE/IWIdGUCGF+RoB2jQvwUFFFE5dnk8LqYXrocI elQHwj1BGzD7XadQe8dbIipz1lleLP0WAYCQo73fOXc8tIaiVTDsSZ4uht+zNFCpQlvX AH+uQVW//aq4pdbzTRRSsuj6UIIz2EiP2n8qrkD2U/obn/E5q7Youk+Pxev/Vyph3Eil G7qQ== X-Gm-Message-State: AOJu0YxN6HBpTr9AiJ+mCwK4qBIEEAsAgrlx83K9jkPkV7qID9QVCxqM +JlX8F4wVNWk5KW97FbvX+ipsw== X-Received: by 2002:a05:6000:2aa:b0:32f:7cfc:68ab with SMTP id l10-20020a05600002aa00b0032f7cfc68abmr882512wry.8.1698489192796; Sat, 28 Oct 2023 03:33:12 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h6-20020a5d4fc6000000b00327de0173f6sm3539309wrw.115.2023.10.28.03.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:12 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0F02D5F797; Sat, 28 Oct 2023 11:33:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 01/17] tests/vm/openbsd: Use the system dtc package Date: Sat, 28 Oct 2023 11:32:55 +0100 Message-Id: <20231028103311.347104-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth We can use the pre-packaged libfdt from the dtc package to avoid that we have to compile this code each time again and again. While we're at it, the "--python=python3" does not seemt to be necessary anymore, so we can drop it. Signed-off-by: Thomas Huth Message-Id: <20231016154049.37147-1-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/vm/openbsd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 6b4fc29793..85c5bb3536 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -27,6 +27,7 @@ class OpenBSDVM(basevm.BaseVM): size = "20G" pkgs = [ # tools + "dtc", "git", "pkgconf", "bzip2", "xz", @@ -67,8 +68,9 @@ class OpenBSDVM(basevm.BaseVM): cd $(mktemp -d /home/qemu/qemu-test.XXXXXX); mkdir src build; cd src; tar -xf /dev/rsd1c; - cd ../build - ../src/configure --cc=cc --python=python3 {configure_opts}; + cd ../build; + ../src/configure --cc=cc --extra-cflags=-I/usr/local/include \ + --extra-ldflags=-L/usr/local/lib {configure_opts}; gmake --output-sync -j{jobs} {target} {verbose}; """ poweroff = "halt -p" From patchwork Sat Oct 28 10:32:56 2023 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: 738941 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp302028wrt; Sat, 28 Oct 2023 03:37:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEdQj3BrmwRFkF3T2KnWN85SvAtwIMxbxlJruZd09WOlPEyo6qphtqfiwYcQoMqs2X4Xgd3 X-Received: by 2002:a05:622a:15cf:b0:418:af7:e00a with SMTP id d15-20020a05622a15cf00b004180af7e00amr6731898qty.21.1698489433665; Sat, 28 Oct 2023 03:37:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489433; cv=none; d=google.com; s=arc-20160816; b=qVqZkBur0IlWCbIAXvoSTezsD2UEdqc7+EmdEaWSajAhIr5SqeSJ5w5MDRafUj9QP+ TkfF6evIDTRLjsD6F96nAz/6k4QIuYLWOTLq312DIPoraRpZeEHEg0QAm4dMX9RuwjtR 9Ieo6/VOTFDs0UN4st0zKw++NaZilH494WMR6Y7cyP6br9VpY/Sr9dlQvyF6Hjp7By9/ Po7dY03hdlUI9BYN2d9+s+50PFwcDn+6xURgoCCcOk/tu/ayw6a9bpQrMCfFPKTN64M9 Mbtvt0cO2tDv7iOEcKLxQXyXZFisSa8UllRbF/nWlRTe11Kgieyc7wplDUFDcbgGTzUQ 7neQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=maGo4SQ2Nh/uMnXYztWkxCmfjY3u1YXmSOVeK9kBr3c=; fh=nJM5jO7eiVNcYdEhmlCXCeK22LQiGBuZV7XYo+7hMdc=; b=apoEXaVqJEMAVVYzvtZVuVFZTUvq0gl7HTbu+iN/7Gj94YHsFu2TRIwtG2UAsw46RL lzjbqnqnDpv3yDdx2h+BA2nV1817VpGft1kLWRq6jl8NUy8HuAc0vthKYPxfHv3ipXOR dPQJoE9fMaOxXAaPBINI+q/KbgcasaMemfG2xFZ3IUGtWd7wA9HFDWsLl7NSQK5tto9s HUMK5bBnuKpr5nIQ3YO/8nDwOfjVC8Z+aN6MGLPSurkUmn/hDEK/1jS/CobNTy+zxGLF qSoZsJojXhQE4G1XsVDwhOY74EWXQu53owF11D2QfguPsBCImQoeJcpqdax3ZARnWAXN qrRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BvCtYU81; 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=pass (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 c3-20020ac85a83000000b004198ca3515bsi2013220qtc.310.2023.10.28.03.37.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:37:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BvCtYU81; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdM-0006L5-1i; Sat, 28 Oct 2023 06:33:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdF-0006El-FX for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:29 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd6-00038s-7f for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:29 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4083740f92dso22744745e9.3 for ; Sat, 28 Oct 2023 03:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489193; x=1699093993; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=maGo4SQ2Nh/uMnXYztWkxCmfjY3u1YXmSOVeK9kBr3c=; b=BvCtYU81hoRd6YnGZtDkgSxAwQ6Qjd7EEKG16HQTINlyaALDCW0AeU+0pdPH/s+oG3 4ePw2bjVBYdLp/TLC3HELS6C0wPNIqn/SvMRClMt8I1IMj0JdpiH7btIGyCYD5gYVOca fAL3rHn4mYa35tmPs1B7Iw/JsVfbD5+geomBFtAFq0MNeLo+xmp4LD77QdEIEAUUziSq cKLnI1z/SVDoJRubaIdLjeodi1sUeVeSBQVe+xYUyZUDMy5FFdq4/J9btfA63o7r4YOf f4rpOBTPh5mBdCVNiXbgIt0Z1eiK31bTrcLd6CbjS4q1go3bWqo4XqED1N5e3PQvItIG 2jDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489193; x=1699093993; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=maGo4SQ2Nh/uMnXYztWkxCmfjY3u1YXmSOVeK9kBr3c=; b=I/Fbo31A+nX0o/ZqQ8Bvapzn9K2GL0FkS1tSNmMu3JVHkj07MbUy6R/G6i7x4LUj4n 5pSTyTcn+RtfhnaM4hBfXAI0lymwtnKHwhArreYVrnERbaFA3NtfAxWrb9L7dZNCfvEZ TIYXXHKgiFKXWED3Ol0eEYpzKWIP8HDQwdt3Yl+WxoQAsIlH4jeSZJswgvkN+amkDvuO ttF1p+49hT82b7T18Labu8UXQHUXm6Obabd5KHOdLSq09KPbAF+dYKIyGBBJS5uAhU3T vQqETD8WrKm/LnudHoeh9yMxcgHWf4MZdwSy3Ayqmy4hNusQe8TPw9wBjN1jkj3hHqUT v/HA== X-Gm-Message-State: AOJu0YwRJcEWuVPmAN6akrf9oS71s0evmyvU1Nw9tuGL5OLKYYaw3hMw aMNdDfXqMaRpoq51Z6nBFDaLUQ== X-Received: by 2002:a05:600c:4f55:b0:408:3707:b199 with SMTP id m21-20020a05600c4f5500b004083707b199mr4073665wmq.3.1698489193301; Sat, 28 Oct 2023 03:33:13 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y20-20020a1c4b14000000b0040588d85b3asm7021327wma.15.2023.10.28.03.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:13 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2E37F5F798; Sat, 28 Oct 2023 11:33:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth , Akihiko Odaki Subject: [PATCH 02/17] tests/tcg: Add -fno-stack-protector Date: Sat, 28 Oct 2023 11:32:56 +0100 Message-Id: <20231028103311.347104-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Akihiko Odaki A build of GCC 13.2 will have stack protector enabled by default if it was configured with --enable-default-ssp option. For such a compiler, it is necessary to explicitly disable stack protector when linking without standard libraries. Signed-off-by: Akihiko Odaki Message-Id: <20230731091042.139159-3-akihiko.odaki@daynix.com> [AJB: fix comment string typo] Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/mips/hello-mips.c | 4 ++-- tests/tcg/Makefile.target | 2 +- tests/tcg/aarch64/Makefile.target | 2 +- tests/tcg/arm/Makefile.target | 2 +- tests/tcg/cris/Makefile.target | 2 +- tests/tcg/hexagon/Makefile.target | 2 +- tests/tcg/i386/Makefile.target | 2 +- tests/tcg/minilib/Makefile.target | 2 +- tests/tcg/mips/Makefile.target | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/tcg/mips/hello-mips.c b/tests/tcg/mips/hello-mips.c index 4e1cf501af..38e22d00e3 100644 --- a/tests/tcg/mips/hello-mips.c +++ b/tests/tcg/mips/hello-mips.c @@ -5,8 +5,8 @@ * http://www.linux-mips.org/wiki/MIPSABIHistory * http://www.linux.com/howtos/Assembly-HOWTO/mips.shtml * -* mipsel-linux-gcc -nostdlib -mno-abicalls -fno-PIC -mabi=32 \ -* -O2 -static -o hello-mips hello-mips.c +* mipsel-linux-gcc -nostdlib -mno-abicalls -fno-PIC -fno-stack-protector \ +* -mabi=32 -O2 -static -o hello-mips hello-mips.c * */ #define __NR_SYSCALL_BASE 4000 diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index f3a189c9d4..8cf65f68dd 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -123,7 +123,7 @@ else # For system targets we include a different Makefile fragment as the # build options for bare programs are usually pretty different. They # are expected to provide their own build recipes. -EXTRA_CFLAGS += -ffreestanding +EXTRA_CFLAGS += -ffreestanding -fno-stack-protector -include $(SRC_PATH)/tests/tcg/minilib/Makefile.target -include $(SRC_PATH)/tests/tcg/multiarch/system/Makefile.softmmu-target -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 62b38c792f..0c84b61ae0 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -53,7 +53,7 @@ endif # bti-1 tests the elf notes, so we require special compiler support. ifneq ($(CROSS_CC_HAS_ARMV8_BTI),) AARCH64_TESTS += bti-1 bti-3 -bti-1 bti-3: CFLAGS += -mbranch-protection=standard +bti-1 bti-3: CFLAGS += -fno-stack-protector -mbranch-protection=standard bti-1 bti-3: LDFLAGS += -nostdlib endif # bti-2 tests PROT_BTI, so no special compiler support required. diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target index 0038cef02c..3473f4619e 100644 --- a/tests/tcg/arm/Makefile.target +++ b/tests/tcg/arm/Makefile.target @@ -12,7 +12,7 @@ float_madds: CFLAGS+=-mfpu=neon-vfpv4 # Basic Hello World ARM_TESTS = hello-arm -hello-arm: CFLAGS+=-marm -ffreestanding +hello-arm: CFLAGS+=-marm -ffreestanding -fno-stack-protector hello-arm: LDFLAGS+=-nostdlib # IWMXT floating point extensions diff --git a/tests/tcg/cris/Makefile.target b/tests/tcg/cris/Makefile.target index 43587d2769..713e2a5b6c 100644 --- a/tests/tcg/cris/Makefile.target +++ b/tests/tcg/cris/Makefile.target @@ -30,7 +30,7 @@ AS = $(CC) -x assembler-with-cpp LD = $(CC) # we rely on GCC inline:ing the stuff we tell it to in many places here. -CFLAGS = -Winline -Wall -g -O2 -static +CFLAGS = -Winline -Wall -g -O2 -static -fno-stack-protector NOSTDFLAGS = -nostartfiles -nostdlib ASFLAGS += -mcpu=v10 -g -Wa,-I,$(SRC_PATH)/tests/tcg/cris/bare CRT_FILES = crt.o sys.o diff --git a/tests/tcg/hexagon/Makefile.target b/tests/tcg/hexagon/Makefile.target index 87ed2c90b9..f839b2c0d5 100644 --- a/tests/tcg/hexagon/Makefile.target +++ b/tests/tcg/hexagon/Makefile.target @@ -19,7 +19,7 @@ EXTRA_RUNS = CFLAGS += -Wno-incompatible-pointer-types -Wno-undefined-internal -CFLAGS += -fno-unroll-loops +CFLAGS += -fno-unroll-loops -fno-stack-protector HEX_SRC=$(SRC_PATH)/tests/tcg/hexagon VPATH += $(HEX_SRC) diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index fdf757c6ce..3dec7c6c42 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -35,7 +35,7 @@ run-test-aes: QEMU_OPTS += -cpu max # # hello-i386 is a barebones app # -hello-i386: CFLAGS+=-ffreestanding +hello-i386: CFLAGS+=-ffreestanding -fno-stack-protector hello-i386: LDFLAGS+=-nostdlib # test-386 includes a couple of additional objects that need to be diff --git a/tests/tcg/minilib/Makefile.target b/tests/tcg/minilib/Makefile.target index c821d2806a..af0bf54be9 100644 --- a/tests/tcg/minilib/Makefile.target +++ b/tests/tcg/minilib/Makefile.target @@ -12,7 +12,7 @@ SYSTEM_MINILIB_SRC=$(SRC_PATH)/tests/tcg/minilib MINILIB_SRCS=$(wildcard $(SYSTEM_MINILIB_SRC)/*.c) MINILIB_OBJS=$(patsubst $(SYSTEM_MINILIB_SRC)/%.c, %.o, $(MINILIB_SRCS)) -MINILIB_CFLAGS+=-nostdlib -ggdb -O0 +MINILIB_CFLAGS+=-nostdlib -fno-stack-protector -ggdb -O0 MINILIB_INC=-isystem $(SYSTEM_MINILIB_SRC) .PRECIOUS: $(MINILIB_OBJS) diff --git a/tests/tcg/mips/Makefile.target b/tests/tcg/mips/Makefile.target index 1a994d5525..5d17c1706e 100644 --- a/tests/tcg/mips/Makefile.target +++ b/tests/tcg/mips/Makefile.target @@ -14,6 +14,6 @@ MIPS_TESTS=hello-mips TESTS += $(MIPS_TESTS) -hello-mips: CFLAGS+=-mno-abicalls -fno-PIC -mabi=32 +hello-mips: CFLAGS+=-mno-abicalls -fno-PIC -fno-stack-protector -mabi=32 hello-mips: LDFLAGS+=-nostdlib endif From patchwork Sat Oct 28 10:32:57 2023 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: 738939 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301998wrt; Sat, 28 Oct 2023 03:37:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHSGcUIkzvPxRDPCVKT78Lv9NqHbYIJXRR1DAWXp1a61/X/knmQb6Kh0yOvmvjt28AKJPAo X-Received: by 2002:ac8:5dd1:0:b0:41e:2523:da3e with SMTP id e17-20020ac85dd1000000b0041e2523da3emr6521592qtx.23.1698489427345; Sat, 28 Oct 2023 03:37:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489427; cv=none; d=google.com; s=arc-20160816; b=MSjJcPim0NTBXzyT0DsGVtG9hZsMorSZKC+rpBHXVuLU8L36nijR8vaQl4n554EWpk UexJSO4hkK25QKkGFT+lKbEHti92n0IpWV2VCFjMaQ0Ehg8gfw3W9W1V9WbS55rQ/0db M/FyN/TpS95rmDgCuSzNajHiMNCVnHeP/UR6FAQ39UpNfWM/D2w+72RfIqoqR40U7L0k cN8tgDLiqSR+nIvngQG8AlR9iJvv2eO9/bErDM4Zlt4kilI3Sp7+kZkt8DKiQrl8Iu6N 9NC22o06Moysm3eojYfWrqJEEzo+5kt/xSTE2eNrPPdIAzCj44jJWSq+4oh1bcLP8pWt ibQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=gmmVzaMQ0MzDNYa/SE4+Ao0LJRweYzXid6cnF3jeVus=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=zbLSqgxJySMtlpmxJCB0OGQrwFJrAOd6K0XSmR0o96bzWKL1l2jJILTUKpP4qKknTe 8qkimmqBA/N9T5sVdtJjh8L/hAdIcaPfmVVWe7BPsCKJi2SXG+F5GUi9EaFcmqwloU6P Nec7Dax81bINLJZxsvmAHvOV3fVdlBBTHsdYAzk0JB+l8vIOysek+dgu1RRb4YKnPNvB F4ZdoB0nQNaSY/V3EvT3MLGNsw/j8WRI9J18zQFifIyZ8Y5ScFZIjsEYB0SM2+VNGmmn 77hLwtrq5/3CM/x3GJD+uywrb2SUBR1TTsfYaa67g5ynNTEVqJrW/KCyg6jbSf7W2bBI ahtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="UIG/ihdH"; 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=pass (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 t4-20020a05622a180400b004198d1ab8cdsi2095735qtc.82.2023.10.28.03.37.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:37:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="UIG/ihdH"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdE-0006Cz-EV; Sat, 28 Oct 2023 06:33:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdB-0006Al-Mi for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:25 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd5-00039H-Ts for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:25 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-409299277bbso15369045e9.2 for ; Sat, 28 Oct 2023 03:33:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489194; x=1699093994; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gmmVzaMQ0MzDNYa/SE4+Ao0LJRweYzXid6cnF3jeVus=; b=UIG/ihdHisyArUX8g0r9UQz9G37nUBwcxOz2+EtZG6bEFsRSfKy50DEEo7zFT0OwL+ 2wt9oGklx5usenqDom7J/MZDgH4KJmWOfGrdWuY3pHNnFIqiH59cnyYmT5T71HO8ISNf rbW5ZJzKmMyMOLkGFPC78h6Ghz8DT6r8jAE6pDCjY96Y06/9MevGaGBsAGIkX2NpvwRe oOfV85U/ImnF5NWBCDi2WvyG35hsWQfwmMen5qtvSKkhyu17svJ4J4Q/S9pftRBLKx0k rDrmzvJPtWvdLv0BOrjKhc4pC1TratwDvMWF7wOQtl/SbbyvTzC+SGAK4FPPPtBwxfnv urOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489194; x=1699093994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gmmVzaMQ0MzDNYa/SE4+Ao0LJRweYzXid6cnF3jeVus=; b=JZk9asGkr8mgjU1yfLHFm307OxFsyMxI0P8On//CZCsJtKgk2W3Z8ohFEOOz0fJGUm 5Z7TumyZ5FrlzPQJ4DOjf8TV/Uc008L7TrqDgtHRlgU/Qi+lP5vtDZF3HinWaajjODLJ 6E654YrChCHYWjlND5eYhL5/Ai/4S+rvyJqIDTzJw3t8Hg5YPylIemtORvHBDU3AnM+H S2w1JluoahLqZ/k7AJsPQv+jJoOC1dnSaoClQ8nfkMfGgM8aWIQuXBVFOv/QoxB8sSIa rFGQYb0ZK91XoG6zpouuH5mBZS/lYQ6OEX+668OFYqccm9v2lXJVWS6o87ix7Subv0Fy tZ+g== X-Gm-Message-State: AOJu0YwCUoR+9mZIQyyVGS6KL9TvrJKtPVsa6xYgfAoIBCJKbF9AZ+1H VzBFMDTUvqqIJraUIkFb5UEjPA== X-Received: by 2002:a05:600c:45c8:b0:401:c338:ab94 with SMTP id s8-20020a05600c45c800b00401c338ab94mr4454266wmo.29.1698489194425; Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z6-20020a05600c220600b00407b93d8085sm7038650wml.27.2023.10.28.03.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:13 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4AA325F799; Sat, 28 Oct 2023 11:33:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 03/17] gitlab: split alpha testing into a legacy container Date: Sat, 28 Oct 2023 11:32:57 +0100 Message-Id: <20231028103311.347104-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The current bookworm compiler doesn't build the static binaries due to bug #1054412 and it might be awhile before it gets fixes. The problem of keeping older architecture compilers running isn't going to go away so lets prepare the ground. Create a legacy container and move some tests around so the others can get upgraded. While checking the softmmu TCG tests I realised more had been added so that makes up a little bit for the lost alpha-softmmu coverage. Signed-off-by: Alex Bennée --- .gitlab-ci.d/buildtest.yml | 20 ++++++-- .gitlab-ci.d/container-cross.yml | 6 +++ .../dockerfiles/debian-all-test-cross.docker | 4 +- .../debian-legacy-test-cross.docker | 46 +++++++++++++++++++ 4 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 tests/docker/dockerfiles/debian-legacy-test-cross.docker diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 25af1bc41e..d670fb42b9 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -256,6 +256,7 @@ build-user: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system + --target-list-exclude=alpha-linux-user MAKE_CHECK_ARGS: check-tcg build-user-static: @@ -264,6 +265,18 @@ build-user-static: job: amd64-debian-user-cross-container variables: IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-system --static + --target-list-exclude=alpha-linux-user + MAKE_CHECK_ARGS: check-tcg + +# targets stuck on older compilers +build-user-legacy: + extends: .native_build_job_template + needs: + job: amd64-debian-legacy-cross-container + variables: + IMAGE: debian-legacy-test-cross + TARGETS: alpha-linux-user CONFIGURE_ARGS: --disable-tools --disable-system --static MAKE_CHECK_ARGS: check-tcg @@ -278,6 +291,7 @@ build-user-hexagon: MAKE_CHECK_ARGS: check-tcg # Only build the softmmu targets we have check-tcg tests for +# (skip alpha due to missing compilers, others need their own containers) build-some-softmmu: extends: .native_build_job_template needs: @@ -285,7 +299,7 @@ build-some-softmmu: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --enable-debug - TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + TARGETS: arm-softmmu aarch64-softmmu i386-softmmu riscv64-softmmu s390x-softmmu xtensa-softmmu MAKE_CHECK_ARGS: check-tcg # We build tricore in a very minimal tricore only container @@ -318,7 +332,7 @@ clang-user: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --cc=clang --cxx=clang++ --disable-system - --target-list-exclude=microblazeel-linux-user,aarch64_be-linux-user,i386-linux-user,m68k-linux-user,mipsn32el-linux-user,xtensaeb-linux-user + --target-list-exclude=alpha-linux-user,microblazeel-linux-user,aarch64_be-linux-user,i386-linux-user,m68k-linux-user,mipsn32el-linux-user,xtensaeb-linux-user --extra-cflags=-fsanitize=undefined --extra-cflags=-fno-sanitize-recover=undefined MAKE_CHECK_ARGS: check-unit check-tcg @@ -505,7 +519,7 @@ build-tci: variables: IMAGE: debian-all-test-cross script: - - TARGETS="aarch64 alpha arm hppa m68k microblaze ppc64 s390x x86_64" + - TARGETS="aarch64 arm hppa m68k microblaze ppc64 s390x x86_64" - mkdir build - cd build - ../configure --enable-tcg-interpreter --disable-docs --disable-gtk --disable-vnc diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 2848166ba3..80c540230a 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -16,6 +16,12 @@ amd64-debian-user-cross-container: variables: NAME: debian-all-test-cross +amd64-debian-legacy-cross-container: + extends: .container_job_template + stage: containers + variables: + NAME: debian-legacy-test-cross + arm64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 54e957d5e7..205173b0a5 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -28,8 +28,6 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ ninja-build \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ - gcc-alpha-linux-gnu \ - libc6.1-dev-alpha-cross \ gcc-arm-linux-gnueabihf \ libc6-dev-armhf-cross \ gcc-hppa-linux-gnu \ @@ -66,7 +64,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ RUN /usr/bin/pip3 install tomli ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools -ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user +ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker b/tests/docker/dockerfiles/debian-legacy-test-cross.docker new file mode 100644 index 0000000000..763d36dfe3 --- /dev/null +++ b/tests/docker/dockerfiles/debian-legacy-test-cross.docker @@ -0,0 +1,46 @@ +# Docker legacy cross-compiler target (tests and minimal qemu) +# +# Compilers for some of our older targets which we cant currently +# upgrade. Currently: +# +# libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412 +# +# As we are targeting check-tcg here we only need minimal qemu +# dependencies and the relevant cross compilers. + +FROM docker.io/library/debian:11-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + apt build-dep -yy qemu + +# Add extra build tools and as many cross compilers as we can for testing +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + bison \ + ccache \ + clang \ + flex \ + git \ + ninja-build \ + gcc-alpha-linux-gnu \ + libc6.1-dev-alpha-cross \ + python3-pip \ + python3-setuptools \ + python3-venv \ + python3-wheel + +RUN /usr/bin/pip3 install tomli + +ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools +ENV DEF_TARGET_LIST alpha-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Sat Oct 28 10:32:58 2023 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: 738927 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301058wrt; Sat, 28 Oct 2023 03:34:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmO9hwIC4JhyhsNPyt6EPbuNkIV+65aLdAtjoQMKYMsUx9kvCtEAWTh0oLPplXqivTi6xX X-Received: by 2002:a05:622a:120f:b0:411:f5c0:5db with SMTP id y15-20020a05622a120f00b00411f5c005dbmr5295146qtx.26.1698489242969; Sat, 28 Oct 2023 03:34:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489242; cv=none; d=google.com; s=arc-20160816; b=yKHDaLmD7ltgemcsiL5/FdjsYqgSzUbW4T7llBmExjdeBgVgqAvRH8m1853GyKynts L70ezSTaPNJes9QlDsBIacEnKV+LPZU4k6IEhyYwz4sFrsgfNdZFah4ZbdYDmGx/KUpb R+RpWzaae0pVG39LXBx1tQ93rQ8tJzvkdwV5bALgcO67LJCgCbOApFhqo404cmZIIK3X DC+/MHxu7k99gDnbB/dk4NAQL2PN24PsW/HkOLulwatq48JMI4KR5cx/V8vKTJvrc5zo zE07RRHxieqKusxrq+mW8hWs7sN5ys0/k0ie1uK2jb8BoY9dRraynpd3l6jX/Al029sI O4zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=T+21oYDUa6l2DS/PBwo+zu7q5Jbf22dovQxd1uWRyFY=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=kvjzJKyLo9xZ6UcWR5rq6N0LjmNlGCthanRTbnpOE6rtxdBt2EBgcN9LjYU/l3v8HS 2rKOVi4fld3O3IGypYzyK+eSlnOPXmaWK99sbPq7KvKClspWUWvQK2Ehvtt5H1F9iNP3 pMaC4rrJkiJz5+xAyt62hScIgLVRMGYLyovAKTJ97iHFBifwnzj4AKEjSQjjob1ksUQr q4sInbjuxPZcaZ8pf77u43zajMt45B0Rv4DRZVJgPgVX6cML56e0RKGLDo88bVWb0PPf +bwcb3IsDTZLfw1Q8M8zY1xVk4wS15KhXoqWif9scSHrqz4PbcEHL/M++9YxoOaOat8C jn2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sNtcBcn1; 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=pass (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 i19-20020ac85c13000000b0041908a417a4si2050047qti.33.2023.10.28.03.34.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:34:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sNtcBcn1; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgd9-000693-UT; Sat, 28 Oct 2023 06:33:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgd8-00068W-Ly for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:22 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd5-00039L-Tt for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:22 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40859c466efso22306125e9.3 for ; Sat, 28 Oct 2023 03:33:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489194; x=1699093994; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T+21oYDUa6l2DS/PBwo+zu7q5Jbf22dovQxd1uWRyFY=; b=sNtcBcn1ku08f9JYBUUU+WIH/c9qrjHTLk7/LwuDfmhrYdFx/5U+LmooqyFzQELsnS mDcebz5TYcLmb5remRl8Os1fqlfLapBI6sPy/Zmb9o5UuyG1t4R9Pw/Wgqsv6/BcOIaX yGAyaxMUU7eTkhXoW4ctP8hvIvv/OACIbURsOy8EAiAEXpq6dsSbSfg37+J0Sbu42eGf 1uyi/P6ufNsuD1aIoiFHJEUblD+VRc5kS1G9E6yuFA5n6C7/SpTL4MVHma1pSWFZNFe7 QsMhp7QlQnluLzGB5SdVBwssy3/rt9wjmpVEaI8KA2vUUGSqX3OI01W40fLfKonU68PE PnpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489194; x=1699093994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T+21oYDUa6l2DS/PBwo+zu7q5Jbf22dovQxd1uWRyFY=; b=lNcqHJ1+BzGh7q4B4x/FjlKvHq+XrL+vCsrIJE0oRPDoRi4DvKLzvEvcK2W+2whG8N tDVoNSsNTBLux6wwf/tbOrKgnYDzcPsZw/ceTEbDeXlWwWJYChHIu2z/f0tu5dzMpWNk NwrmA+D1B7p0VUdcYuFNBF5nuIzREYIey9+zvLs3J/CP/5gRV5hexsoWSbK/pcskpMFa YQo8raEVqXbxkPpkDYl1WRg8Zcw7h4lw6DmyDkDqf684lv6Trdl1NAL5vZsgcL5aRXds dUm4odtElUQRot8oYABJ1og2+KcRBoQkmrz4vIYZPPw7ceDzL49z6n/D4p31XZccdlwE mtUw== X-Gm-Message-State: AOJu0YxSzf87xDg9WOI2EDzd4T+9UWTiQxCQTSgao8QuIX6nn7VoxrGS H9OjB+YkH74GXfhXIWPStGMxiQ== X-Received: by 2002:a05:600c:3b1c:b0:405:39c1:a98b with SMTP id m28-20020a05600c3b1c00b0040539c1a98bmr4094519wms.20.1698489194637; Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id az32-20020a05600c602000b004053e9276easm7270654wmb.32.2023.10.28.03.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:13 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 626FB5F79A; Sat, 28 Oct 2023 11:33:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 04/17] tests/docker: use debian-legacy-test-cross for alpha Date: Sat, 28 Oct 2023 11:32:58 +0100 Message-Id: <20231028103311.347104-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 5 +++++ .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 1 - .../dockerfiles/debian-alpha-cross.docker | 19 ------------------- 4 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-alpha-cross.docker diff --git a/configure b/configure index b4ea78c77d..c8d0d4f7cb 100755 --- a/configure +++ b/configure @@ -1281,6 +1281,11 @@ probe_target_compiler() { container_cross_prefix=aarch64-linux-gnu- container_cross_cc=${container_cross_prefix}gcc ;; + alpha) + container_image=debian-legacy-test-cross + container_cross_prefix=alpha-linux-gnu- + container_cross_cc=${container_cross_prefix}gcc + ;; arm) # We don't have any bigendian build tools so we only use this for ARM container_image=debian-armhf-cross diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 80c540230a..c2394ff001 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -1,9 +1,3 @@ -alpha-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-alpha-cross - amd64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ab68b2dbad..25147f0220 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -122,7 +122,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # These images may be good enough for building tests but not for test builds -DOCKER_PARTIAL_IMAGES += debian-alpha-cross DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-loongarch-cross diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker deleted file mode 100644 index 7fa7bf1bde..0000000000 --- a/tests/docker/dockerfiles/debian-alpha-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-alpha-linux-gnu \ - libc6.1-dev-alpha-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Sat Oct 28 10:32:59 2023 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: 738934 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301571wrt; Sat, 28 Oct 2023 03:35:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0iSerFE4PdaSmPZoICFbJiQMPgdPewGxNUP5WWxltHSKpbOdIu0UELHLAqgKGFR8UcSmE X-Received: by 2002:a05:622a:345:b0:41e:173e:82b7 with SMTP id r5-20020a05622a034500b0041e173e82b7mr5294956qtw.66.1698489340968; Sat, 28 Oct 2023 03:35:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489340; cv=none; d=google.com; s=arc-20160816; b=QvjTFVN9muWr0EMnPBpttOeEwx5UeIPc/U/BTG7u4MBs7wdt+IEQIgLNC0WfyZPJz0 +BzpkzzSBMFDIOnA9nqLiczoaVJud60BMgwQePn8ynyeiPS4a4dfyN3Xm96gV/u6he8D +iNYQuuY4cpeKqo0CbygrlwhZukJEklNTbJIbhwpkbIFxn/GEPKT2nABTkOFvwbzt5m6 sW75/OjIFtByI6p/WZ3ZwUo5vqX+o9vhoDJUquiARTvQbcueHS0uVhugtp977rECBMde 1JWkDNmDrAAG+0dO0hc6HIpI+0a/Daodj+vE+zh2cljLp+9hAEOi/erO/EVIv+T8iS3u 5ihg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=1bHGR0bxCm0oeHMRXA/Rzgk8YpqHzUyqeCh99ot5F8Q=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=QvtUHtSpPrARpXJkWaonmVHNpeYZ9eTM3mRLuqdSxAk0JlU5KisnEvJH2XzMCBKgEp sf4rP4ksNn/d2F0i7Un54Az5jPjVojpQuCIpUG3hPDhR5LorzreqLdhS3laECJA5cNUm G+5rEQOliJSNZ9Ims0GycnGJtJTbC09NPqexg54waGPX9Td07oIgJmm0qVK2pDQEU8bx Bwi5vym3n4GDMbq90kZ3lpssK80L2qUPzYi8dfIQgSewe8WJxO9ueFziOjYou+1GoQju 40k7dmiGbSwVWYwDQcZ84rH9JogVL5rDGZ1vwxAiSx5Hc24tcIfVD+KG4pdnyBToOeJp 2GWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hbsmzKSJ; 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=pass (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 t1-20020a05622a148100b0041805eb9514si2084969qtx.183.2023.10.28.03.35.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:35:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hbsmzKSJ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdD-0006Bw-Dz; Sat, 28 Oct 2023 06:33:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdB-0006An-Mi for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:25 -0400 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd5-00039i-Ts for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:25 -0400 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2c5210a1515so43385521fa.0 for ; Sat, 28 Oct 2023 03:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489196; x=1699093996; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1bHGR0bxCm0oeHMRXA/Rzgk8YpqHzUyqeCh99ot5F8Q=; b=hbsmzKSJlntZj5Ja6DVDEvqIjTJ/bsTb2GI0vBnWrISdMGcRuIEU9V53VnpabLgvDj vbf5JqbNVSUB9d9sTCp/ZGOReMwnO/AiyVMSeiwBc1uz7l1e75BUb3TtknHw5o+yhw1Z eCtn5WGOHmKCTgiZywhyQTF3xYHJ0qppOH+1y8TU3sDbVgcIhJxswSHqwWCYkkjKabGy UWOGl2f4zO1SXM0c7xA+x+RwrzbSSZgjc3gAQqR7tWKMxWKpGOhoG0k84Gcqwj/Mv5pL SU3ANAwcCnUYrherjefJSt1vu6dLEUXTYoLmXQ8hNFfVYME/tknM+LsYhG8bZZ/16bn2 seUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489196; x=1699093996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1bHGR0bxCm0oeHMRXA/Rzgk8YpqHzUyqeCh99ot5F8Q=; b=wJ3DOwaVbADO4ewlp5irDiRsBCIEYb96GaRo/aW+39KA+8ezkpJltnNGiR3xkUIaXV XdvHtRQQ3BkWcFh5qXYHKqFrPPQ9wH0qjAmgVpTxdEz+l5liy3VX/3AInzMr3SpQzoeT MAgquWTSEKr4V1bhq5DwWIQnHkwIMMLZzP7JL1Izuct+mjDeBvzq9cy/Ez0pif9/TRm5 TiSPHStyAHa+BcxcNX7mCfcpKgwh4Nviupt/prIrBwS7dhIxAgHhsBoZa+HTjTdhqYJr tEoa60rE8XjDJnW2lNogowAhCPmdZITuQVU8laiV5a1nR7jJg1b91l6H3ti0Jt1AtjmZ yrBA== X-Gm-Message-State: AOJu0YwaVQwMF6FaZHT13QqeTdpWEt/PaLtTnkxwhc6MnSjGBbBWlr7w kErBEBdvvy2ilAtQaK/FGtNgCw== X-Received: by 2002:a2e:b752:0:b0:2c5:9a5:a1c2 with SMTP id k18-20020a2eb752000000b002c509a5a1c2mr3305725ljo.30.1698489196043; Sat, 28 Oct 2023 03:33:16 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ay32-20020a05600c1e2000b004065daba6casm7187734wmb.46.2023.10.28.03.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7F1595F79B; Sat, 28 Oct 2023 11:33:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 05/17] tests/docker: move sh4 to use debian-legacy-test-cross Date: Sat, 28 Oct 2023 11:32:59 +0100 Message-Id: <20231028103311.347104-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::233; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x233.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org sh4 is another target which doesn't work with bookworm compilers. To keep on buster move across to the debian-legacy-test-cross image and update accordingly. Signed-off-by: Alex Bennée --- configure | 4 ++++ .gitlab-ci.d/buildtest.yml | 2 +- .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 2 +- .../dockerfiles/debian-all-test-cross.docker | 4 +--- .../debian-legacy-test-cross.docker | 3 ++- .../dockerfiles/debian-sh4-cross.docker | 19 ------------------- 7 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-sh4-cross.docker diff --git a/configure b/configure index c8d0d4f7cb..37d1b10b87 100755 --- a/configure +++ b/configure @@ -1334,6 +1334,10 @@ probe_target_compiler() { container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- container_cross_cc=${container_cross_prefix}gcc-10 ;; + sh4) + container_image=debian-legacy-test-cross + container_cross_prefix=sh4-linux-gnu- + ;; tricore) container_image=debian-tricore-cross container_cross_prefix=tricore- diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d670fb42b9..983c95e785 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -276,7 +276,7 @@ build-user-legacy: job: amd64-debian-legacy-cross-container variables: IMAGE: debian-legacy-test-cross - TARGETS: alpha-linux-user + TARGETS: alpha-linux-user sh4-linux-user CONFIGURE_ARGS: --disable-tools --disable-system --static MAKE_CHECK_ARGS: check-tcg diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index c2394ff001..61f23561b7 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -110,12 +110,6 @@ s390x-debian-cross-container: variables: NAME: debian-s390x-cross -sh4-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-sh4-cross - sparc64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 25147f0220..654f24b188 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -130,7 +130,7 @@ DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross -DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross +DOCKER_PARTIAL_IMAGES += debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross DOCKER_PARTIAL_IMAGES += fedora-cris-cross diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 205173b0a5..43cc083318 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -52,8 +52,6 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ libc6-dev-riscv64-cross \ gcc-s390x-linux-gnu \ libc6-dev-s390x-cross \ - gcc-sh4-linux-gnu \ - libc6-dev-sh4-cross \ gcc-sparc64-linux-gnu \ libc6-dev-sparc64-cross \ python3-pip \ @@ -64,7 +62,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ RUN /usr/bin/pip3 install tomli ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools -ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user +ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sparc64-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker b/tests/docker/dockerfiles/debian-legacy-test-cross.docker index 763d36dfe3..d9b37995a2 100644 --- a/tests/docker/dockerfiles/debian-legacy-test-cross.docker +++ b/tests/docker/dockerfiles/debian-legacy-test-cross.docker @@ -4,6 +4,7 @@ # upgrade. Currently: # # libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412 +# sh4-linux-user: binaries don't run with bookworm compiler # # As we are targeting check-tcg here we only need minimal qemu # dependencies and the relevant cross compilers. @@ -38,7 +39,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ RUN /usr/bin/pip3 install tomli ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools -ENV DEF_TARGET_LIST alpha-linux-user +ENV DEF_TARGET_LIST alpha-linux-user,sh4-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docker/dockerfiles/debian-sh4-cross.docker deleted file mode 100644 index 6bd8171d33..0000000000 --- a/tests/docker/dockerfiles/debian-sh4-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-sh4-linux-gnu \ - libc6-dev-sh4-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Sat Oct 28 10:33:00 2023 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: 738930 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301277wrt; Sat, 28 Oct 2023 03:34:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGbHNYg3jKwv6cYA0/CKuWJ3M1/VldcrmhtvqFvSxqMohegvzHePJiiHJj8xc1PvjgUE25J X-Received: by 2002:a05:6214:e4c:b0:66d:1624:2203 with SMTP id o12-20020a0562140e4c00b0066d16242203mr6063860qvc.20.1698489287765; Sat, 28 Oct 2023 03:34:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489287; cv=none; d=google.com; s=arc-20160816; b=lsUDBK0eEbPBGTOBx8r2ZDAWtQXyk0SyJmAtcNc5yY9PgTbHgRE5dqGFXO8VBKVv2t au2ESIc0YYRWpc8naDGlINcv/j1FHTzmDIz3ijHJrRdfeo3rBUkWwkh5NQdhO1twgLCP QLuGLVY03Aqnn3z9R8fLI1vr4DjW8ZiNna7QlIL30YB/lsHgx32KNqsUnXNOB6UWuYgj aiIgyDlP1e6nKUtFcrRDlKxnho22yqWtGCTctllYNHtR0OHVC41eIKfRXNjPu6zIavXf M+aFIk+XxTfp5kFMw+RZ8pKPQYRG9EMIbSB4SQKlCJ8fXRJAWXPO7rNIRSfs8qigreBj /MVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=81A+fTHfkK/i+u7qQsM4s5VTWm7Z9pz42133Nfe8nnY=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=a7x32N46aYCxVBzjm0U85lfJEwgc9Rhz6yGB5ODDcvFLcg92O/2IIMGeDgwhkDkH3M FFV0x0JnIUke+RnQqpnLY8hwCW4xZuksvRIX8n4xkZsfECejoQlz54o8NUzltcGRy16d ULNPMd9dpb+cR8qQVXBh05xA3zPh84d/jzzaqrQL7/XFe3BHOCRJMiKt/4DTfeAYZD2b Cbcim899bKsQbGPvvwCfMPHUt90yXq+OyXshn28CqFlaLdV3ixZbiOpOk3gH+f5GZSIC ilmcqkTEbkwOeGzH65NHWXj2Gq+nK49Gojkjro87F8ngTojgMmi5JlPIvLrHsQ2+069C 399w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R+N8xND+; 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=pass (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 v15-20020a0ccd8f000000b0065623cd1f57si2178386qvm.464.2023.10.28.03.34.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:34:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R+N8xND+; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdB-0006Ab-Di; Sat, 28 Oct 2023 06:33:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgd9-000696-Vl for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:23 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd5-00039O-TX for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:23 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40859c46447so19686705e9.1 for ; Sat, 28 Oct 2023 03:33:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489195; x=1699093995; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=81A+fTHfkK/i+u7qQsM4s5VTWm7Z9pz42133Nfe8nnY=; b=R+N8xND++dg8mOHUh/tSqliS+L7LAlC6rR9GOLBytBKO80Ms93FJ8pSURVE84c/2Z8 Gn919OU7wG7AtJezD28u2nGrzS9/7DV0nDuVhJq2BEHkcofq5skah8oPnp/UY9WDCbDU 64i2PdESFTeoejxNlzGLdq5tVX0hPcru/0UuwWeVWbXqTE78LFkdAgNUpt6eq9MjN6YL zNMFlsvj2dXIbNM0fqwnYvA/jcaBxVU3ON3ptAndM6a8q3V65XTWv9Q5wkRZuk/1GWNK /khSBuxhKwMpSLwxch2dinOUtFwTJaDU3N1KEI8g0wuqDqeyNFw9kjjmSUelcST+iWeS 0auw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489195; x=1699093995; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=81A+fTHfkK/i+u7qQsM4s5VTWm7Z9pz42133Nfe8nnY=; b=M6sMF2G7OjwIAci1DKaU43+k/ctLca7jhzr0MnWyFJwdg9ttXWWKhzwYI+1trGKpSE Aadtxv9pfzoMVVFBvIts2HMWdHpXrVl6bQF8DzrYWnoe4JN4ENQfGghUbpM9m+ftye4M S6RA9XHCDTIfK2q9ve2H+YOe5SlF/crb9zwZPnn2z5u6EAaa/aXzFGuJsXKJPYVJ5Hxx D178y3J8iP1Yi/qssm1gKzXL4mb5SIL6/SU1EGFypjBE9WZrnzYZBO+f89fnmqa9n7Vt bqlKKDqX+Hl4X+ba+0LDpGRDwpDrISsE69SX/GFzkgvRDk2cY5EJdUJY4ZIQSp3V4nY6 p6Tg== X-Gm-Message-State: AOJu0Ywgi+tXaeJqJmrpUHPcbeceS6UGzSdXX5tVPtpeDM62gTe22yLK XW1RjyhH2CbH3NuL4NcLn9Oesw== X-Received: by 2002:a05:600c:4452:b0:405:1ba2:4fcb with SMTP id v18-20020a05600c445200b004051ba24fcbmr4221321wmn.16.1698489194908; Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id c9-20020a7bc849000000b00405d9a950a2sm7076142wml.28.2023.10.28.03.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 96E265F79E; Sat, 28 Oct 2023 11:33:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 06/17] tests/docker: use debian-all-test-cross for power Date: Sat, 28 Oct 2023 11:33:00 +0100 Message-Id: <20231028103311.347104-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 4 ++-- .gitlab-ci.d/container-cross.yml | 6 ----- tests/docker/Makefile.include | 1 - .../debian-powerpc-test-cross.docker | 23 ------------------- 4 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-powerpc-test-cross.docker diff --git a/configure b/configure index 37d1b10b87..8707bd2e78 100755 --- a/configure +++ b/configure @@ -1325,12 +1325,12 @@ probe_target_compiler() { container_cross_prefix=nios2-linux-gnu- ;; ppc) - container_image=debian-powerpc-test-cross + container_image=debian-all-test-cross container_cross_prefix=powerpc-linux-gnu- container_cross_cc=${container_cross_prefix}gcc ;; ppc64|ppc64le) - container_image=debian-powerpc-test-cross + container_image=debian-all-test-cross container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- container_cross_cc=${container_cross_prefix}gcc-10 ;; diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 61f23561b7..ec56990bc5 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -76,12 +76,6 @@ mipsel-debian-cross-container: variables: NAME: debian-mipsel-cross -powerpc-test-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-powerpc-test-cross - ppc64el-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 654f24b188..356986d687 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -122,7 +122,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # These images may be good enough for building tests but not for test builds -DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker deleted file mode 100644 index 23779413d3..0000000000 --- a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker +++ /dev/null @@ -1,23 +0,0 @@ -# -# Docker powerpc/ppc64/ppc64le cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-powerpc-linux-gnu \ - libc6-dev-powerpc-cross \ - gcc-10-powerpc64-linux-gnu \ - libc6-dev-ppc64-cross \ - gcc-10-powerpc64le-linux-gnu \ - libc6-dev-ppc64el-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Sat Oct 28 10:33:01 2023 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: 738935 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301598wrt; Sat, 28 Oct 2023 03:35:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH5iu6BSAcxeGZwQQKZ1A5vadG0sC/OJmEm1Ml/wdifXsaj7Aq44k37JfynawfEts9dp0fY X-Received: by 2002:a05:620a:1a26:b0:778:ac69:edf1 with SMTP id bk38-20020a05620a1a2600b00778ac69edf1mr6458632qkb.36.1698489346027; Sat, 28 Oct 2023 03:35:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489346; cv=none; d=google.com; s=arc-20160816; b=EvA4z6u1fo1VTJEdbSSNoJm2nAoyo5kj5aoECVK4xiaqTLwKk3H7aI9BEfPkq4fJeW BujdBSx4lBgl2XE8Zd3wCn0VcnLi3QQtH6CIKgxNmwn7kT4b3mRF5TN/yo7Vp/HMsgtj yPz9iuD/PIYZM2gOIjaHau09gXiDRi0rTtwKCxUM9EMCCgm6lPhLsfYIrfI2CHrd08Fg 3AE8xdNUi0P2H7k6QzmeefxIawU1fIY6+MgXOzpuFZeyz70y1lcazjH3hZk4ncc6Bx5O MvALIKta38M6ks/hw0UEC9tAglKTpwPOA8FyYSYnjyI2BoqerlwNQi5+7YEUEBi5wvOc Q1gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=UVrvJytMOgZkGMhe/n/Zc67wTMwGK+JIiWzg5lM004g=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=wQ4mxhkGXRV+4BKhCts1YVZAHyCnUyn66tY8JptROLhxIJwPbIXI46Q33PDMykQU2E QNAelaWE/63f9WKBdIEzdrIro7mILTOoVy28wIv4ZbpTBhYdFuHDbTEm7PCLSWwT1yLh jpkkiaBxJzPchpRpgfM4pI9BDAcN/mGzD39irJqd5P68RzJsTjgMPNPK3anbCwA7uXS5 Qk1IyyIuQQh+AZbduqVf5L7nuDHIcmMkh/Pj9Y+HmPgq7pEjJzh30oqYzL2rzfGL2X9J Qfx96cGOD4JI2YGdcS6U533CcdccLUbZBcOzRFPH+wygJY8LCsnsfGibrHm+ma365tH0 /GVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FMTBWw5J; 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=pass (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 27-20020a05620a049b00b007706544a3a7si1997226qkr.673.2023.10.28.03.35.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:35:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FMTBWw5J; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdD-0006C5-FL; Sat, 28 Oct 2023 06:33:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdA-000699-1d for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:24 -0400 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd5-00039m-Tr for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:23 -0400 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2c50ec238aeso40622541fa.0 for ; Sat, 28 Oct 2023 03:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489196; x=1699093996; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UVrvJytMOgZkGMhe/n/Zc67wTMwGK+JIiWzg5lM004g=; b=FMTBWw5JsqIg5OwoAZ/ljlwelyOBKa4rK5BZpOYI+jvuVdpvfFJSu0MTnmj0Ws6kHR vS8MgzOg2tJuI7nPHaTlPoSTeN33Pn7o352Q9lSVqV3XHxpEW09y2Y8PDUY+naYgzMND irsPYHE4L7uYy3oc6LX3Vt2awxE08GQLZjxtma+gu68EYod9EcrtOf9mmDu3MsNBUIXI VTpkcBJq7Vqu/6UmrZ/li5eCjvEGG8e9H6b0n6juDYFN4rzlRBQF6NDRoUS2LddrkEJ9 SH3wxSoR3MWwC48QVK7ov/VTg+MSuiFKkIVTHuT1hxTVp3yY2zjQSTxDKmLHaP8SYclC KVFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489196; x=1699093996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UVrvJytMOgZkGMhe/n/Zc67wTMwGK+JIiWzg5lM004g=; b=HDaQNAtzMy3CZFUSj/VuFPAx1ZGN+YnNJVpe/9166asS3rsFHAjghRrPS6/qU2SOtV DWX8bsGmNCGfZ7eGGmNXa7EVA4M91n1hs7i7D6TJvhHDGIOEQGbMQi1KP1M87BZp0Yti Q3DJiAWF0kGX7VFzGCmQMzCaazuXI4tBUpooWhwWXCIw70EsYSUMZXNsKq2ooSN63cQi bEEQle9iKLtbaoBwVgdqFCUN2yTxWxwpOpDUypMK+GfR+QE7vAleonSRbyrx8gAyAtj1 HPidDKx+Oeux9afSdPwK7P3KpW/qikSj0EolwSPKbb6bCjx/hpRTMxR+5AfK1un3Exao +mHg== X-Gm-Message-State: AOJu0YzuV5JuR6Fv5MeeZWP07PpxQpyR1/eAA/EZg1Q2JyW9VCwiavRH CPNAyHqAdxzB9VXagMDNEi603g== X-Received: by 2002:a2e:9a86:0:b0:2bd:180d:67b1 with SMTP id p6-20020a2e9a86000000b002bd180d67b1mr3908833lji.51.1698489196532; Sat, 28 Oct 2023 03:33:16 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m9-20020adfe949000000b0032196c508e3sm3582913wrn.53.2023.10.28.03.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id AE4D45F79F; Sat, 28 Oct 2023 11:33:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 07/17] tests/docker: use debian-all-test-cross for hppa Date: Sat, 28 Oct 2023 11:33:01 +0100 Message-Id: <20231028103311.347104-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::230; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x230.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 5 +++++ .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 1 - .../dockerfiles/debian-hppa-cross.docker | 19 ------------------- 4 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-hppa-cross.docker diff --git a/configure b/configure index 8707bd2e78..0a755c71a0 100755 --- a/configure +++ b/configure @@ -1300,6 +1300,11 @@ probe_target_compiler() { container_cross_prefix=hexagon-unknown-linux-musl- container_cross_cc=${container_cross_prefix}clang ;; + hppa) + container_image=debian-all-test-cross + container_cross_prefix=hppa-linux-gnu- + container_cross_cc=${container_cross_prefix}gcc + ;; i386) container_image=fedora-i386-cross container_cross_prefix= diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index ec56990bc5..5f8616c0fd 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -40,12 +40,6 @@ hexagon-cross-container: variables: NAME: debian-hexagon-cross -hppa-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-hppa-cross - m68k-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 356986d687..b701f1225a 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -122,7 +122,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # These images may be good enough for building tests but not for test builds -DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker deleted file mode 100644 index dd47ffdfa4..0000000000 --- a/tests/docker/dockerfiles/debian-hppa-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-hppa-linux-gnu \ - libc6-dev-hppa-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Sat Oct 28 10:33:02 2023 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: 738928 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301189wrt; Sat, 28 Oct 2023 03:34:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEzPLWod81jg9mnuEITKUInIWphuWDlAtD6ul6kKRWFHZlZ4tr2VBMA7bNuGM674ik/Hseo X-Received: by 2002:a05:620a:4148:b0:767:2919:f38f with SMTP id k8-20020a05620a414800b007672919f38fmr6009168qko.10.1698489273657; Sat, 28 Oct 2023 03:34:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489273; cv=none; d=google.com; s=arc-20160816; b=JUnOPDmOTQTxXTstbhaw+xozDQ7cOKevdR70h3yNOtTJFYyyWVcJkC6xwr0wcuHNSk wAkuO+33c3YVdilTwTFv5yrBJffE0mSIcHsMgGExGqTm9g6Pt26Jc9byBvkXb6++ZlWR zm96AZ1c7W7kj//j/gb5l4+gRIN0TJaVodKRDhjoJuenA8CH7Dp5tdu9cJiyTwUsdYMw 4/Y0Du1Nn/MhX7SPCA0z69i02JDd9aDXBicl4nTbA/juSQU9Bq5J/dOsTEydMNa6ya6c dRXi8/Ac09NybKJ61NHAOdszBONVZo2MZ5pGAxm5dW9fzjwvhizzjZdYvxn8+3QdAjgQ 6hYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=EnBzYhuqOhbZhlE8bzDSd1Z6QjUEt19/nYehqVxmF20=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=dln4SnwSMH4JuDXotjq9kVK00QNkOofNAJTVWpnX+oCsQLCZ+hWyCqmLaIaVHksBLH FGTf3rDWMh1SvlwQ5ebpv0rzhterSPfdsR/dJTigmjLmtN+V7KSLb3TXLY7A90wchKxV v7dl5dz++xzNT1Ha+UqglUlZFZEzDbIt3fzrMZem4l8LKH0NSYkUe+Jj0A8J5vpMV7lB cI2sZMSqTwAt5jVqXEOvSOa4UZ5UAz1TymDuAEa8XmHD8Q/iZkzMon+MccsY+B8/uA3d 78vEFsO7apKrBi6uSXm1TKR6HWUU9pGeg/5oyVtQi8eBB+YNbJMozUM+iVQ+skGVEHYX 9SCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Kyuk3LYy; 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=pass (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 ud4-20020a05620a6a8400b00770eaca9182si1962666qkn.303.2023.10.28.03.34.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:34:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Kyuk3LYy; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdF-0006FB-Kd; Sat, 28 Oct 2023 06:33:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdD-0006Cf-QH for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:27 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd6-00039h-84 for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:27 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4083cd39188so21017365e9.2 for ; Sat, 28 Oct 2023 03:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489196; x=1699093996; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EnBzYhuqOhbZhlE8bzDSd1Z6QjUEt19/nYehqVxmF20=; b=Kyuk3LYy1OrazNOYvgm1NBlNCx+nSpGrAhrhsN0tVSRqNvJp6KXlRqDYIWr0SeTuvx uFQuAGoFrK+i19vJiMYcaFZMVylgw3167zokAYKcT//4swVlADRqAuvkhdNH3yq4c7XY Ro1/DHPy47/3wsJNM5c80ZyAomHpileH4U3E007bBPns3NJm7hWsKnVeasQTO0bitVf4 ABCsaSWcHVwC5UlHqVZ+fPU7ImruyLwDMnnAGpvCX25QWMVXimll0P461TObMlMfV28+ T1VaBBwyCjGvMze/yvdbaMbnvjN6cpWZyCP20hpNrZX75ox9nWG2gTMGgWeYI2QKY/vm iZug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489196; x=1699093996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EnBzYhuqOhbZhlE8bzDSd1Z6QjUEt19/nYehqVxmF20=; b=wFejjEk9F6xC2L793kQrautIShyzn4EsavQg7IJAQbwPKVxzHc8A7U/pdt/7Inssh2 MGy0NPH59SX3XaSN3JvZsbzezYgtcBGc9A9acwpiAV/eCdXwuOWkf533UAPmghaSeR9w ye+smKUOW9ZEkdXC6dIoSWy/Oar8r+44w8XGnkOA5b9ogBiteisr6x0fuupmKaaKf4kh N7O7vtdY+ITw2BAQV3/Z0uUybe6b1KFl4GFCJRcTDLXv2qx0X9JteH0DR7c2msj0tbmY 6Ov6oDdcQEcwURSVcn+PTrle+D78Nk7/NAhffR7dM8yWom6KgjaSuNazjbB0qyVnKc// PQ0w== X-Gm-Message-State: AOJu0YyJGDtLxjBsQq8VtF1S2gjDX2Q5U81gY9q0SMQBje6sjlmxABV4 k+dic3XZNtNwFRTimNnXgxnWZQ== X-Received: by 2002:a5d:598c:0:b0:32d:ad8b:2a04 with SMTP id n12-20020a5d598c000000b0032dad8b2a04mr4900418wri.14.1698489196281; Sat, 28 Oct 2023 03:33:16 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id bq22-20020a5d5a16000000b0032f7865a4c7sm1548316wrb.21.2023.10.28.03.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C6CF15F7A0; Sat, 28 Oct 2023 11:33:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 08/17] tests/docker: use debian-all-test-cross for m68k Date: Sat, 28 Oct 2023 11:33:02 +0100 Message-Id: <20231028103311.347104-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 5 +++++ .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 2 +- .../dockerfiles/debian-m68k-cross.docker | 19 ------------------- 4 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-m68k-cross.docker diff --git a/configure b/configure index 0a755c71a0..c7c811fb02 100755 --- a/configure +++ b/configure @@ -1313,6 +1313,11 @@ probe_target_compiler() { container_image=debian-loongarch-cross container_cross_prefix=loongarch64-unknown-linux-gnu- ;; + m68k) + container_image=debian-all-test-cross + container_cross_prefix=m68k-linux-gnu- + container_cross_cc=${container_cross_prefix}gcc + ;; microblaze) container_image=debian-microblaze-cross container_cross_prefix=microblaze-linux-musl- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 5f8616c0fd..cf2fcaa59e 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -40,12 +40,6 @@ hexagon-cross-container: variables: NAME: debian-hexagon-cross -m68k-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-m68k-cross - mips64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b701f1225a..f482b1e92d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -123,7 +123,7 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-loongarch-cross -DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross +DOCKER_PARTIAL_IMAGES += debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles/debian-m68k-cross.docker deleted file mode 100644 index 25dd1c1e68..0000000000 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-m68k-linux-gnu \ - libc6-dev-m68k-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Sat Oct 28 10:33:03 2023 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: 738938 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301990wrt; Sat, 28 Oct 2023 03:37:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHE7doWA82CGF1gDq7hWkI9tY4gTHcP5owR5YLopRy69DmCPFOozdQS9XAjGZSYNxxc/8F4 X-Received: by 2002:a05:6808:128a:b0:3b2:f270:c689 with SMTP id a10-20020a056808128a00b003b2f270c689mr6229932oiw.23.1698489426043; Sat, 28 Oct 2023 03:37:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489426; cv=none; d=google.com; s=arc-20160816; b=DaIFXyen6xzSK70Ph1Yk+BLeN/nIGMMT4xl19yGU9t6WyPMWw8nEfP9jKDv7V7fSNX pEiHe0aAOT0dq2jSBnaSWgn0GXsXKt4MIUSlU9oXFeuWsAOG6K5iRBxwVQA/5TZOm1Af Dx3gYUmcJd6dQ2GR5j0ELbe9b05InRMUD1sg+BzQ83Sr4G6GLFYEkcIQpruadospOvrj 6Xs05eH86wu4Gv0jT3KhyX0Nsfrj4iyjGLRtS+St0Oosr26YawqkBBi+yMfcoTxd9Uf+ b5jv37M1uH4mqA5H9qkWLSLiHlk39QzDS6xbHZwBPZjeJa2W+mO03tHRkZpY9NY0afHH uQPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=VOohqrrDiZJNNE6BJJ+qouc5a6zBuGTEa7edb0jfkyU=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=V7DFRFpUOL1CyeNVsyMYXkasuoCTbaWbMnjWtG8kv1c8MSzeN8Uh/OdLuMscaZM/1C A969dDziXTFoIHq6HoT9maD8EmpEEy8lc8QyTZHKANtKLQ3QaMZQGQtMYyRoy+0+XFQi HTcyPIs0dViv1gSQExizGI7atvSDbRYBCqTy2cloMKBvz8VP4LXL4QQaHLTehNBobuaN ShoppPenZcfuSHhqUUezEsnH2JQ9BRDQRzj0VFY9vNzVHa0HBXf07/ST1aE25fKeSqt1 PN5/FL7qF6ygdeIAIsKIdyWIVTEqEsjN9W4R05nz469cmrg2n2suqGpgH5ba5tjRDvL2 MxSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mMFO0szo; 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=pass (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 h5-20020a05620a244500b00773c43e5e5dsi2050432qkn.651.2023.10.28.03.37.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:37:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mMFO0szo; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdE-0006DF-HY; Sat, 28 Oct 2023 06:33:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdB-0006Ae-Ft for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:25 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd6-0003A5-7w for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:25 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32f7c44f6a7so222266f8f.1 for ; Sat, 28 Oct 2023 03:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489198; x=1699093998; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VOohqrrDiZJNNE6BJJ+qouc5a6zBuGTEa7edb0jfkyU=; b=mMFO0szoFRqILLC5DZoiJmJY2xc0KJyQwnJ8m/GGM6QLyQ+Rk2z5tFhR/1DuSc5OZs wOFIms432rnS7OATLycbQpfo5Gg7rD4y/84ATAliEegIeVUFV2LmW6VCGSit3BAd3SmB 3ei3AUyIgQAW7a8VkYn02BgUBp5D3VCQMn4dcErd7TatNH/KijpPwNnx6X+3XY/hez8i mKJ+sysgeWD+8o/10cfTVr9Haare4Mwlj3h1begf2sKRUdNq9c7oc5L87/z5DDEpnLR+ 6sMFaHmqnYCt9ctFN25w32AjIuxR99EC3w2MQKyzYuPvuMfR0znZTeD69QpHiqXxSsuV XXvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489198; x=1699093998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VOohqrrDiZJNNE6BJJ+qouc5a6zBuGTEa7edb0jfkyU=; b=M2YQWvAAp9SnqVpQSM/YWqp3vOY/uGe8c/KFLsQFjxsvIDvRjtAms6zq25gb51o0jG Q0HcmbPr6HoRvnpws9i/Plq3pH1/YPpZtomkhfm8wZDELklJ9vEtRSkXJ93A2bj+bOw7 jy3ISlyfbcAnSK4M38QjYP8S7CRKrFvXcLlL0V6CSoF1iRaTEMBjgWuC+z+4jIxYSISg S0y5Smb+NtVOCVP6v5nInsLdhoK+zqJ7+j+zPY7Gj9+yeYjCGzqs9tcK8SxgKIfk8trv JcRnpoviOzHsz2RPd2TQ5VNjeSfcVcJIwHo9eBxyuJs//6CJPJQCMcLA6h5CBbOs1GM+ vhBQ== X-Gm-Message-State: AOJu0YwmRz8tuVPKekbRDZCiDJqvyg/fcqjzR760bUYqPgsHdPeLEwib DUK3/wv5Gi47e4FqJ87J5TMN9A== X-Received: by 2002:a05:6000:11c8:b0:319:72f8:7249 with SMTP id i8-20020a05600011c800b0031972f87249mr3546980wrx.66.1698489198037; Sat, 28 Oct 2023 03:33:18 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id x14-20020a5d444e000000b0031980294e9fsm3568243wrr.116.2023.10.28.03.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E12995F7A1; Sat, 28 Oct 2023 11:33:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 09/17] tests/docker: use debian-all-test-cross for mips64 Date: Sat, 28 Oct 2023 11:33:03 +0100 Message-Id: <20231028103311.347104-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 2 +- .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 1 - .../dockerfiles/debian-mips64-cross.docker | 19 ------------------- 4 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-mips64-cross.docker diff --git a/configure b/configure index c7c811fb02..2bcbf0fc36 100755 --- a/configure +++ b/configure @@ -1327,7 +1327,7 @@ probe_target_compiler() { container_cross_prefix=mips64el-linux-gnuabi64- ;; mips64) - container_image=debian-mips64-cross + container_image=debian-all-test-cross container_cross_prefix=mips64-linux-gnuabi64- ;; nios2) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index cf2fcaa59e..f863a14664 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -40,12 +40,6 @@ hexagon-cross-container: variables: NAME: debian-hexagon-cross -mips64-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-mips64-cross - mips64el-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index f482b1e92d..b4296d3c5e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -123,7 +123,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-loongarch-cross -DOCKER_PARTIAL_IMAGES += debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker deleted file mode 100644 index ba965cf564..0000000000 --- a/tests/docker/dockerfiles/debian-mips64-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mips64-linux-gnuabi64 \ - libc6-dev-mips64-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Sat Oct 28 10:33:04 2023 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: 738929 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301246wrt; Sat, 28 Oct 2023 03:34:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFWqisQ8KqykVgg3M2BwAOnIe1mK5bU11rGItZgZd/Tbtj9pU+sQj86qkkjpuVC0oTGk+KS X-Received: by 2002:a05:6214:c44:b0:630:7d0:56f4 with SMTP id r4-20020a0562140c4400b0063007d056f4mr5367682qvj.49.1698489281816; Sat, 28 Oct 2023 03:34:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489281; cv=none; d=google.com; s=arc-20160816; b=VfmchgKcXty9ZzIattjA8Ota18KcbXvrrpFvScT3iM6E+TuUt5trdr6WVHifZyWHtf tTy0/irL2RSwCpIx9bTDmhvVqeur0bzXwUwFxzeHwDjQCf2guiuIWTzUIqlTw4UVuYPp ZHp0ZJDGt1RMsWoPOaigoxnLFYcWlkSJ6T0kDjvq6VtykZShtmzp+ZNE4YLtfpgcX9BK PEkA08bRjLd4VI6FSj35V4jF5LElHms3GM7DCgkcK5HOb9pyjdXa59iD5mLQlxLxadDf SUKTVIa/zCIRgmOCo1vWe57T2khVvK8cqACNHXPOitoXanFu9aRpYObDmr9RStC0OCGi LAwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=khcpUjuKXbYxxFjA3ukw68hKA66dopuVKXv6uOwtSmY=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=nZmf3viKKjbROH1NQXuZH7CH8Yx7q+uneQD9240vbkAMnGrp9KdeSZ744ollYFaG2J /WGJ4zmB7wIlkHf+Vu3910a147QgrL1o0eLvoDBHuL/uV/VhMNI1a678o44kMzkL+6Fl qTNdMOq2xi2eNuUYew4OOSwjYq39K0X6AaeQApHXBwxQ4WAaUhjzj8tdhuHo8s8jf1U/ 9wJ0M0Jsfzvqd+C5tn/O5C3+5/5Ct0Zni5zNng1xEDGk7Xr6G+HyJQ6ji5yp5ahcBFMI t2eISFF/licwpmy9FW3VgiHoHdFRTvULOxptDv+7Ch++dozuT7ywInUxFuOgSlsnvMYa r2tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vQAxeUAo; 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=pass (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 b8-20020a0ce888000000b00670c3758754si814324qvo.314.2023.10.28.03.34.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:34:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vQAxeUAo; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdF-0006Fr-Pp; Sat, 28 Oct 2023 06:33:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdD-0006Bn-86 for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:27 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd6-0003A3-8H for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:26 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40806e4106dso16742165e9.1 for ; Sat, 28 Oct 2023 03:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489198; x=1699093998; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=khcpUjuKXbYxxFjA3ukw68hKA66dopuVKXv6uOwtSmY=; b=vQAxeUAozVx5jOdQRpGKKizaQ+GZ7zSu+uCsc+grWeJJNzBYqoiq9fvmc6jS7RiCs6 9GHJUQHOy/9hsE+th54XWOKTWGi1ahU+c0x8xPxR0lrsFuyZxy+/zM7lal4eO5x+lnow VjBWvBxBAcptyACAzsqEGzVLyHsJQaMu2UKyHFc0i0I7ltc+t9w3HgiIuI1hlEPNUgas dYfjOOxIZUO+ObOFgZyuSvWlFkHRCp80emt5/kYx7Gg7IBh/KCEF/FXuA7pLTv+mXwbZ Ufq9W7N+ZxeoefrkO7Kv0OugWZ5DGm4h0v34MymYBeEfVuaD4VKYyv21jlq/9YrqQ2f4 Yzpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489198; x=1699093998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=khcpUjuKXbYxxFjA3ukw68hKA66dopuVKXv6uOwtSmY=; b=Aq/YtlyHn8KlzWXXheFhN41jxN6ObVnlsVxiiWP2KtJx/v0jhLOg7wwrET5Qfj8+qm x3hHRyKpvyXgvD9hFcCE15C7Zse66K/4b6E5Mn9aONVyANAU+G4+KMkUn1TX4Ne7P6Er +ts0w8SeqM61xWPyyww86FCtZ75OA5CnNn8mCCrt2Okev4Xjv9iEqYkwQdw0G9hVYFbv 3fLAxONjunWQUqLXTALw4dYu9jEPQBK3YA3vnuPbcoptMkvbDJFYh8W/OEseV677Tmpb TAlDfLzKIUgKv3jaUQNS9FbnSlXVyj4tJMUmLQz7he3ealXwu9A+/zjIjCMSBUEsRsjI IONQ== X-Gm-Message-State: AOJu0YyNYXPXFCQ6nUjivHBWXxLGN7mu6x9lJzLzp2C1StsVXqctwFGv Nre44UaKLFdm08p6CJn0Qfra4w== X-Received: by 2002:a05:600c:3b9a:b0:401:b92f:eec5 with SMTP id n26-20020a05600c3b9a00b00401b92feec5mr9092107wms.9.1698489197941; Sat, 28 Oct 2023 03:33:17 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h9-20020adfe989000000b003271be8440csm3548603wrm.101.2023.10.28.03.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 05B3B5F797; Sat, 28 Oct 2023 11:33:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 10/17] tests/docker: use debian-all-test-cross for mips Date: Sat, 28 Oct 2023 11:33:04 +0100 Message-Id: <20231028103311.347104-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 4 ++++ .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 1 - .../dockerfiles/debian-mips-cross.docker | 19 ------------------- 4 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-mips-cross.docker diff --git a/configure b/configure index 2bcbf0fc36..2d8c7a0312 100755 --- a/configure +++ b/configure @@ -1330,6 +1330,10 @@ probe_target_compiler() { container_image=debian-all-test-cross container_cross_prefix=mips64-linux-gnuabi64- ;; + mips) + container_image=debian-all-test-cross + container_cross_prefix=mips-linux-gnu- + ;; nios2) container_image=debian-nios2-cross container_cross_prefix=nios2-linux-gnu- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index f863a14664..0b48bf0172 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -46,12 +46,6 @@ mips64el-debian-cross-container: variables: NAME: debian-mips64el-cross -mips-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-mips-cross - mipsel-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b4296d3c5e..04ac5f9c79 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -124,7 +124,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross -DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sparc64-cross diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker deleted file mode 100644 index 2cbc568ed1..0000000000 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker mips cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mips-linux-gnu \ - libc6-dev-mips-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Sat Oct 28 10:33:05 2023 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: 738936 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301874wrt; Sat, 28 Oct 2023 03:36:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFHlOkWr8ujhZJ3sOcApq4z8AZpAlXESW/o2l5XaanTabVYmkgZZvcn4mKA34UgrwEBN1AP X-Received: by 2002:ac8:57d3:0:b0:41c:bb5e:ba1b with SMTP id w19-20020ac857d3000000b0041cbb5eba1bmr6311647qta.38.1698489398761; Sat, 28 Oct 2023 03:36:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489398; cv=none; d=google.com; s=arc-20160816; b=fuXu0fbLHeyTKWYbgy0ATz300ZV/+ON3eG1W6Bw8Ob5OOls7GjyOzbY3j+P2v9cBZZ 63ESt9Ffl26UNNf6OAzAJOFblPWFFWPLZV3/j2P5uWSZjCHGLcaZJgoA8ah9v6u/AUZn zKEwEzn+ffbk2PZuFXatZgNYPy54SF4GVXP8oVj3ElCWppmAEvKqNU3pS2IqH58EbxNj 7ssr9G7/wbuDnp4IrZtdaf3aiJDsMzlRagkURtOxRxOnClIbkyqtjFeWDgwML9Wau0ny Y8HSsAPbwh9ABBzYtgl4LQi5z+9LPpwHgRfLdalnTlbTJ1Esb/jbeJNdOa5k/4xco9qc scCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=bU+M83jUNRZkgug/gFeRzCF0q//PFmVsZWhfdTFT9TY=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=LWll0sOj6PuM1BxacNgRk0kBnL4onzXtJbHZS4JhsXlebQcXIFL/5T4iE88haC0OeY yeSzztylFU01R3qkCBSdqyoYvgY8eXkgOx7T5vQ7QiFPPct7WPs2DRyCk14fOHrC9Hp8 57oAdLlNiKnyL576Ld5wKJBx6RWJPmZ8cbaywKLSSDrpokv/jQ0SVH8wq+U5V/E9T9BU AjAdclTNLCGwP2Nkg7vZotA5My5v/n4gRgitMzTl4XIz5L0ZDFsbYwknZiPImqHYFFxZ LOC7l0nc2wK/b0+ZPEjnA8xlZ2bsNFKXe/4GtZHAUdMzVcHrtSOAZk4F63RT8dZ8Xkvo GIUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cHls56Du; 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=pass (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 v41-20020a05622a18a900b0041cbafcc5bdsi2168638qtc.121.2023.10.28.03.36.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:36:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cHls56Du; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdQ-0006Mx-22; Sat, 28 Oct 2023 06:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdI-0006JI-0f for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:32 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd7-0003Av-Uv for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:31 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4083740f92dso22745295e9.3 for ; Sat, 28 Oct 2023 03:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489200; x=1699094000; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bU+M83jUNRZkgug/gFeRzCF0q//PFmVsZWhfdTFT9TY=; b=cHls56DuOt9QIuOnEECdvO02rYcYpQohBJxna0ODIWI6DlHwq5H7wz9T3z2mRRc7Hv hFZCi7za523lzWmY2hV5XuzqoZn5Hkj20yLK+WruUoH6B/g2E1A0dwt9jJouYogNxwgt f4KggwPoj4EQs4ZPsxTDuyfXoVkYSik//un25WZs7RE8SmBKjvwAC0dgpteeAwCZ4qDp f+dIhJz5vtltOnSC01jBcGUhVNbxPj9j+sZ11LSEPyk8fZ1vbc8FSx/uDjTbjgF+Yf+o rcs9r7sNT5PcaWQOJHLZC7dmW2SZ5DinRU7/ZDffoW2dgaWh7hxxkaEwc5Ch9CKI4fmI 226Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489200; x=1699094000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bU+M83jUNRZkgug/gFeRzCF0q//PFmVsZWhfdTFT9TY=; b=ZT9g+xvL+HttrjKFODvc1GMfdQuhKMH49JEC9fC0mk1+lvlabd2mOLaB2cwXn05g2l v3iG7tZEn+4F4s7vggiruikVcUUa24Bxmp7cYMUyYKX+8gBOQIHCoYfOE+uSebQiDjso yif+W7yDmz9owRdVVE+2oE7Dj/54ytBB6M5DOip0+rMzOByrZuLT1wpPp4dCXSau3Xc5 bQ0YiHnIDHkPgQ/3dyzFFnwc4EqYCcxDBQXYB3hROFbwD7IQdNucOMBuAtTxvXT1RMWg +sydUrI2Pv+OK/PWc6qO2mcDM7UWeAANr5EuNTX+CPENS+HMds9NdCaFEPSDogNivWfw 17ng== X-Gm-Message-State: AOJu0YzGQHClnuO2sO9DrW/XxQekOuLdx1d86DkcrrMbogOlyhoPR/Np RzznffIhJooNVV4+FD/Wib0ukg== X-Received: by 2002:a05:600c:190c:b0:402:bcac:5773 with SMTP id j12-20020a05600c190c00b00402bcac5773mr4591087wmq.38.1698489200704; Sat, 28 Oct 2023 03:33:20 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m1-20020a05600c4f4100b004063d8b43e7sm7264686wmq.48.2023.10.28.03.33.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1F57A5F76C; Sat, 28 Oct 2023 11:33:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 11/17] tests/docker: use debian-all-test-cross for riscv64 Date: Sat, 28 Oct 2023 11:33:05 +0100 Message-Id: <20231028103311.347104-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 4 ++++ .gitlab-ci.d/container-cross.yml | 7 ------- tests/docker/Makefile.include | 1 - .../debian-riscv64-test-cross.docker | 19 ------------------- 4 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-riscv64-test-cross.docker diff --git a/configure b/configure index 2d8c7a0312..20247bc149 100755 --- a/configure +++ b/configure @@ -1348,6 +1348,10 @@ probe_target_compiler() { container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- container_cross_cc=${container_cross_prefix}gcc-10 ;; + riscv64) + container_image=debian-all-test-cross + container_cross_prefix=risc64-linux-gnu- + ;; sh4) container_image=debian-legacy-test-cross container_cross_prefix=sh4-linux-gnu- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 0b48bf0172..1436ef8784 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -67,13 +67,6 @@ riscv64-debian-cross-container: NAME: debian-riscv64-cross QEMU_JOB_OPTIONAL: 1 -# we can however build TCG tests using a non-sid base -riscv64-debian-test-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-riscv64-test-cross - s390x-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 04ac5f9c79..0e8133109d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -125,7 +125,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross -DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross DOCKER_PARTIAL_IMAGES += fedora-cris-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker deleted file mode 100644 index 6e631295bc..0000000000 --- a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-riscv64-linux-gnu \ - libc6-dev-riscv64-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Sat Oct 28 10:33:06 2023 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: 738942 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp302196wrt; Sat, 28 Oct 2023 03:38:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGzJDSQv/StbZA48ohVsn1tXaj/Xwjk68FmwAz/zTpYIs1jwTFVhPSVktVat/NQKJiFcw+ X-Received: by 2002:a67:b20a:0:b0:457:78e0:b99f with SMTP id b10-20020a67b20a000000b0045778e0b99fmr5358369vsf.34.1698489486878; Sat, 28 Oct 2023 03:38:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489486; cv=none; d=google.com; s=arc-20160816; b=z0jgdrBtpZw//cg+tDZdsWSg0nX8OE4/IFzrWrmerKquhdhhr4jtg1Hd3tQSrIn4Ie gXB1v02XmYcgGvhct2uRnVZpBlzeO8QwkQD/oRSrdcGC9GEI/0fnXPf9DGyP1NbUvhM1 eXkSNQBxMEkHsJd9sqbGUu3vB6xrrKTrqEx6sIlwMPBmOAfR06bjpt/3x1xCoBEZ4Bfu UxvP1V+pNfydsJPkNoJQRgERU2M5Wo+BXWbbLeYZaQ+XolaoCe4L9E65JgJtTBSRV3/S azu1kkQ459UW5xqk0yrSCQiGE6CYPHcxVlutWr1JKaJR7FRMdKM7l7K2mSzKeF3fWrUg M15Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=GuhB1oqrltzwGhGUiDD3Wy/LeTIaPHbJQgIVwBu8Ch0=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=hU/KpRktshnaMcbFNQimInfnR9VrmIuOtKcJWTtBy5kyHBezl0aB4h/RBwucQPl8VI QcitWFfCQQGAP6R4N2z5ROzWtqOKAYb2rLq+DP4En+GWPkdhFNdKXvBDahEWysDEf+ja e7obL0jAA3yfmQQGJCWVApzXoHIFblfaieEZrvt/OnZLg8mgwRPFGV4UYbq4z9v7TvSc LNi0QUb0rhv4nXz82tOUm2Qh4T1IlfjfBNFva52uD3V35Wg+N03+hik+ZIpsX2BxXYDC Y4s8JUXsPPBHZQLjALWrXZanZdC/GLoQMSlN7nr9A/1psOD+mlT1UEqWLqwpOJm+ciRa VPKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VvXpSrTp; 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=pass (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 h9-20020a05620a244900b007758ed68d5dsi2070405qkn.359.2023.10.28.03.38.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:38:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VvXpSrTp; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdQ-0006Nj-MU; Sat, 28 Oct 2023 06:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdI-0006JL-Fd for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:32 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd8-0003B0-9r for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:32 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4084e49a5e5so23576125e9.3 for ; Sat, 28 Oct 2023 03:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489201; x=1699094001; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GuhB1oqrltzwGhGUiDD3Wy/LeTIaPHbJQgIVwBu8Ch0=; b=VvXpSrTpSvPgo1lHLuWivamJq46OJNsqkeEtY5HLSl2icKr6qk95ODb8FIGiChRbIu mkdYC0dF71lKOtrG54OIs0RyryvpxB6F21LuaC1V+Emjp5HkwKEvv4zMrjQ+qlHhNCwZ 3Y0pVg0KscDsu/pDeoOgTyo+dKR4o5BFkFxZi/jMJlr4dGUEGcyDLvwRmXZ0wdhax8p1 yqBUDcWysoImeK9vbEclnRb3xx2bYqE5/uLqQDzOrxPNQ/GXjhwCfatcClAbOA2to4Sj uG/gh1fmQUqtPQYQTVb0SvePwXYXVxv8oATJniitgkZcRjVdUYMJ1nnvuk1oe7GYd5tL sPcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489201; x=1699094001; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GuhB1oqrltzwGhGUiDD3Wy/LeTIaPHbJQgIVwBu8Ch0=; b=UZ4hdo+i2pwgQ/pbVgXlVl+WaxwFtOXJx6AfvC7IBFslO4TP60hZAGReycdxEr5Vez fTGdXg0IGXqcSszOpf2qCEVklqX2D9YKGqccot1m3pxGKdFR+/FUt+thGuool8ZAmnsp /OFncMCwqn6yNnSUcHK4mB1+pnP34t17T8/SxPGMKgnbMtThXQENQR2UgRepijSnBC27 Bup6ejNXjY8PTKfOTO6jHh870Em7xa0Oi3aG7FWkywM1lXBNCn8IA8AEcoSIgO4oSXNQ BMKdNF3VttyswVOQEuB1auVGGcds2YQKiKQQkDeAVg4d/J8ECKQB+PcTkNRSruCcRHTB MdmQ== X-Gm-Message-State: AOJu0Yy2XIwBFBrDGpY51VAQ1d10VW+IZbPVmMuVa+4WF3dgF6i86U0N 4r3GnvIvBXvpsHB7LlSqm4heNw== X-Received: by 2002:adf:e548:0:b0:32d:8830:ee2 with SMTP id z8-20020adfe548000000b0032d88300ee2mr3609444wrm.43.1698489200940; Sat, 28 Oct 2023 03:33:20 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h8-20020a056000000800b0032dbf6bf7a2sm3578110wrx.97.2023.10.28.03.33.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 364F85F7A2; Sat, 28 Oct 2023 11:33:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 12/17] tests/docker: use debian-all-test-cross for sparc64 Date: Sat, 28 Oct 2023 11:33:06 +0100 Message-Id: <20231028103311.347104-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Signed-off-by: Alex Bennée --- configure | 4 ++++ .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 1 - .../dockerfiles/debian-sparc64-cross.docker | 19 ------------------- 4 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-sparc64-cross.docker diff --git a/configure b/configure index 20247bc149..7854451913 100755 --- a/configure +++ b/configure @@ -1356,6 +1356,10 @@ probe_target_compiler() { container_image=debian-legacy-test-cross container_cross_prefix=sh4-linux-gnu- ;; + sparc64) + container_image=debian-test-cross + container_cross_prefix=sparc64-linux-gnu- + ;; tricore) container_image=debian-tricore-cross container_cross_prefix=tricore- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 1436ef8784..d27e041132 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -73,12 +73,6 @@ s390x-debian-cross-container: variables: NAME: debian-s390x-cross -sparc64-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-sparc64-cross - tricore-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0e8133109d..a490d4debd 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -125,7 +125,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross -DOCKER_PARTIAL_IMAGES += debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross DOCKER_PARTIAL_IMAGES += fedora-cris-cross diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/docker/dockerfiles/debian-sparc64-cross.docker deleted file mode 100644 index 1ef735f223..0000000000 --- a/tests/docker/dockerfiles/debian-sparc64-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-sparc64-linux-gnu \ - libc6-dev-sparc64-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Sat Oct 28 10:33:07 2023 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: 738932 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301414wrt; Sat, 28 Oct 2023 03:35:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFucvbrgAoFJxPgynU4xy/l2FBy40LUazWyM+GRLLyN8ZNbYOTDUQazx/PtUux/2Xw548ZA X-Received: by 2002:a05:620a:8d02:b0:774:a9b:d62e with SMTP id rb2-20020a05620a8d0200b007740a9bd62emr4467266qkn.46.1698489313590; Sat, 28 Oct 2023 03:35:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489313; cv=none; d=google.com; s=arc-20160816; b=iQ/JZGgwmj5rpo0TQaVu3O/lXAS+F6l4Q7pUqhVce56HCunrViwmQplrTmegLmdlbq PRfAOHez74dJFC0kDz9ZNcRzaYPN8Zhic5sxgm8F7HNIWb/GirTj0oc1iTAAcToVO3uG LnNSCBbf+w4wepHyHNUPD4LR7pW4WjSJ2oG4Dlstpgb/9EpJDaxfjCFdvTW1gxutMxQg 2LYFOcsVt/DGp5ohsZ8a+7XrnYHzsJmbLhIiLYvlHtRV0fwB7weWezLLjxcFXY+ojq/v aH5foFXNHiWErp+F9rSh4uWJeFBrPc+Lqjm5r/8nOCw9G+zqq3p3OrxsrcGuKXDJX3D9 MjHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=VBUDJb1FmN0uo5F4PjILA3VIdrQLeL6tJBLzek5+1QM=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=0sTvI0h4pZ8I3gQT2fgvUst7V8dXuJ+QTcvdSddPGDCvdoiIVyBBAl9o1CNxaN+qq7 oeEXAgMJGJ2IqCQlh7cmowqRbaxbgZkohg4dqg77TGlQjVk8sCcOwdtgqQe6sdqYGtw4 iQGH0qGIEL5ntKKAg01GfvgtqpplL5U3DpLQUeQ7Z6neNrwEKKX9REsk7VNmk+JrGo9O LihKd+UfFaF4kyG4JYzh0j77t9vHp/tphQbGt+wT5hfvKux7Iig2mMyEzr/Gaf2NX5Oi 0x65XGIsNcUAXxoNEpf/Ne7dlevHXuizak9jpOsxqR7bA/XGGS7EuZR0/MWNY3J8oZp/ ZsoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=soGQZHZj; 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=pass (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 o21-20020a05620a2a1500b007758e5dba49si2105703qkp.61.2023.10.28.03.35.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:35:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=soGQZHZj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdT-0006On-M4; Sat, 28 Oct 2023 06:33:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdQ-0006Nk-Lc for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:40 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd6-0003AL-HE for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:40 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40906fc54fdso22574445e9.0 for ; Sat, 28 Oct 2023 03:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489199; x=1699093999; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VBUDJb1FmN0uo5F4PjILA3VIdrQLeL6tJBLzek5+1QM=; b=soGQZHZj32t9DbXoJIF3AmFSaXX1Mj6s06yBKaXobkC8rqWcfyNljka1Lj73PSppRc M73eulFIP66BeOIfZ3VtwN7oS4ycjhZF61YaO7Jex2DNfuL4fkcAL5w+DBYTHdlWdndD XrNxRbifB5T4Bd5Djx/zGxpnMecGWFIVW2ChNJqq9lZ340TvR3HJ77fv/OuEN1Zre0xP BYz41MAWb5xf346QY9yz1WnwW4vvPMKB8w/1LAnOpXwW8YCU/r+Xnb2gVSq5smEBq/i/ 3KZwtueh1iqEVFE3OAeS6qelxDiJZrsKAgFWpRwm+UQ4bTA06avMs6x9gZsojETRAdQi Ozqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489199; x=1699093999; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VBUDJb1FmN0uo5F4PjILA3VIdrQLeL6tJBLzek5+1QM=; b=Z7qwWn8OEct0HDrDEZX/ammj5KPl5LtEMvVgW2qTQRYnKvZw79+Q4+zgKE0COxGz67 Yt0i5nm5L5zjJZytO3dZPZSZZbrsj+mpwHxlw11TxAyyYxF5+WZJjm6KemzrWkCpJCsC GAnGz0o/4cqRiOR3LyvVSoTk/Wgjm8wLgOPDzgZmmdxHKDRwxcV4CcyQ+n2SU8IIwwaY fby5f3b9NcabPEK5jXMRF55M08Q8Zq0a06KvHGPTfzdI1jfXI+mQeQxO+QNQ5pCpxb0Z EynEiB/Ebagoo3tZVhSPC4SrxRDHudqUqnChT4ST0vboQ83qVmYJr78VB9+zmUYZuic6 +6cg== X-Gm-Message-State: AOJu0Yx2Zb4Wl55hcmxQBHUuW1UMpJ68reU3XUPgj/KtJVlCU4j1LbQv 8XQyoHlos7PMLwaTVCCDp7kVRg== X-Received: by 2002:a05:600c:45c4:b0:405:40ab:7693 with SMTP id s4-20020a05600c45c400b0040540ab7693mr4428638wmo.31.1698489199128; Sat, 28 Oct 2023 03:33:19 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 26-20020a05600c021a00b0040813e14b49sm7176737wmi.30.2023.10.28.03.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4FD735F7A3; Sat, 28 Oct 2023 11:33:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 13/17] tests/docker: upgrade debian-all-test-cross to bookworm Date: Sat, 28 Oct 2023 11:33:07 +0100 Message-Id: <20231028103311.347104-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This requires a few more tweaks than usual as: - the default sources format has changed - bring in python3-tomli from the repos - split base install from cross compilers - also include libclang-rt-dev for sanitiser builds Signed-off-by: Alex Bennée Acked-by: Richard Henderson --- .../dockerfiles/debian-all-test-cross.docker | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 43cc083318..2cc7a24d4d 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -6,10 +6,10 @@ # basic compilers for as many targets as possible. We shall use this # to build and run linux-user tests on GitLab # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim # Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list +RUN sed -in "s/Types: deb/Types: deb deb-src/g" /etc/apt/sources.list.d/debian.sources RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -25,7 +25,16 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ clang \ flex \ git \ + libclang-rt-dev \ ninja-build \ + python3-pip \ + python3-setuptools \ + python3-tomli \ + python3-venv \ + python3-wheel + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-arm-linux-gnueabihf \ @@ -53,13 +62,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ gcc-s390x-linux-gnu \ libc6-dev-s390x-cross \ gcc-sparc64-linux-gnu \ - libc6-dev-sparc64-cross \ - python3-pip \ - python3-setuptools \ - python3-venv \ - python3-wheel + libc6-dev-sparc64-cross -RUN /usr/bin/pip3 install tomli ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sparc64-linux-user From patchwork Sat Oct 28 10:33:08 2023 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: 738940 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp302011wrt; Sat, 28 Oct 2023 03:37:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+cRjDlzOqmPBCIOouYdI2ARPHh4FpQk0kVu0tiKb2ET81c/OOc63LsUUBOWjMGdmUMcS/ X-Received: by 2002:ac8:5fc3:0:b0:418:a364:c4ea with SMTP id k3-20020ac85fc3000000b00418a364c4eamr6179451qta.30.1698489428869; Sat, 28 Oct 2023 03:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489428; cv=none; d=google.com; s=arc-20160816; b=T8g+JTf8eRMLJwGhlwDxxrydcVJBV7fRHMRiPsMRV+nnHTG7edPAhZmmoeknGxVaYj 0asHHyQ47mGX/n9ktZeYppuRvXQck5rDAicKxF3C/mR4t5ldF6qy9JclTjOlYpJ0BrvT GZD3LuWCRL0/Ek46sgndLto+8TazQkPkLhU71NOhPX0UtnTm53/P9UlJKu3yS6TPDooN 2lh+Kk8getWr54XAwsVEE5cvBYOQinyPrB97GNiRZic91QcbpTw87uRne37OXmrwB4Ut 0UWTMo0N5JEaw8+iWdI6TK/NFBhWOuP+Q1AiDPtV6AZn4qFDZnkg3xPref4ivhmu6jnI VydA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=M9D0IAeyBl7tCHLFuwBJ3K5ngt4JViKy0HwHpFD6M2Y=; fh=tcRf3N+HoqRYgA1NvQewzEUemSKYLbZXXLWmvSL4NFY=; b=oMLWTAARsDM6H2p+GmdpuROKyTXCZO4UKvuNDijPu3LxnGrv4ErZIq0Jx2FrAzfy15 U7QOsYYqXVN8+xAvoFynyfI/aP1kgoHTySdQwKRJkHqan23J8rXWO44vUXjX0f03MUJ3 8bFFgcCsI6TRACWSidRBdJ9HcmscAxTwRGY8UK39vnKxIM/udmHrYYwYK+VTd0Mm7qsT PDdXtO3z5LjTB5URq1+zvJWRL1JEft5pkl7/pmjQmNTUi7zK43pFrj0AWGja4zZZk+1Y QVFDY3UtxAdhzm7/LwEppm8vi5bEdrac5T49mEXSh9iVwOuBnF7whwZu2DpEC6efP1Qi WTkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ors6grAt; 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=pass (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 m13-20020a05622a054d00b004122ededdfesi2060630qtx.253.2023.10.28.03.37.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:37:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ors6grAt; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdM-0006LE-Bw; Sat, 28 Oct 2023 06:33:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdG-0006Ii-SC for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:32 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd7-0003AO-2O for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:30 -0400 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-507b96095abso4117513e87.3 for ; Sat, 28 Oct 2023 03:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489199; x=1699093999; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=M9D0IAeyBl7tCHLFuwBJ3K5ngt4JViKy0HwHpFD6M2Y=; b=ors6grAt5/KN4yOvC5orcw9Tjz4hrOcQQq05skR39BpOho8XecGCeKScN3FM22TI0O kfyiEJdtdkkjE1i/ultBBbPIJehA73sYqNOEAV6AwjpZrpCsoZtnipwb9kh8T8gZzomv WSIA8Fw5n89RoECzgukBcmhT4vukofUbJGJfvRjZ0RUqhGy8DBPEexcqN9F1OviN48MZ F479ZtpytKNQHVs/eg/FqHWv8JRFRuyjI+gbMhfCVVYZ9J/a166BBMhiMrfHwKtDr7Rm t7d6SX0uvbxpZ4IF3JOw/2JkJtDeCTb2ZErP531gDTrJn3+sodMZVFxowJrQMF3yzS3I imZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489199; x=1699093999; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M9D0IAeyBl7tCHLFuwBJ3K5ngt4JViKy0HwHpFD6M2Y=; b=DL79Ze65JD8BOE5p0mZexZt088KD8a6ywVm94NGgk5Ix8cjhlKSiGGsYBXnhPfWKhg MIF+T/Tbs7/Oyb+ba1ylUMkl1FIAQG2NZStQx8YFET0LWJR+nJOURtf/Bpfq1aiiVGk9 tJoogrDKtdZu4SKHcbiDQyNJh4GFNUuyjqznj4mAj1SFWvg1tqP53kczzM1/SUIvoJWZ i0d7BQawwg/W1wXkOV3DrinTLgZuJF7sZBf0u+/KBA7NOvD5afSfqVkeSaXbHIHMREe+ tem9PkZpRLytOaahV1bFH+8VhewVXi+KmUTThWZpengbOHVFB2PoUDu680Tt4b2LxD0o mzSQ== X-Gm-Message-State: AOJu0YyXaxzHW5yN/y5oGl83toLcR0kDiTQMKaJOWE6EOWBIUwr8nrDu mPqcfjB1sDwkNKbu0JT1TYnztA== X-Received: by 2002:ac2:495d:0:b0:507:9787:6779 with SMTP id o29-20020ac2495d000000b0050797876779mr3445417lfi.3.1698489199359; Sat, 28 Oct 2023 03:33:19 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y15-20020a05600c2b0f00b004083996dad8sm7108076wme.18.2023.10.28.03.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 638545F798; Sat, 28 Oct 2023 11:33:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth , Akihiko Odaki , Fabiano Rosas Subject: [PATCH 14/17] gdbstub: Check if gdb_regs is NULL Date: Sat, 28 Oct 2023 11:33:08 +0100 Message-Id: <20231028103311.347104-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x133.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Akihiko Odaki cpu->gdb_regs may be NULL if no coprocessor is registered. Fixes: 73c392c26b ("gdbstub: Replace gdb_regs with an array") Signed-off-by: Akihiko Odaki Message-Id: <20231019101030.128431-2-akihiko.odaki@daynix.com> Signed-off-by: Alex Bennée Tested-by: Fabiano Rosas Reviewed-by: Richard Henderson Tested-by: Richard Henderson --- gdbstub/gdbstub.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 1e96a71c0c..29540a0284 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -385,12 +385,14 @@ static const char *get_feature_xml(const char *p, const char **newp, xml, g_markup_printf_escaped("", cc->gdb_core_xml_file)); - for (guint i = 0; i < cpu->gdb_regs->len; i++) { - r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); - g_ptr_array_add( - xml, - g_markup_printf_escaped("", - r->xml)); + if (cpu->gdb_regs) { + for (guint i = 0; i < cpu->gdb_regs->len; i++) { + r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); + g_ptr_array_add( + xml, + g_markup_printf_escaped("", + r->xml)); + } } g_ptr_array_add(xml, g_strdup("")); g_ptr_array_add(xml, NULL); @@ -430,10 +432,12 @@ static int gdb_read_register(CPUState *cpu, GByteArray *buf, int reg) return cc->gdb_read_register(cpu, buf, reg); } - for (guint i = 0; i < cpu->gdb_regs->len; i++) { - r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); - if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) { - return r->get_reg(env, buf, reg - r->base_reg); + if (cpu->gdb_regs) { + for (guint i = 0; i < cpu->gdb_regs->len; i++) { + r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); + if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) { + return r->get_reg(env, buf, reg - r->base_reg); + } } } return 0; @@ -449,10 +453,12 @@ static int gdb_write_register(CPUState *cpu, uint8_t *mem_buf, int reg) return cc->gdb_write_register(cpu, mem_buf, reg); } - for (guint i = 0; i < cpu->gdb_regs->len; i++) { - r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); - if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) { - return r->set_reg(env, mem_buf, reg - r->base_reg); + if (cpu->gdb_regs) { + for (guint i = 0; i < cpu->gdb_regs->len; i++) { + r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); + if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) { + return r->set_reg(env, mem_buf, reg - r->base_reg); + } } } return 0; From patchwork Sat Oct 28 10:33:09 2023 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: 738937 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301982wrt; Sat, 28 Oct 2023 03:37:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvcrKpItiY7tzw9KMF4trMw/tao4szR0HXiSoRM89D8sseFafIPdcYRWCD/vw9Qht6P6bw X-Received: by 2002:a05:6808:4c:b0:3a8:7c67:7cd with SMTP id v12-20020a056808004c00b003a87c6707cdmr4549298oic.24.1698489422873; Sat, 28 Oct 2023 03:37:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489422; cv=none; d=google.com; s=arc-20160816; b=rDfFAcZgJ4sDb93C+xMdVZZaJ6HizYF+DNmwWM8y2Oymev6f2Ou4KfNU6o3pKrGl1p utc0I8Dj6rA6iBG4kFNF1yNpLKLxJAkhmLnTUhT+Om6Gv3SMg+Rb2rNeB6ZZozhLwp5b Vrq+WhkwYfZrInc3vm9+/xXb3pSim9BvmG1/8HUD2ylWRlgXruP4yysVUGRf2I0WMtZk LvGHioEHmBnBFTaC6tC8sjttX6A1nh3IU3pf1l4gD5fO2JTIOBR7ghu//hCPbfzt8YN4 hXrfqPIkrnzpeEtBhdKzMCt90ax50v5x5dm1ln6HVElcpEqFrkZ+Jn3wnlroRX9ydWSi vszQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=6LNGgzff5IUOW67edmSf6WpHil0/J68PsVdXi1+Q8NU=; fh=NPDixB1KI+1xoHIgN/EAs3Qh4PEAn29jmG2PrcZZYPI=; b=Dxu6WkUKTybtvL//jcuRhYuGA9otbgBvOPeCXu6BrATs9/r8ymwJvhbx6B/z2gPjnr d2iyrL59s8o+KR5jA1X0asB96Yq3F4T86MqTtfrS/BmKF/3UM2hk0zJ0jPgDwm26GrwO xn5VGOo/8/+bxwzG2oidcxkYjTxi2VSagTtIq1TO0QhIiGoOGwZJlC825JADnW9C8jaj 3sODSLsOyYCDBnjwhYSA3Y972v2NPNK3VWJTOl1AJ6JKeel+75oQEp7JZtqcO7gJSvrE 2adu7nV/Q+cUA9CkuCjk38kPZQJWwH2HY4VO0mZsGbbLMi+0209E0RWS1zVCy7d4s9zq ofIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cAhvlHv8; 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=pass (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 y10-20020a05620a44ca00b00775762f28c2si2095103qkp.81.2023.10.28.03.37.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:37:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cAhvlHv8; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdM-0006LF-C1; Sat, 28 Oct 2023 06:33:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdI-0006JJ-3l for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:32 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd7-0003AT-3q for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:31 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-408382da7f0so21510025e9.0 for ; Sat, 28 Oct 2023 03:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489199; x=1699093999; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6LNGgzff5IUOW67edmSf6WpHil0/J68PsVdXi1+Q8NU=; b=cAhvlHv8/XGGz5FAR1Wy+U57JoGYYtFB00dBvgdbNY1WV3E+gLJmDBho08JW2Gbo3M JP6CrwBzMTp53ZEYNZAC3JPB5Lfsl/YXGeWntumMHVvq0DJq5imyk6ADctCpsn0UGyPJ GE+AewbVxrRo/Bkjypud80JD1DQst+s7HG1cWOE6wQu78rnhP0uRY7dT7tAYKo5gxKIS B6NeISMIaFE++iDNErGaDn4FZ50nKRya+OXWjF+fj7iYffJWYaj+JSomSoEWVKbzVaxG EM8gqD8QRF6SNFXj83EUVNae00rdCnxO5J9tjAVDXxEq7DQaldiUQesGW7hgTQ2j4BzY gTMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489199; x=1699093999; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6LNGgzff5IUOW67edmSf6WpHil0/J68PsVdXi1+Q8NU=; b=A8QOtEfuUzEIOYq+ZCR4hIR3ThumFfSVqcgcb791nKLhKqCxhGTpVsqQiQKeXP4bwj KoaBl5MAHeXk9XgDb61MY9fie+REce1MjQe/clrbJ/3atEDeyApfBsEsKSmaPYFGtjHn HTRjhb+MoW/pdRP5juFSNnR8xGGKh4to+v0tkhHsW6gYTEnd0YWO+3TEFN3cVtCrM81z Rpx0RqimG+bA6N8g7EwivMCK84XzOOCHJEVbBfsw/BfGn07Kv/1fr62+wI8fcrFAh0kT SjvV29q+sI3kj8heowucpfSWXxq5gGnRL/Ko7URe0F+dXgia5HE0nti2QgCGio4vxo7l XS5g== X-Gm-Message-State: AOJu0Yz7klUzG0Nwv6aNAd1MB5F4JZpPqavzGJPXMpWbH3rwfiqzwyUp ZAYJGwYgTha8VcXGBJge77dWxQ== X-Received: by 2002:a05:600c:1c23:b0:402:f501:447c with SMTP id j35-20020a05600c1c2300b00402f501447cmr4295481wms.0.1698489199592; Sat, 28 Oct 2023 03:33:19 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id iv8-20020a05600c548800b003fefaf299b6sm3769631wmb.38.2023.10.28.03.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 799495F7A4; Sat, 28 Oct 2023 11:33:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth , Matheus Tavares Bernardino Subject: [PATCH 15/17] semihosting: fix memleak at semihosting_arg_fallback Date: Sat, 28 Oct 2023 11:33:09 +0100 Message-Id: <20231028103311.347104-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Matheus Tavares Bernardino We duplicate "cmd" as strtok may modify its argument, but we forgot to free it later. Furthermore, add_semihosting_arg doesn't take responsibility for this memory either (it strdup's the argument). Signed-off-by: Matheus Tavares Bernardino Reviewed-by: Philippe Mathieu-Daudé Message-Id: <03d81c56bfc3d08224e4106efca5949d8894cfa5.1697801632.git.quic_mathbern@quicinc.com> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- semihosting/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/semihosting/config.c b/semihosting/config.c index 249a377ae8..56283b5c3c 100644 --- a/semihosting/config.c +++ b/semihosting/config.c @@ -113,12 +113,13 @@ static int add_semihosting_arg(void *opaque, void semihosting_arg_fallback(const char *file, const char *cmd) { char *cmd_token; + g_autofree char *cmd_dup = g_strdup(cmd); /* argv[0] */ add_semihosting_arg(&semihosting, "arg", file, NULL); /* split -append and initialize argv[1..n] */ - cmd_token = strtok(g_strdup(cmd), " "); + cmd_token = strtok(cmd_dup, " "); while (cmd_token) { add_semihosting_arg(&semihosting, "arg", cmd_token, NULL); cmd_token = strtok(NULL, " "); From patchwork Sat Oct 28 10:33:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 738943 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp303066wrt; Sat, 28 Oct 2023 03:41:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH6Ue0F0MzMy4FaqK0cGSQ16ADsdaZliVIJ+/SGPsgjy3mwViQvrlhdx/GezKtiJHrYJql+ X-Received: by 2002:ac8:4e4b:0:b0:403:ac95:c6a9 with SMTP id e11-20020ac84e4b000000b00403ac95c6a9mr6300912qtw.30.1698489702331; Sat, 28 Oct 2023 03:41:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489702; cv=none; d=google.com; s=arc-20160816; b=tu474GIevPPYUQ3EV+UH+EieIzPCt54TfcZwC1YPKDZa8ud7R2VFe765WsTYsHkZ5F VUaX4ri7zaemePB+kjfuLSmIohz5VGlTX8avz4wRLwk2ORGDrCQZuDo0ZQWa/szUcixc RxAzUv/Qo2UrGGKGJYfE3sBoKrdtnJ5J6izKPTOQ+13k1yW1WmS4VMw0FL4Ks34TA+97 rpqJl+GXsNzx4imhsR7Lx9/WVcuq5MmD43HMP0285phqhiPg/jyu7L/zDZP/KY5llwLS RsLXqOvZEYRrEVBtR+AUB7zZ7H1kGZCnlG17MMF+6GrFEcEue0efU5pNVoyE9XJdAzt8 cKUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=QTP++EEXZ2TTOVv8m/MeR1w9h8DFHpGwGpQkFcD2Z0c=; fh=nJM5jO7eiVNcYdEhmlCXCeK22LQiGBuZV7XYo+7hMdc=; b=azD0jq8GeF8fjPkjKYHpNQooNvuCAfc0an3CzEF0kIxatP32ZkUviRi67tPkiZxvyA UMC+xQHcN/hG5a0VeBwA8BSZjfk0Whe3sRk4Dp99VvCdujkUYp1Ct21wT4ZGSxxE8FV6 DZv9eLiC9YmhDnR7sz3WF+WeM0UF1wsUtQNvf4fm44CLs40wrbhKlpZ4+aYm8tiv2nGq eY2rvtKKKvbZoKx3NZngYpvqpUK82LyPI8q+xVer66kpyKk9ezOcT7KIajYVyFkBE7bD 8QzVUDk6TjLP8zIJj7/Tp6DXvNsZQjrFDokL1AcAlET/XZcmDlMyT4K+whH2Bzfv7ri5 pGqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GLW66tTU; 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=pass (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 c15-20020ac87d8f000000b0041cc53aac28si2035799qtd.640.2023.10.28.03.41.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:41:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GLW66tTU; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgko-0003nY-Qx; Sat, 28 Oct 2023 06:41:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgkj-0003eS-JL for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:41:13 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgkg-00057l-MH for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:41:13 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3296b3f03e5so1965167f8f.2 for ; Sat, 28 Oct 2023 03:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489668; x=1699094468; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QTP++EEXZ2TTOVv8m/MeR1w9h8DFHpGwGpQkFcD2Z0c=; b=GLW66tTUEx5zbMwHOySttm1Df2eF/6ecukP56NqYWS6nw3V4j2r+w1ru7erk6SqV8/ YCC+BnTvipDKSPhMQHfLqyrGcSTtMtsAC63NWMya832gMavVsMok6oj22NdWAX/kASP/ zl9w1YGpMv4x5uurFOzxG8HIvMdaJaIiv1MQjT/3dUZg6xm0XlOc8VzBkRWpTMCsZRH2 Lp7CWt+/3PHw0MJavwdDsRHzhYFSo1tngrvrq4gGZjmcnbga+IlGVZ5+RdAyrDK5sBBR U63qPhe3Do+0Bdviuygr1XmUmZGHUBRGnX5Lo9Z0rsyXG7nzuz4FtD85vp+G7ziXjKpi BwOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489668; x=1699094468; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QTP++EEXZ2TTOVv8m/MeR1w9h8DFHpGwGpQkFcD2Z0c=; b=vCcg5Ewr2s+JrA0G1RV4vkS5UkpC5BgdOtet9cAIyaTTGx3wSvyiC2NoxTcwEOS84S ylXbdUOTcJw39ZhEhmGYaHx4Zl8aWNfTMJeOaAmcylsB05oYXaTR0JxWR7EeCwtlSxNj /VofankYIXuWKEjZGu0duZVQ2YW2m7jv/0sB9dtCzBTy4NYAj3BT7EoJfEFmSluyICHz ShCP5IrJa20Y2StnzAYzKsjFGzXYTGnP6efzNTYyYXmGZJ8gFXnY/i52BoxSlWm7TyWP z67yNyujB7nCtlX5Iy1rgDy3OzWsEKlkoaabO6vvjvhnTXoFkuijmMP5WKzojejTruif w4eg== X-Gm-Message-State: AOJu0Yxq/aqfWlwcnMryjgBPAWVqQ5OXAa6rEmgFULC5+KtP9VScA5JM 07/uWzEfsjANwQuXadk/mRgr0w== X-Received: by 2002:a05:6000:178f:b0:32f:7f43:1cf4 with SMTP id e15-20020a056000178f00b0032f7f431cf4mr240231wrg.60.1698489668592; Sat, 28 Oct 2023 03:41:08 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p14-20020a5d68ce000000b003253523d767sm3576841wrw.109.2023.10.28.03.41.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:41:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 90B645F7A5; Sat, 28 Oct 2023 11:33:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth , Akihiko Odaki Subject: [PATCH 16/17] plugins: Remove an extra parameter Date: Sat, 28 Oct 2023 11:33:10 +0100 Message-Id: <20231028103311.347104-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Akihiko Odaki copy_call() has an unused parameter so remove it. Signed-off-by: Akihiko Odaki Message-Id: <20231019101030.128431-7-akihiko.odaki@daynix.com> Reviewed-by: Richard Henderson --- accel/tcg/plugin-gen.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 39b3c9351f..78b331b251 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -327,8 +327,7 @@ static TCGOp *copy_st_ptr(TCGOp **begin_op, TCGOp *op) return op; } -static TCGOp *copy_call(TCGOp **begin_op, TCGOp *op, void *empty_func, - void *func, int *cb_idx) +static TCGOp *copy_call(TCGOp **begin_op, TCGOp *op, void *func, int *cb_idx) { TCGOp *old_op; int func_idx; @@ -372,8 +371,7 @@ static TCGOp *append_udata_cb(const struct qemu_plugin_dyn_cb *cb, } /* call */ - op = copy_call(&begin_op, op, HELPER(plugin_vcpu_udata_cb), - cb->f.vcpu_udata, cb_idx); + op = copy_call(&begin_op, op, cb->f.vcpu_udata, cb_idx); return op; } @@ -420,8 +418,7 @@ static TCGOp *append_mem_cb(const struct qemu_plugin_dyn_cb *cb, if (type == PLUGIN_GEN_CB_MEM) { /* call */ - op = copy_call(&begin_op, op, HELPER(plugin_vcpu_mem_cb), - cb->f.vcpu_udata, cb_idx); + op = copy_call(&begin_op, op, cb->f.vcpu_udata, cb_idx); } return op; From patchwork Sat Oct 28 10:33:11 2023 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: 738944 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp303140wrt; Sat, 28 Oct 2023 03:41:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFbY0mbept50Heq82DW/BnrijA7HLVYdfxce2tghSvTRfqQ7GIKCDtfcsoUg1MrYC4aOdGW X-Received: by 2002:a0c:f84a:0:b0:66c:edf4:b955 with SMTP id g10-20020a0cf84a000000b0066cedf4b955mr9661120qvo.21.1698489718336; Sat, 28 Oct 2023 03:41:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489718; cv=none; d=google.com; s=arc-20160816; b=Zox3cDjdhgWngK61vLbEyJ8Kp4UuZCshyHjZOFasizPQEPZxtA4kzRL2tQ4BKggUWV Qrv3ioM3MwvCje0t/TltELkEemrFSyM/GdHl/1mSo/+g3mSjXem1hW0wBKwWR+AW6/gd +OpUOoBtBXicEsmbD0lZhEC2QyUP4++GRDu6GP52pEDy6Nml2+9y+rjPqCtMpC6nk9F+ v4D1JWjAcqZrRwERpt3BameWARzl0D5kZ7XgJxhidPFSk/ZB+yFr0xj13ryElAi1FDes +3NnXxMhtqhOreGToJpTkYGZMkoxv0V+uiCLmtXXhzBFmuD8/F45Qi/2YRH6n+27+mBs w3WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=7CFsfj+V7ArZMzvtMSrBkmxzQkTGIb36bEletW4AhPo=; fh=FJagK4fJYJ2LOQpwzZAfLijKXfXJqFMUFboG/MsHamE=; b=RIdOvpavlm/B89LR8lureS3W5k1RhBNVbqWj+bV7LmhqXKJEwX3a/3diFj5UT1jLcS 9K+p6aZSUmBBDbmHiy6NfrPCshERVfM5sQ0BLSjm/szqmzKIqlTJwI/1U+BVCc5Nt+Xx jOkzYQdKDVafu92xnLVXcXWjoY4aFl49ZupL3XKvrUdShPZvEcLJSWY6DXogbgWU6H/H tYKl6Z63K5sXnRBfU1lZm/XXUdeRVCA13hyWRzFlr6dlQsDfRdtDs1OPSu+sK/haABrR JN+hMOEwNDC230JzzZPyZtELwI+5CS09CuXmYYN9pLZDVSET5vbC0siUZOtWYMvyNsi7 u3gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VALZNGws; 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=pass (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 or28-20020a056214469c00b0066cfe943369si2263685qvb.358.2023.10.28.03.41.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:41:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VALZNGws; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgkk-0003eX-C0; Sat, 28 Oct 2023 06:41:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgki-0003cB-8v for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:41:12 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgkg-00057p-MO for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:41:11 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-408382da7f0so21539655e9.0 for ; Sat, 28 Oct 2023 03:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489669; x=1699094469; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7CFsfj+V7ArZMzvtMSrBkmxzQkTGIb36bEletW4AhPo=; b=VALZNGwsqUvf9PLGZ+SQAblV4T/mnAd6d4Kk0Jr3eT2uv8ZUls9qjl1sIw6UWOck8U Bw1o/BlDrXtC+tlLg4kcLP5hq2AHaeBNVjvx+xV75vCxbaoc3/2uPkw7q6NVRplca72q d8R1wwqBKZgCLFmOd61vr9pkkGKyZvxIk1Itmk9o+u5OYcOFcwHLNt+PDRmri8rzW7n5 9YbucKN8VCSXsv49LtFPG7q9YQ453mW0GJGnoAckdTqpCsbwTL8dx6dYSXXPMTr9Ue9S zzWEOo0NjY1mkRzEZS8oPQb7TZbU4sD5dTU75u8VOgW50EtP3P2zlj8bMEi1uxr9fEIK MUVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489669; x=1699094469; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7CFsfj+V7ArZMzvtMSrBkmxzQkTGIb36bEletW4AhPo=; b=H1VyEaTUvOr+cRhHIukX08ReLX+uCh17gbo8T7JneV3wUP9cLVRnET0eJ22BwyQPdP Bgth6aGy+9vNeCTeKj/MBsvfp3C1Uxrcp22zABpULEM/39DvLujMpCx9IE4pgIarSJ+d lxqEDwI2rskRE5291u5Be16Fyo+jcGmM0Hqg0bZwIkDCul276HtzhL1UmSRoRqLqFxRp GKBJLunNkgDYTqDf3bfLDS/crysdJRI/ceZIFZ3l4ddH0juEiklZ9NLPfh4Fm8EAFes/ HBVXWvdAiu0rTAa1HA4InAS8PKc87ih4O4P+ybkaFIkZ7vgan5DKsLFVnGO3gQWbJ9ry VkXg== X-Gm-Message-State: AOJu0YwDk7K77GhpdHDUKHhWQRTGDR2HC3w2MKw6K5oBacus7oAwut2N 3gWQP8qya/gTzGTrU5kivVY6LQ== X-Received: by 2002:a05:600c:d6:b0:3fe:1232:93fa with SMTP id u22-20020a05600c00d600b003fe123293famr4115956wmm.22.1698489668805; Sat, 28 Oct 2023 03:41:08 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j7-20020a05600c1c0700b003fefb94ccc9sm3752213wms.11.2023.10.28.03.41.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:41:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A74A25F839; Sat, 28 Oct 2023 11:33:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth , Cong Liu Subject: [PATCH 17/17] contrib/plugins: Close file descriptor on error return Date: Sat, 28 Oct 2023 11:33:11 +0100 Message-Id: <20231028103311.347104-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Cong Liu This patch closes the file descriptor fd on error return to avoid resource leak. Fixes: ec7ee95db909 ("contrib/plugins: fix coverity warning in lockstep") Signed-off-by: Cong Liu Message-Id: <20231018025225.1640122-1-liucong2@kylinos.cn> Signed-off-by: Alex Bennée --- contrib/plugins/lockstep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c index f0cb8792c6..237543b43a 100644 --- a/contrib/plugins/lockstep.c +++ b/contrib/plugins/lockstep.c @@ -257,6 +257,7 @@ static bool setup_socket(const char *path) sockaddr.sun_family = AF_UNIX; if (g_strlcpy(sockaddr.sun_path, path, pathlen) >= pathlen) { perror("bad path"); + close(fd); return false; } @@ -303,6 +304,7 @@ static bool connect_socket(const char *path) sockaddr.sun_family = AF_UNIX; if (g_strlcpy(sockaddr.sun_path, path, pathlen) >= pathlen) { perror("bad path"); + close(fd); return false; }