From patchwork Tue Oct 31 14:43:43 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: 739566 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1686978wrt; Tue, 31 Oct 2023 07:44:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGyNPf0UNXDdg++li9uDN5Dsv6OJGjZ7pwe2kztj18A26PvC3zEAzgeikLBzW37PMZnyPDh X-Received: by 2002:a05:6870:64a2:b0:1ef:c696:7815 with SMTP id cz34-20020a05687064a200b001efc6967815mr9377681oab.42.1698763499387; Tue, 31 Oct 2023 07:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763499; cv=none; d=google.com; s=arc-20160816; b=uKttDh3++tALGQcyO34aR4h/JtLh4wgBrdfxYAhosxWFLTE98n8AlR+oU5gbgumC94 LILHCcTQ/OQ1Z0YrbRnuuEc+oLy86x3rCMnYXUzExuNlOoZiY8XjAm+knoaglIV4CdRK XE/nHUHcv61VWp05O9DkEi/fOdy0/isUVrj62godHwHDinLnNamTgc9h6JAAIG6n7II/ OByXwvDjtDNj9t05tgIR8IGVrJDGSTe2H3VMqQlTaPDcZ9YSiV+2zUbXuemn+vBd4EjA 9jzYRS+1K907X7ojTwTs4rW45CfiB+0ABoSXDzkvtIhNSbUqgsHZeMVz6YZBaVfIvbAH 2ZZA== 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=K56e2j6HhTbRJYsH8gBjmdIthJBVnnxscxJWS7h1h0Y=; fh=e0bksAXBjS1IqNXgEi+QjIugeoEHoaKIQlBh7LGqPw8=; b=sudmeQCuX1lNhprGQPyK+sbv3gvVGoORXXQXA9ddIzvd+F5ea5lGtpM3c2fvYgYrDn R6+zDcc/9ZKpZeaNbhz043LExdYgLumkTSGVp/AA8f6eZzWj0CApVysFkRBnFg1ebxS5 BccepqFyX4eOc0XwbSjqPaKZLT+HBMtw4yJI9EGtYT+a697LTuSWCVfgX12mHuiGJ7d/ +9pnxpZGp+UIXxZMtBBfMzkwgP26ZMyPx0hWRpOGQ2isZHc+eMHAqI2fHbfKDVP/mHoe LEWhHyxg+K3zjL2sDRUMFN5rs9W+rtiM+uasav12KdJiyslfG1VGMW2XPPWHQj2JpPWZ a3Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QEqeF8zz; 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 w2-20020ac87e82000000b0040fd49cc939si1169394qtj.245.2023.10.31.07.44.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:44:59 -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=QEqeF8zz; 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 1qxpyS-0004mA-2H; Tue, 31 Oct 2023 10:44:08 -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 1qxpyQ-0004lZ-K9 for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:06 -0400 Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyO-00026t-Or for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:06 -0400 Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2c514cbbe7eso80046641fa.1 for ; Tue, 31 Oct 2023 07:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763443; x=1699368243; 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=K56e2j6HhTbRJYsH8gBjmdIthJBVnnxscxJWS7h1h0Y=; b=QEqeF8zzxsmtCOnpd5EOAAmu1eIkE94o9sxfxHhL2O/oY+zqP32eYB3E3Sqi06ZnFB UN9X3ERon+fabNafsid4dpj6QXUEB1BoQRoRS+bIN3JxqiCBV484zCzSMVp/6wpbIvbT YTri93CuunBPfZzs8lBIjpeRkX0uJaZMyYD64CF+pBWhALtKYDPAyBR/qY7PfnfMWhOx EW3OI3aU3CtaNISL/X00hkEpxzl5TD2Fv/LRasge3AHGEy1QAKU1wjWeKVfZ9+IswaZj MQhdpX9WeIElX3btrVqrDKLQJ1N9/u0MxzhpHfHJxMLassFcJpcqOwFnxJhz89P3rMkz pBEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763443; x=1699368243; 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=K56e2j6HhTbRJYsH8gBjmdIthJBVnnxscxJWS7h1h0Y=; b=LeuaUy9+POmJKf21A9r6jEDPUVCTbiCzO0AxCnTRzdOdUhX7XnSSds4NbzqWlx+LvB qeN2j2WV3C6AbHioRBkENPmqBhUHhFKqiXJ2PfSk66n882epkH+lS+rWHZViMmXPllen jNsS3jhFNIdmuxVAJQZ8i/GbUy1t5Sp7V8P6R6hsGhl2Pces1HDKorAg9F7sQ5BPkEQb IGzFQeQ3IHltU385XCa9XQqEZZNwHKLfWrLra5cc3iP+17PdvkWOSGztVA/j0WDAP1H5 uLXa7juXYXadvNnqri5EECFCWoakpQKx/2+mmA0UStwX87RhnvILUR9g422YqK71fjOu 1Log== X-Gm-Message-State: AOJu0YzW1Y9y+i8cS5Ltvd/gDoqWgNhpaeuDRdb+y+H4J1/mmDdsEmxN /XV/t3cyor9HhpMLy3pCEMMlPQ== X-Received: by 2002:a2e:98c8:0:b0:2c5:32a:cfe8 with SMTP id s8-20020a2e98c8000000b002c5032acfe8mr10209224ljj.44.1698763442808; Tue, 31 Oct 2023 07:44:02 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u24-20020a05600c00d800b004068de50c64sm1885295wmm.46.2023.10.31.07.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D865765712; Tue, 31 Oct 2023 14:44:01 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Kyle Evans , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , Brad Smith Subject: [PULL 01/19] tests/vm/openbsd: Use the system dtc package Date: Tue, 31 Oct 2023 14:43:43 +0000 Message-Id: <20231031144401.1238210-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22b; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22b.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Message-Id: <20231029145033.592566-2-alex.bennee@linaro.org> 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 Tue Oct 31 14:43:44 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: 739568 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1687354wrt; Tue, 31 Oct 2023 07:45:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGkMmeYvqARnNbyr0rbXLY7/v8SLnt8uh3c9NU8VwERNiu8X+IWUHasLiwh7fwGX8MJJGxB X-Received: by 2002:a05:6102:43:b0:44e:a18a:2507 with SMTP id k3-20020a056102004300b0044ea18a2507mr8686750vsp.0.1698763537240; Tue, 31 Oct 2023 07:45:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763537; cv=none; d=google.com; s=arc-20160816; b=1KjWAbq8Or+IxT1AsKMfb9I55cPmJrDHjki92QxnZdkkMQYsay5iI5BUfXG6RWe4G3 N6eIqfqb5tJnL3oOA6pqEiwYoNye/GOYChaC+7OHOD0Dn7aQ5cLlwkNsgo7fEXv+TM0s lzrkxJBqnoiY1WiYFjWCjT24PkFpM4qDBXs9IjsigC/ZqyNFzV0KpXC5W1loGh+XHHyT 3WC/Fh652w0J772rPSFnDH8L1Hxu2m8fg4M8o7scTX0sFtQCpwUXE6P5zUNTtsK/04je +fErVh4yUTMb34w2ZRZG8fzhv9zPbIo5QiUY7C+twsudec5++2zXPN580VWXiTpIdMDe aVKA== 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=VBmCb5e2KSRUeOU8FwFvpTBYbtI3zUNWAXQPSJyYVSE=; fh=FYzXcw++6WbBMpOt4qAKNi3fUDxUgdsi690bo+Nhaqg=; b=NvbjRKJn8DREe1dfImNBrB4lvgUem1Eld3kAUr08QUgWvW9c1zqQBI9hm0htSqhGhP 2gMd0vP1cch13qGKuwpY/nzbNTcMx4eijUfFkWObS+Yj8jU+V0Cz3ZNCrJPditEZ0XYw T407Sp8nTYI6xR4c1XLxlDkAYc4FK/SjU02CFoKdqoHj1WR4DpHwmYQ9s5AzlEZZrN1D CkjHGKYMn5uQ6n5hu/PiSqhvJd26L3vNvI/FKa5ypSTZlxSZQMXgMq4hXtBQkHMl3ChZ X/z0GlNJygAVj1oAUGWWDExlr+FRCS+JuQBN1KlTHUxtlcMKBvVG+wY+0sJLY5J7UTR/ 45Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="U/Wy+vZd"; 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 x23-20020a67c097000000b0045819ff7c91si148101vsi.561.2023.10.31.07.45.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:45:37 -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="U/Wy+vZd"; 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 1qxpyS-0004mP-Ds; Tue, 31 Oct 2023 10:44:08 -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 1qxpyR-0004lo-3Q for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:07 -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 1qxpyO-000275-UU for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:06 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-409299277bbso36855155e9.2 for ; Tue, 31 Oct 2023 07:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763443; x=1699368243; 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=VBmCb5e2KSRUeOU8FwFvpTBYbtI3zUNWAXQPSJyYVSE=; b=U/Wy+vZdJqhkkf5FqGlY/lUpYWXBwZCSB6/B9bYBej6o8vCqPDBBFwNQ7PUxv1VCPb cxjYp235BO1bNxllLnvTjovoZJUixHGKcTMc/zKlyc1rdNFPtQ/fnfn8pt11j5VSl9Yf o552BHKwsuIJxW6W0WH6FnJ6zberaIPw3w0o/SxLZoRhhKmbA/UeFtmBSft1zsMyM8uP tR6gDXwSAnQRsSHqICTSpQeIQxSV0ZJBfF11b+9V9hEGvYKsC2h35tq3frwJYd6kYn+D SWmjfNjnq/417tWBHGTT+3C/mtIqLOIIvKghzgxr8LO8kaMeJbD7yZqdq5LTUIKaghob mPgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763443; x=1699368243; 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=VBmCb5e2KSRUeOU8FwFvpTBYbtI3zUNWAXQPSJyYVSE=; b=w31Dmy2gO02kNc50tUaW8rsFUNm4UeU3lvnfb+DN3VipIvghSVLR8L6HIsjlP/Oyoq HjqOtTUeM0/pUNyM9EQeYKtDWDpzD/I9YE2Oj9OlYgqP28NNHcrzALpEhdH3Ac5G0Z8R lqrAyqelWu6cjT0cCwmS01ubUUh4SzDCPJMBKuP48ASXNF0QK8i550SQrPfioquP37xE tsstet3nWoV0y5ObR4NTdWDLCzndj4xPUE4WAYt/aj6MvJgX2h4I2xQHzIVfW5m2w6M6 suyK3cw4w2KFffBq8WQBF5AIa/UdW0Pt7Yjr109p+WxSQEUc3En4Jdnie/qdtXtCAmy0 1jHg== X-Gm-Message-State: AOJu0Ywp2rbOLzp+dOZmkRntKrewzEZNpluXWRvXR9xS2j7OClWo/T2x iCQa6XjWOcOkqT2jBU3lZu5Ahw== X-Received: by 2002:a05:6000:186d:b0:32f:83e4:50e7 with SMTP id d13-20020a056000186d00b0032f83e450e7mr6168650wri.12.1698763443109; Tue, 31 Oct 2023 07:44:03 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id dk6-20020a0560000b4600b0032f7f4089b7sm1673586wrb.43.2023.10.31.07.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0183C65722; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Peter Maydell , "Edgar E. Iglesias" , Brian Cain , Paolo Bonzini , Eduardo Habkost , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 02/19] tests/tcg: Add -fno-stack-protector Date: Tue, 31 Oct 2023 14:43:44 +0000 Message-Id: <20231031144401.1238210-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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] Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-3-alex.bennee@linaro.org> 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 Tue Oct 31 14:43:45 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: 739570 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1687485wrt; Tue, 31 Oct 2023 07:45:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFPA0JPr/b9gPuFsMdWz5PxAqez6AFlDOUpiKcvZlnSW9itqaRuBMjKV8hYkl+MxheGj915 X-Received: by 2002:a1f:b28a:0:b0:49d:e70:6258 with SMTP id b132-20020a1fb28a000000b0049d0e706258mr8562614vkf.3.1698763549539; Tue, 31 Oct 2023 07:45:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763549; cv=none; d=google.com; s=arc-20160816; b=tKgc1IoGdG47bULE7zAO6pg1u63qaMpa8idSJDC/uZ11gXZ3b8EytuHfM2ASFiclSi yop6QKu3p3dMqBvzWW65PZVNtE3SFLtdap9wuJ02Lssl+IvwrlhR/INF4/VmGpKFsic0 +udN7Wq2JhnSSMTs5lT42g9+x/5eoM2W2JtjnTmV9RpS1CK8/JJ80CkCVNL01PjJrlSB n6aW7JhBeGYofxdBygITkIR29hF3T6Zl/mxC0C4QQLXLrhfBHqttdll2+DgRSsYKkbAF kOwsgRdbS84LW8cStnJkjc+yoSkvSFMSyO0saG+XOLp3dfX95nIo9RyG9FEVMINnOkQG NvBg== 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=XDwhAtHS+d6WUGQVUolnjo7slYgF5qy8hsz+yP82M5I=; fh=RNVWmd7TwlX/wyQcdhmnon4JQcsRaZwH7hItUZb0D88=; b=w1UBumj3fJkb6XNMa21eC26q3R1HbVMTW2E9Jwrd4buUoeFkN4slYuNwWKdpsR9GFd jFqgVjdubFT8h0bMKdYeB9GwNxg1ed40uTFDcQB1hPPft5UiEHJlcb6xZ1W9pasXKxBv R1w7Go0ZrZ5li/6e6PR/4Igd+4ziUzzEBVkGMQRAOC4SAgnl6KbyEHtmQ/SUjIh9QEW3 zd0SxHrXVkIlG+SGK3Jqv0ZJNW+UrfZj+RpU18uvTsvgW3ZfAMbx9d6DfxI+vXCtQa+U tHCsTOusWnvKHWcQ+YbsReOTWFGeV607wkIxWpWgq3AcZ8DX6KZnqX4o9SWg1w87fBaj kV3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tpx3QEfZ; 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 d63-20020a1fe642000000b004937576ac6asi152599vkh.298.2023.10.31.07.45.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:45:49 -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=Tpx3QEfZ; 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 1qxpyV-0004oC-VH; Tue, 31 Oct 2023 10:44:11 -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 1qxpyU-0004nc-EH for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:10 -0400 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyR-000299-6S for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:09 -0400 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-507a55302e0so8157794e87.0 for ; Tue, 31 Oct 2023 07:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763445; x=1699368245; 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=XDwhAtHS+d6WUGQVUolnjo7slYgF5qy8hsz+yP82M5I=; b=Tpx3QEfZW7ZkiQhMorV4ACcpTmjXs05m/Be2IUktZVerW/vl1KhTv1kGOGspJFgbWh R/oRe+3fDiDSHGXzOaLaNnpOeuvlAIcS/GZUwtzgypBJPCzNI/PhTLdRg0Ts00LVJItl x92FqJSoLma97jEbSvP58zxkCnEMjb5VW9fWecx/xAGEF2AZVIGwUd5zx2ZHIrmuCT2p hajqh6Qvg7A6SC2YoFMUUVwqwIq2Z0qeexM9sXxb3kIlJ+hZa58OGJqhXjLWqtl2GAro Dw+TivcrtSmOMGDc+9cxMdm1ew7z7gvyihjKnIuwiP8s2HtCyW42ozitW5hgp+giV7pi K5cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763445; x=1699368245; 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=XDwhAtHS+d6WUGQVUolnjo7slYgF5qy8hsz+yP82M5I=; b=GJy3hpXNaOk/qlC5DXypIZd4XuG6/4LgKmQte296Bo8AKplZixbZ1Vj3lvt2R16Jgd 2HgJtHNui4RAygYl/pBLQ6vnsF9kkdntIuElM/+ik1p9lHzItU1caaDZbZaq1p3E4xqT IduA8/2iDBH+SUg1LiwKaSqAENd64gPZqEzluKmYtN4DFoFp7kFWRIHNcKnw7sr/bNoo /UTHbtMbzZs5CsEVpDGN8fui8yRKK6XThgEDezvCmsUtBi4bOAjKaM5xScufRr5vo6xH OaGtz87Dd2T80XWACxD+DaiHDmZ1fEoDPVA3s9+Ou3woXt92Gu3MqKqaXmKXIQmNlQLT sMEg== X-Gm-Message-State: AOJu0YwE7D0JXgcxgwICYyl2r3RgewjbQN2s4SKj0zTsukpdda7icT04 wv7SldmJUQnbOEqASrYzP/SWbw== X-Received: by 2002:ac2:4d17:0:b0:509:fc0:9267 with SMTP id r23-20020ac24d17000000b005090fc09267mr6230097lfi.15.1698763445599; Tue, 31 Oct 2023 07:44:05 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t4-20020adff604000000b0032db4e660d9sm1670110wrp.56.2023.10.31.07.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1938B65723; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 03/19] gitlab: split alpha testing into a legacy container Date: Tue, 31 Oct 2023 14:43:45 +0000 Message-Id: <20231031144401.1238210-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x134.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, T_SCC_BODY_TEXT_LINE=-0.01 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 fixed. 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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-4-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 25af1bc41e..bb24e052f6 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: @@ -265,6 +266,18 @@ build-user-static: 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-legacy: + extends: .native_build_job_template + needs: + job: amd64-debian-legacy-cross-container + variables: + IMAGE: debian-legacy-test-cross + TARGETS: alpha-linux-user alpha-softmmu + CONFIGURE_ARGS: --disable-tools MAKE_CHECK_ARGS: check-tcg build-user-hexagon: @@ -285,7 +298,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: xtensa-softmmu arm-softmmu aarch64-softmmu MAKE_CHECK_ARGS: check-tcg # We build tricore in a very minimal tricore only container @@ -318,7 +331,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 +518,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 Tue Oct 31 14:43:46 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: 739569 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1687422wrt; Tue, 31 Oct 2023 07:45:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG7rWHGHvWgvECWnV4zOQGAhZtNVR7do2oCLCvtUAoCECzEKvKlRlvfPaWW23+P0m2j+xls X-Received: by 2002:a05:6358:5e16:b0:169:7e97:6fd with SMTP id q22-20020a0563585e1600b001697e9706fdmr3911301rwn.5.1698763544532; Tue, 31 Oct 2023 07:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763544; cv=none; d=google.com; s=arc-20160816; b=BzxAefbVwJMhraQF79nPStenkXOKg/U6kC/G/ENYo8kIWruV6A2mzWzwa4lx4jdQiI zZrdMjm/lydyAWsdb2rdghJSppt9LGeZKl4cOpgQ8VYv0UDUTLPipfBoeTu3mb6NEEpa 5gjjM9TiWJB8Eaadv0vEWuoyyQ9O5fmK5xHwDevd1dgZ6b7bg2ZCmkk83/nhzxe3HCLG 9Rf4TNMq1xN4VMmEN6F9aZUiGPivuqO2YUF7d7PXAp+d5hKRNTnZiIPuhjhas1IG3npT TWKzp0tozIUXZ56yl6FHEV4MQHXaTwVyRgacCSSrE6Aw1c0So8PqdftW0VjcxAItvGvw MI/w== 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=ImR5F0hSRNXtIQCqeTGtlhuroRWrhdD1r/ZlguXGn6k=; fh=RNVWmd7TwlX/wyQcdhmnon4JQcsRaZwH7hItUZb0D88=; b=XxsnnABbpGuUiRoCFZazHn6KRTXRfARVhY/sTqGlOT9sEnJkZrL3mFjzgfBeKBkbiB /CYBLbWpbuLMjl9rHBDHZLRwUQuVwxoaC2hnMLrKg5LfAFh5QzCFP88+PySn0R3CakW/ iYvtYMf6ULHy9/bKMuL0XTpofqN5WHDBTUF94fOuH0B6KZqxntJ1a6Zk9rg1GF+71dP2 KYX3qG+RuD6DX4zWEdYSEjeZ1lt+PWzdy4U6SkWWtaTko2nuUMIA+caHj+wqMLAcwde8 mtpJyApo2L1ih94JK7JZSqNZKNKuf2/Er6//G9Gy3ZdFUBn/0BL0GUBiqe+978HrwSm5 Bqyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=doLZq1OL; 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 mh21-20020a056214565500b0065637c67204si1164376qvb.334.2023.10.31.07.45.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:45:44 -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=doLZq1OL; 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 1qxpyV-0004nq-24; Tue, 31 Oct 2023 10:44:11 -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 1qxpyU-0004nV-5P for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:10 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyR-00029C-F5 for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:09 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4083cd3917eso45083485e9.3 for ; Tue, 31 Oct 2023 07:44:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763446; x=1699368246; 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=ImR5F0hSRNXtIQCqeTGtlhuroRWrhdD1r/ZlguXGn6k=; b=doLZq1OLUnbo6rGs6xL0cs5G0bsLnV9tqkZcUXykXk2onpRtKhPfQOOyVgeEkx+nhv nX62JIYWVmkonLYb+AMpLoPMoQnAAhk2Q8bSbM9PmSt0wUF4bE0GPSn0EEEykAMyGtDQ Seb+r5V+OGCCKSIsdMjT2c9szxiW9y2l00FKCCEpe/walVFzZkxCP3Wviee4NK3If70B DHZ+FZHljs2FDZQSvTPK/sjwVeb22BEPA1/dpru1JHMlEflR9gU0jx40D8QpRHE/TgmI QOgq260kALPA6UKSj8ALawo7Cf6ywmlw/Rvpn7bQIpj7eoia9U/FeT9wUPF0ELEBHuTg hIqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763446; x=1699368246; 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=ImR5F0hSRNXtIQCqeTGtlhuroRWrhdD1r/ZlguXGn6k=; b=PAdO128EUwLwKDqjqTLmZgqijmAYxUXGmIFqw10cqhwtjf2bWnU4rByGVKoZkGiTVu h6lDjPCFPwSksEubgKKX+LjfDgbled52u911YGCBr2fgRVHxC0sEI+lS2rEVgIsrSYXN 91HlNU4EeuXIeS3xGXDJHCUI2Tt4Ro8bjdiUcUMtTJaPvRiURhEOrvQFpSfbyBN+91Bf YO2wx7sx67uSmSvtecXqdBQvg5ZKZKMYtkhisVtSac4PKkUxLuV2Zr+qTwBhQ/A1kbrM 5kK5S2FHy9UqdQCuSDJqcSJl2V05X4ugqiixLS1+geOjtOlqrsKjJQQVarua7CnlUVKu 2g5Q== X-Gm-Message-State: AOJu0YwWy4GfMScUIyQd8DAKY3AGwHIdL0HVPVIXYotNoW+VoibqGDrJ 1EC/M0xqkc4qIse1wz5oMdrV4Q== X-Received: by 2002:a5d:6d0d:0:b0:32f:7d5a:87ab with SMTP id e13-20020a5d6d0d000000b0032f7d5a87abmr9094101wrq.53.1698763445827; Tue, 31 Oct 2023 07:44:05 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id c3-20020a5d4cc3000000b0032d886039easm1664306wrt.14.2023.10.31.07.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2CE5B65724; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 04/19] gitlab: clean-up build-soft-softmmu job Date: Tue, 31 Oct 2023 14:43:46 +0000 Message-Id: <20231031144401.1238210-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Having dropped alpha we also now drop xtensa as we don't have the compiler in this image. It's not all doom and gloom though as a number of other targets have gained softmmu TCG tests so we can add them. We will take care of the other targets with their own containers in future commits. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-5-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index bb24e052f6..5e9cbf9385 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -290,7 +290,9 @@ build-user-hexagon: CONFIGURE_ARGS: --disable-tools --disable-docs --enable-debug-tcg MAKE_CHECK_ARGS: check-tcg -# Only build the softmmu targets we have check-tcg tests for +# Build the softmmu targets we have check-tcg tests and compilers in +# our omnibus all-test-cross container. Those targets that haven't got +# Debian cross compiler support need to use special containers. build-some-softmmu: extends: .native_build_job_template needs: @@ -298,7 +300,9 @@ build-some-softmmu: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --enable-debug - TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu + TARGETS: arm-softmmu aarch64-softmmu i386-softmmu riscv64-softmmu + s390x-softmmu x86_64-softmmu + MAKE_CHECK_ARGS: check-tcg MAKE_CHECK_ARGS: check-tcg # We build tricore in a very minimal tricore only container From patchwork Tue Oct 31 14:43:47 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: 739571 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1687578wrt; Tue, 31 Oct 2023 07:46:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IETmaUdWyM9wth4xYPGe/yTh+C9vo/m39eEsHgW5Nxy/GqeftwtyiRHLQHa2hprFM/wqC7B X-Received: by 2002:a05:6102:108a:b0:458:6173:8d4 with SMTP id s10-20020a056102108a00b00458617308d4mr8414113vsr.20.1698763562102; Tue, 31 Oct 2023 07:46:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763562; cv=none; d=google.com; s=arc-20160816; b=SZwP8qO4eNk/FZr5Mkv51tD53Y9wVEFbOaeCFJqyAiMZ3lPsDWiVpl0VriEH0lhqMP jC+OHq4kFp2nshdD7RNxcFFYvCptEalMhaIhQMm4zHimCgsFqgOMqlNF7LLjzUxzG39h bUl/Agovgd4SPCIY9BApHeV6BMHTURr6xVgfYjlDiBhZngsFvhRlwVWOYOmyqMYTrnZ2 ZJPryb4ON73E6IyD2RoWrDpk+Kx/eKWnFBngsROHbnSTuESsTS4O1KO916QBQll0Y/fM ZaJTkguwFBD/eNGdVWc3ezzvNZZiK71mQyC/wfBjkTNQ9E/G0Q2vanEaXhHLhZDnzHKP nJgA== 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=UP+el9zXc/Zi57Qh90eA4w6Sr5YdMSWfNVrtYXcuHAY=; fh=RNVWmd7TwlX/wyQcdhmnon4JQcsRaZwH7hItUZb0D88=; b=JzW/ZecvIqIUBaEV/jx5mLvdi4h9QG1V2ghH78nbzCjHEbM13AkEVNLHMWUvp4hAb4 ZiQ7pp4jIqvsAhI4XNXDRBoP7PjJ9qWj7x5UKlCXEQkDNKGhdGEJplocRyXtgi+IK51q BQToTnJD74OBPY7pup8Tfr1TK9i7nsAm6wn6D7m2Ko1Wr4iHX9KiSiqYpQVDe0jNMI11 tvb1DxrF1udDJwkeYT3zSJzhSbX+zE7J/RVfeOfxXO+LDVI0KIx8MJrVuW3rC5G1GneD Kt1P+2eHx5Jvq1X5uNRzVIvGs3EQiJLm+agMACej3ee5LUULoqJaR91Z0zKcgiFv6IDi 0tcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FjI0SGCl; 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 t30-20020a05610210de00b004475488d4a7si149995vsr.481.2023.10.31.07.46.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:46: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=FjI0SGCl; 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 1qxpyX-0004oo-Lr; Tue, 31 Oct 2023 10:44:13 -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 1qxpyW-0004oI-8A for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:12 -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 1qxpyT-00029t-Ae for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:11 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40859c46447so37953825e9.1 for ; Tue, 31 Oct 2023 07:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763448; x=1699368248; 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=UP+el9zXc/Zi57Qh90eA4w6Sr5YdMSWfNVrtYXcuHAY=; b=FjI0SGClXsOb1d5TeCO9Ut9dorBVqQOsp4xdafhJb66m6WbSREZXg5zzCMOylqkvCI WEBL0ii1/Pr0iuwZW5UYtzZxtTtS5f00S/gBzTsSl5Mngk0S5nBhdSWtOQvM3aTUUoOA TwRC/+Ih7q16S9aPCPRiKVIADI+740Q5DKvfx4fT5w9RXvAZbQY0rzAjeuh/oFkKXylG XTMLRdgi9VHX8JM/C0lHu9vokoCsoKiMEldjBAU0A0t1ufCqX4VraRVYfhvcet+rYJsn E44SzRQgdm6xsa6lQ97pt8OnyMdL4ECvRcqs/kAjzarGp+jRNCTUexo/RRZyOjrU4asv T2+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763448; x=1699368248; 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=UP+el9zXc/Zi57Qh90eA4w6Sr5YdMSWfNVrtYXcuHAY=; b=j+c1QQCyC9eM2YcAzH3wg0c1UH/OZHUG9Qid91B80T6P47GvUKiiuVXTG9NlUEqbl5 7FYOlainECH/NueQnq3j13j3TPNVx3bB1V9ALKN9xAhjiSiXPQU8pC2Jj4rea17wHn3v LlzjSSV40mZ5JeaPpWBX/RD8CekqZQP2Q9fTD6eMsDk0mJkk/6BG+BbDsZ+jEDqemrnO qSLROgs7rzZFGwD5wq+2AL4hBFHsohXoRIUW1j4RaJ7PiEwA3FkR47Tr2ihZxbmziHRC pWGn6g8MQ3ZdhE8niI67ofl66bK/MQTrctnQNQOseqYR7yFn/YWlNw4GHhNC9prg21un Hp5Q== X-Gm-Message-State: AOJu0YxbLm/pQePCoBBM3rIOhUwNy2anLL4dJvxIIZ9XAqoCyB59t7NH mib2wC1tuaRbppYnvJuNXLjMTNbBf4Uzlehyz+Q= X-Received: by 2002:a05:600c:4e89:b0:406:545a:f8fe with SMTP id f9-20020a05600c4e8900b00406545af8femr11441935wmq.29.1698763447933; Tue, 31 Oct 2023 07:44:07 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a18-20020a5d5092000000b0032db8f7f378sm1662959wrt.71.2023.10.31.07.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 42EC065725; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 05/19] gitlab: add build-loongarch to matrix Date: Tue, 31 Oct 2023 14:43:47 +0000 Message-Id: <20231031144401.1238210-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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 We have the compiler and with a few updates a container that can build QEMU so we should at least run the check-tcg smoke tests. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-6-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 5e9cbf9385..9500ea6e2c 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -303,6 +303,15 @@ build-some-softmmu: TARGETS: arm-softmmu aarch64-softmmu i386-softmmu riscv64-softmmu s390x-softmmu x86_64-softmmu MAKE_CHECK_ARGS: check-tcg + +build-loongarch64: + extends: .native_build_job_template + needs: + job: loongarch-debian-cross-container + variables: + IMAGE: debian-loongarch-cross + CONFIGURE_ARGS: --disable-tools --enable-debug + TARGETS: loongarch64-linux-user loongarch64-softmmu MAKE_CHECK_ARGS: check-tcg # We build tricore in a very minimal tricore only container diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 80c540230a..d200f3e00d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -52,6 +52,12 @@ hppa-debian-cross-container: variables: NAME: debian-hppa-cross +loongarch-debian-cross-container: + extends: .container_job_template + stage: containers + variables: + NAME: debian-loongarch-cross + m68k-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ab68b2dbad..5635d1537f 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-alpha-cross 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 DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-mips-cross diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker index b4bf265717..b25e779a2c 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -9,22 +9,42 @@ 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 + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ build-essential \ + bison \ ca-certificates \ + ccache \ + clang \ + flex \ curl \ gettext \ git \ - python3-minimal + ninja-build \ + python3-pip \ + python3-setuptools \ + python3-venv \ + python3-wheel + +RUN /usr/bin/pip3 install tomli RUN curl -#SL https://github.com/loongson/build-tools/releases/download/2023.08.08/CLFS-loongarch64-8.1-x86_64-cross-tools-gcc-glibc.tar.xz \ | tar -xJC /opt ENV PATH $PATH:/opt/cross-tools/bin ENV LD_LIBRARY_PATH /opt/cross-tools/lib:/opt/cross-tools/loongarch64-unknown-linux-gnu/lib:$LD_LIBRARY_PATH + +ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools +ENV DEF_TARGET_LIST loongarch64-linux-user,loongarch-softmmu + # As a final step configure the user (if env is defined) ARG USER ARG UID From patchwork Tue Oct 31 14:43:48 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: 739565 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1686974wrt; Tue, 31 Oct 2023 07:44:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8AeJGm2frAiWXxoQ/83j/QK1ow0Z0VtCTNOytJxQfjT9WBKP7PC1cD8hyv7HesXe65sod X-Received: by 2002:a05:6830:4105:b0:6c4:c6f5:3409 with SMTP id w5-20020a056830410500b006c4c6f53409mr13721245ott.2.1698763499368; Tue, 31 Oct 2023 07:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763499; cv=none; d=google.com; s=arc-20160816; b=o3spTYPqGKdV0SOlM4S+IGImztizmeVriDRYg8nS4DXUvWOXl/ahb5g5Z/FPsIKccX jFSxSrBHeZevMrdqtmePZrMvMkdUdFpUp+6t8+0NFdyLlGwEsRgV3VfXDS5bsyxl3ltq N6v42kflHWjM3AcJOKJuPUk6d62zR7EVzjMaRcArygLk1eXDXRyXqUyD/SIhl8pHJHyc FKs3MCdykmH69juAajVXbicveMpzpzd/psYVZMgZLJFLag+1ifrJSUlVLP0G7+oW6xs7 mkTDFea5sn0vE7b6m8aBaxhaBbah1vWim7cRoj6se0Giam/f9FVg78W8dVmb3mV8mzHr Y+4Q== 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=DQGp6YloSStGiLyvzpzmbyXDw10os3RcjMFIgCFvBmg=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=vcArt67R8pTARTOzjkkhPp5Y+wUdSZSesold7xBCjNB8PoeupO6yaq91EeviVVe492 jvbpHXXRm7wxbGJm5qd1Q7QZJNGER+q2iqcVhCnaBr17JQxDAUjC77ihVKhbOwIqyEYt j7c5df4LwP6tD/hnMtBn4T8bFkQfZXb7KJXTI7r97UIVXKwc7HKsHkLDAMdwhYdZ0H8k 14PZOR4Fpm7/0bKAyVAjPxfeSeGwlM2u2RMQcOJQwcvSlUsLyCrQ+sj7TYNImDF3IAaE l/JdXCPkcab/qMSci7GTQ2GFfJ4eSEkZBTA5gEICSHlOmCztMGf38DjFzwPqE7Evlt7U xyYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dkE1fgfQ; 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 m11-20020a05622a054b00b0041814926f4fsi1233721qtx.91.2023.10.31.07.44.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:44:59 -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=dkE1fgfQ; 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 1qxpyY-0004pL-Hu; Tue, 31 Oct 2023 10:44:14 -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 1qxpyW-0004oD-2N for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:12 -0400 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyT-00029j-9m for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:11 -0400 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-507a3b8b113so8292975e87.0 for ; Tue, 31 Oct 2023 07:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763447; x=1699368247; 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=DQGp6YloSStGiLyvzpzmbyXDw10os3RcjMFIgCFvBmg=; b=dkE1fgfQsj/cOrDyEyKdM2tiXB9IYP+gjGlgXjuH4Y1lRCcPK/DeWhrbyL5kudSeuU /h51SUfAqjoHbSJRX5qz00f3SZ6gtYbWpV4BImu3y6wcabS22zBG5gESz/nF5AJDYN5a X1VqD95rJJlLBtX0DTtDvbgiguecQ336xzNAswoSo5Goniq54XHnKseYtro5dYDK1b/b KEHSZ+SEXY9rt5LZYXVSLkkmsw6+hVg2IUwXqh2aPGYzkVFP73c7UkrzZeRZWng65PJd 9tgPzETa5JFRA+qFSXYXtP+SCNNSOJs/qO8VkPNx+ulLAiJWg0TpVQ6XTkgMGMVv3jz5 iiTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763447; x=1699368247; 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=DQGp6YloSStGiLyvzpzmbyXDw10os3RcjMFIgCFvBmg=; b=EPdfGzMkznroB4C395Rlm+mbHKhWgZ2Q4vs4rjxPWkh6j193MASxjIBzQq8jEyYzDi O437Zt5Kglsv1+AnYQM2JX3aOfGprJhZLtOqDvBq4OwQ/2CLeAWlTzj0aF2Fqh9p+UV6 DrdcBns9oPXmVBBce5q1Dk4wniyjFoYHn6QtBXyYM+y6+bHSk5j687oKMn/eqpBHhcog S2TaWug5XPWy74jefM7AF629hhMLuQ07lT8E1wrCGZy/J1fbYfE1G5nyf4P7UeSwNs0R mqCg0uf9odsT7BlaUef2ofFEB8SibAGfuN/ZRdh+u2N0D5IsacpjJ/dEsEhSfhdLO4uw q06A== X-Gm-Message-State: AOJu0Yx/APx/k4mP0Msi3T0sSnlarnUhx+pFUxlmbGTN3ETNvQVikney sh/CICkYI/+cv7AXSmJnFGHa0g== X-Received: by 2002:a05:6512:3a96:b0:505:7896:18de with SMTP id q22-20020a0565123a9600b00505789618demr4795714lfu.45.1698763447772; Tue, 31 Oct 2023 07:44:07 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 16-20020a05600c229000b0040596352951sm1929366wmf.5.2023.10.31.07.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5B6F565728; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PULL 06/19] tests/docker: use debian-legacy-test-cross for alpha Date: Tue, 31 Oct 2023 14:43:48 +0000 Message-Id: <20231031144401.1238210-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::129; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x129.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, T_SCC_BODY_TEXT_LINE=-0.01 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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-7-alex.bennee@linaro.org> 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 d200f3e00d..0de1929e74 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 5635d1537f..8270bdff6c 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-m68k-cross debian-mips64-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 Tue Oct 31 14:43:49 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: 739573 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1687816wrt; Tue, 31 Oct 2023 07:46:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFlAZzYWaesEBrMnAb8ldR2ai2Qqrzu8SaNBpexft44t8woLhC/92OQV9lkmocd7PepO9Oa X-Received: by 2002:a05:6358:51dc:b0:166:cc78:ee9b with SMTP id 28-20020a05635851dc00b00166cc78ee9bmr11443771rwl.8.1698763587354; Tue, 31 Oct 2023 07:46:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763587; cv=none; d=google.com; s=arc-20160816; b=vXkOuvEl65sy6ohj0DePshBSyUl/W1mPjDnyXuMh2KfVxJ04s5yqYWpctMumTNg+8i ezWXOXRD5vFbYI4gQEWfTGn8V72P/JwNXT2xJFWFF7DD9n6HbxaRTf3HgxVZdyYAVIfV Pdl2bCZdP5f8n8H0q2v8T611gwCyKfBCv4N2/5INckOeTLpv1s7WXVWzClu+CgsZSVCs NyKMlSBY2hEza2nrGHYzZC8Afvut8hUA60xs7QA4A7QlFK6QToyoaSa4WGGqP7wwNZ6W B9ZMbxAXB0+f/jJlMrqiEAoW/KigpZazvKUc4b/hHGwrTnWQHov63qdNBvakq6w6CdXi SKcw== 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=DlfpiMm1ZkxUpuex2jZCg4Z5MNGK84oyjoBRAsHr7lg=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=XmjXIAS07iCaC2/Ew5Jhl43kg5QXOxpDpViUQEazs6+Li5f/JHefP3ecakE2ZoZOwq qBni1r9cZdRrNYY6dqsXbYERFAW3qLjHzFx3TPl9Eyt1IiO3nHeCFQfA50RrPZcd/Ic2 6dA5FeusrSMbZtOaXxKPoYHN/jZLzEtQezP+UKPHTrX9ePtEuO2E63ynaTG4Y6rbHfc2 VQDwcuEcI4q5UMxHiavle9GLHva4qx8Q2UV2z0mbzJD1Xk1CfpnUSFYBwItfPH4GlKLw f1LHm+x7vR3J5zS6eNRO36WqWM1dCCQLNs4OflKvVyR8WsrXCfDw9On5O1it/H0Z/B2p k85w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ohk1YOsg; 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 i9-20020a0cd849000000b006585ee0fcfesi1176221qvj.74.2023.10.31.07.46.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:46:27 -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=Ohk1YOsg; 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 1qxpyb-0004rJ-4C; Tue, 31 Oct 2023 10:44:17 -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 1qxpyY-0004ot-0q for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:14 -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 1qxpyV-0002AN-Gu for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:13 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4083dbc43cfso37946735e9.3 for ; Tue, 31 Oct 2023 07:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763449; x=1699368249; 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=DlfpiMm1ZkxUpuex2jZCg4Z5MNGK84oyjoBRAsHr7lg=; b=Ohk1YOsgnRS6WdMkhstmHSqyVNkF1aNFjrTf9/3PPra5WGBLuYe3vH4Z1h5TPY4hxF 76pEuVWapRtYsgGx4MXP9cwWtWJJzw3sA4U1OtNogAYjYCtoTOfnmoojRGqybJHnoIwe /Iaqx4jOhRwDnEDxxi42NahkIKCXwaY8+EY5CF+jZK+BECJk76A9Iq9MkWpd07FSSS/k x1xpmpur5U2VBrsHiHnTBL1EbGwS2/Ur4nvR5L92uJX7qEMAhWQFiavCQd2GWZz1Qrj9 GzeRg/eH0i5LiB0jddq0rbOh2kgOQi7VvsRAL/wJI9GipKz7o1+pG9uYjh+n8LmxJ+WX qOwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763449; x=1699368249; 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=DlfpiMm1ZkxUpuex2jZCg4Z5MNGK84oyjoBRAsHr7lg=; b=XLE5X1blVbDb6mcFplue+DncypStPUxrfqniY8bqYUYt1p1FTlbqep4XCEflD2d2r0 z1zmwfDkeAVqRvSjsfFPkWSKXMztO4Bh+tVEWl6Rfw6hOy0Y8V36BAXPSGAeybh3kAyW kztG9SarEeqwK7689lHunf8jtrgbsKUU7CbhYAZaUaQbK+dwhR53W1nKChRfDYY/CL8x TdWFtRGyIQpIyWgUIdn+Zm403933N281g62yeL5nEqVanxqQnEwDJTjMcduY+XIWp2up IQ3b3X9Cqo6+AL2+lqDHOMRNZM9FGgFanRv2clllOgUKhFqvnPrDAVHg9XoLP7X2PPoL 2N/Q== X-Gm-Message-State: AOJu0YxMafMaShWbw4R3vARM1wKUGsS/haHeJjWRSWKWh8/Rk9FEJ9xS pMPDQLi6zmA7aLrxYUseO53euw== X-Received: by 2002:a7b:c049:0:b0:405:95c3:e79d with SMTP id u9-20020a7bc049000000b0040595c3e79dmr10768534wmc.40.1698763448868; Tue, 31 Oct 2023 07:44:08 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z18-20020a5d6412000000b00327cd5e5ac1sm1686267wru.1.2023.10.31.07.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7665865729; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PULL 07/19] tests/docker: move sh4 to use debian-legacy-test-cross Date: Tue, 31 Oct 2023 14:43:49 +0000 Message-Id: <20231031144401.1238210-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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 Reviewed-by: Richard Henderson Message-Id: <20231030135715.800164-1-alex.bennee@linaro.org> 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 9500ea6e2c..da72f7c690 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -256,7 +256,7 @@ build-user: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system - --target-list-exclude=alpha-linux-user + --target-list-exclude=alpha-linux-user,sh4-linux-user MAKE_CHECK_ARGS: check-tcg build-user-static: @@ -266,7 +266,7 @@ build-user-static: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system --static - --target-list-exclude=alpha-linux-user + --target-list-exclude=alpha-linux-user,sh4-linux-user MAKE_CHECK_ARGS: check-tcg # targets stuck on older compilers @@ -276,7 +276,7 @@ build-legacy: job: amd64-debian-legacy-cross-container variables: IMAGE: debian-legacy-test-cross - TARGETS: alpha-linux-user alpha-softmmu + TARGETS: alpha-linux-user alpha-softmmu sh4-linux-user CONFIGURE_ARGS: --disable-tools MAKE_CHECK_ARGS: check-tcg diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 0de1929e74..3e6d741f62 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -116,12 +116,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 8270bdff6c..f61d97102f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -129,7 +129,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..8cc68bc912 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. @@ -30,6 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ ninja-build \ gcc-alpha-linux-gnu \ libc6.1-dev-alpha-cross \ + gcc-sh4-linux-gnu \ + libc6-dev-sh4-cross \ python3-pip \ python3-setuptools \ python3-venv \ @@ -38,7 +41,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 Tue Oct 31 14:43:50 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: 739579 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1688673wrt; Tue, 31 Oct 2023 07:48:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHW2/L/4eWvYVYbeFG/wreuos9rBGNJIZQVKqlRzNy7rBvnkm7rA2aOY4nncgFJQIHGKbqN X-Received: by 2002:a05:620a:29c5:b0:776:fba6:da64 with SMTP id s5-20020a05620a29c500b00776fba6da64mr15329411qkp.22.1698763691287; Tue, 31 Oct 2023 07:48:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763691; cv=none; d=google.com; s=arc-20160816; b=L16+3udbKd7GfFyE+cgulbas/F9PFz5KJ2Z7bPAbLhHaARhcxTExZKmUMTst/BTcLn VInicxpumPnSv7lFRShrvlGujxl4UxlntYVQyMBQxEMfuECB8Itwmxa0Xmkp9HR/eDdv oLtHsHA91aHmBpvp/GzZoOrqqme4By/XWI+KyPKWIxVDA6iO05z+2ScstT7NHPiT39Vy 0uS/CnIuY+X6iMjVzYSbMXJS3UcP6gcr9PB/qDUo2r9K3hNQrAfaeUzJ1clOjX6lx0lI +mVjiA61D8r/mCinGOeeHiffIo9U1zMdfB0qGMr9aanrXkdmbjvirNEKJppYRwmeyLo8 FGQg== 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=iszDwQafh3cXdksSyYOnUK1+K3HqT7eMCMkWVLpPqWo=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=lDqxx/mfRQAdWn3gkN/7XA4SaR9EfpMsvvlxreDekwJ6/3LVuRfEFxd/qzSD6Mrq+I HMWeQAPbVn44QOhnr8TFJN2ZmNCalAYLIp7eQhc+ltowOHWOQVLzMu64SMLFxZOzsez7 3Ix9W8VR7/ARoMZ5kEFv/1zpeE+Fp4L+HB++UsEP+5rA9aKeNS0J/uC88oINI7Hvt+ej 0KFWnGfjTVxA5LRbGoBPlRUTl7riIdZuiWbfwNVGkdJ7nBrBTxsiecRYyDJEQsYR47C2 4dfivpaSmkHH08g+Y6PoBj3iIgwgXv9Cm9IHMhiN0CQQ36U1wdvs8H2IWSn6uGN+UneH yLgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="h4/z//nL"; 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 bp18-20020a05620a459200b0076f1797fa7csi1272924qkb.534.2023.10.31.07.48.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:48:11 -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="h4/z//nL"; 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 1qxpyZ-0004qC-T6; Tue, 31 Oct 2023 10:44: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 1qxpyX-0004oq-RH for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:13 -0400 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyV-0002Aa-La for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:13 -0400 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2c50d1b9f22so74854271fa.0 for ; Tue, 31 Oct 2023 07:44:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763450; x=1699368250; 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=iszDwQafh3cXdksSyYOnUK1+K3HqT7eMCMkWVLpPqWo=; b=h4/z//nLWv6huZqu5Ey14cai6hLgzwjUDcvwp4OsbCfhBAVHfXszHi+L8GErkZv+hh K+5M6zgWXzldgzPm8kPQ2a/Q5psYOrSTo60PsTjPRsR5Bu8Z7zeVuuOD+r601yxxaYy7 alCqAn67U0lzYIsiAz+FHX18BLO9PS6dgqiopNMUyIW2359DACA7sHVTkhP3NpBYijeF 0GwCrCgjatRkbiT+pfrRD8cSuhz0u8ARGk6Qg9uCYOnqXHpkDSBYa0JHrtIiv+16mIUt 9+lR0Lv1gGg9AwqW38AHl01TfG2M8WNYaikeuki3s3XHX818Na883cuceZG9iwSNjdSf 4LQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763450; x=1699368250; 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=iszDwQafh3cXdksSyYOnUK1+K3HqT7eMCMkWVLpPqWo=; b=w/X85aFSiEJCAUMxnF+1jhGWYNjoxtb1fdNiXq9O/fAV3lrmm5sGBeWeI560qSCZrD V3mHrRuCFWiwDq9yKCj67sC/lzmhpR6Ky8DU/OstU6jJQibjri7qNZVAuZ9ttH1FrRsG UshHzuI3XCVt8A/i7Twr3DoyAssDcl9XZQYhLUNleoHeuMG2/kwGJOh46JhEMY/xBzc7 Cui3cfdXm5v5nGeEIW1ZHI7MTpFiYHqb8OYYVvSyGZk4ljcoB+Bintm5uChYOM9+3L3W lqzoCPyP2c4DoTXtWgS8ml+gBlNCsSKF9AdoYNN7j3SxvY2Ea5aBhhrOi97uHOOyl07R ZTMw== X-Gm-Message-State: AOJu0Yy7YdDTYvxDUYkqICRznWG2q9e7LN36GxPWTBSPhFsdw/N0ERf4 g9+7UL9WtSfEBK1mTZ6se8i4hA== X-Received: by 2002:a2e:9d8c:0:b0:2c4:ff2e:d6cd with SMTP id c12-20020a2e9d8c000000b002c4ff2ed6cdmr9984637ljj.2.1698763450063; Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m18-20020adff392000000b0032daf848f68sm1645893wro.59.2023.10.31.07.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8F0EA6572A; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PULL 08/19] tests/docker: use debian-all-test-cross for power Date: Tue, 31 Oct 2023 14:43:50 +0000 Message-Id: <20231031144401.1238210-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22f.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, T_SCC_BODY_TEXT_LINE=-0.01 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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-9-alex.bennee@linaro.org> diff --git a/configure b/configure index 37d1b10b87..96b01a280c 100755 --- a/configure +++ b/configure @@ -1325,14 +1325,13 @@ 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 ;; sh4) container_image=debian-legacy-test-cross diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 3e6d741f62..a1dac0a45f 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -82,12 +82,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 f61d97102f..82e06d84b3 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-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-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 Tue Oct 31 14:43:51 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: 739581 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1689228wrt; Tue, 31 Oct 2023 07:49:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEEk0/eKOq1CPXjReG9eWKEfKdX1/FKdSIOUfhzY/4VRvSJI+FcItjBkYEJO0W1h+nEEfbX X-Received: by 2002:a05:620a:d8a:b0:778:9ac2:5a9f with SMTP id q10-20020a05620a0d8a00b007789ac25a9fmr14184945qkl.11.1698763757170; Tue, 31 Oct 2023 07:49:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763757; cv=none; d=google.com; s=arc-20160816; b=SGqwx6rqmnp4Fm3NsZonNSmoeEoN1b/8ON6t/oW+EOBNS+GvJaFY/+/JcdnyizxS9f 2QAaHwG5kbuYaCJq4B1btKMukfKZ2weDC/F76QBLQCxP1mYjf5FRyf/kyUE4Uf0G6cIc RdZF1hyAJ3mRbOTp42RGnCTEMaYkykWF21hj5Uerjq4oWA6FQnTsBjNq2yrDclfl0Eo6 S7wBFyHKs4DbPNQBzt32JY2XV0T1cob8MnkKxGklTRa+9CK2YJCIfZVwxctDZaTsT5s4 Nb3Tn8ZfcTUoDzmYpUk8613nRljBeMzBRvvYZgbKPJGWReNTrrc+cgcoW4b6+nCHSd25 nXAw== 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=U30BBgxZL0E6bzjBTiHhMCHKRVxI3F7Um9iUKr2Sfcw=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=BcC4wdP+2mRzW6iYyF2xumy+/6KndhDhyyhIjVbVZExqC1qVti5wOpYmuMoucfOPBX s+4saPe2A/TUfVMPdh2ZBNZgS0gKbarA8znEHD+2TC+kOHFmubvfTgNyzV7P/dPM/u6/ t5WHIlY1Sv1ramEZvFIgHpvzHH76Aw+Q3DZTunCS7DnL1bTkS43MvD/YthcbMvSpWH64 TInHmqLcFZuwH0+epa3OURt98scB1+oYGWblB3Yva39Wjlx/3jSOcgVw8/waoZ7PumGp jvmAnv+zlnp6cxbjqtbAKjA7BLtDAtPRmzXI7Vh2mxD+MaCMaQC7mjj47/xxsLT6JJOs 8qfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xNQwTzYF; 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 s13-20020a05620a0bcd00b007788fb75a90si1230157qki.620.2023.10.31.07.49.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:49:17 -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=xNQwTzYF; 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 1qxpyZ-0004pq-Lk; Tue, 31 Oct 2023 10:44: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 1qxpyY-0004pK-FM for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:14 -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 1qxpyW-0002Ao-Jd for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:14 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-407c3adef8eso47171715e9.2 for ; Tue, 31 Oct 2023 07:44:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763451; x=1699368251; 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=U30BBgxZL0E6bzjBTiHhMCHKRVxI3F7Um9iUKr2Sfcw=; b=xNQwTzYF79eXfiA90NirFxigbdmmtdvTlXXe98Fvg6LZXPtVtpU9at8SC6cimkMfR5 axeaT6A07AFRj1+HPVwCHbJWGTu4Wk18HpPQhF+xyMX6ze/E8Atp2x9KInBnM25n45uR UO6B3AlebPV0L50hwJ4h/heesiNtRHJh82iSbJdjZGhsB9uQFxeRi5vIXXjq2FH3sQLw F77JDov1vX9uL61UZhYvdd3i2TDgq2VfkMFH8LxGyWNnh7PvMsUPITHH8cnrVy2dXkI+ uDbwSgHW317EB9LQNpIHlMBJ6Fw3fY+Nqme0mJ9h+3X3EXv2z1c0EXDwvOaJ+dn6AeH2 uNzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763451; x=1699368251; 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=U30BBgxZL0E6bzjBTiHhMCHKRVxI3F7Um9iUKr2Sfcw=; b=ahH3ZeJXCe+DHSXOG3NL0pOV2ouPEFMp0pRuGI2BOXsjf3+5uHzp091QH+/xyQNtej RKKIf7I0DWFrevFXmvBne6vtY4XawJ8IUHILnriLlpoZwj6mALFnJSVT+VmItoCCglR7 6iHI/l7dEHQgkTvtqA2sicJzKc+1YcA4I7yKJduYarRb8MHPsVq5Z0EUh8Lk9vFF0wjY 3XGequYDmYetMYkzys9BYJvf2+e2SDZ4b05L01bE5diBAkYTjX451UJitqenb6+c9p3M S4dLSI94vhTx61iz7krJTqoGJy29LYybR35bNauNEHsucARlLIQF90gQYfnDEalN+SM1 7qug== X-Gm-Message-State: AOJu0Ywz0+SqmExABB4xqR3t1IfU1NV+pEYU9G9RN3nYfCpG3+lQBAE+ PNKoADclZiOLYqAfxIAKzXTY6A== X-Received: by 2002:a5d:4390:0:b0:32d:81b5:82d0 with SMTP id i16-20020a5d4390000000b0032d81b582d0mr8624104wrq.33.1698763451078; Tue, 31 Oct 2023 07:44:11 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f7-20020a056000128700b003232f167df5sm1639943wrx.108.2023.10.31.07.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A87E36572B; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PULL 09/19] tests/docker: use debian-all-test-cross for hppa Date: Tue, 31 Oct 2023 14:43:51 +0000 Message-Id: <20231031144401.1238210-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-10-alex.bennee@linaro.org> diff --git a/configure b/configure index 96b01a280c..be7cfeddc0 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 a1dac0a45f..66b8844246 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 - loongarch-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 82e06d84b3..47e58a248e 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-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-mips-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 Tue Oct 31 14:43:52 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: 739582 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1689679wrt; Tue, 31 Oct 2023 07:50:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxCyWr9osiSxc5ekYbexgptzW053ftY8fmYJJs+NDimvPLviaGgSnlsEhTi0hYHNSz9DDf X-Received: by 2002:ae9:f443:0:b0:76d:2725:f36f with SMTP id z3-20020ae9f443000000b0076d2725f36fmr12352423qkl.71.1698763819563; Tue, 31 Oct 2023 07:50:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763819; cv=none; d=google.com; s=arc-20160816; b=jTvUQjWeZnicMPyi1hW3Lp3x3naRutwN27Re99nOXmfCMYTYy6tO/vVGtMN6G6d72+ u1p8c+c+p1ep5admAj6teM5q12Nfv6B1Z97iewZ1rZ+kMYDhBWfgSOzhavLXQ25Zxzg0 8CsylxKfoyLekpYZZWEtrwpoJ8Iwq3bJB9OEVAIklo9M0O2FjVAVGs9DUq3N3oVpFxPj Hy5Wjtsdy7u6xH2NgezxV9GqHWsqkwrHyiT7BKR8UIoh3iNHEAU6bh4+0Hjko40eUemj HDKiFPCX+kv+AZEdi8I4r1bFoLU8QKb8cum+kxIuHfh+Fig/7BfZAycqtvr0fc7MVsdH T0Jw== 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=ndIjKuvnqGHRvHRZNJZiZGvMt1TC/HbwEzRPVDvch8c=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=u2kJcYavXFRcaf4mhjH0b64ZL3MbBfyJhKAyoR9IgRYGLK7sWZJWf4pn6zxrPWsdbM lZGGTRz0hVWRq72XwdfxvUjUbjuoZHGwVG2Wknob3l9SwBwoUzcO5MKvuLEu+69f1VrS Uay6HRI61B+bvHZslJV1HElIRzb3eMu5MThw/GeWubIi3bqCF8wFV19Vbeqh5MEwjcNk RyrWFO9Qas2MWU6JgsnGa/C3n4hiyqPcaJclpO87CbGtAPh2gcW4Qoc+D4wOFu6z3vc/ 33riItZRPmmB/wZQAmhpvisiY2kK3ZUfojbpcwCHBoGhz8IPkOHizuJfUyf5Nuo4EMhc 6Y6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PD9YTCVT; 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 f18-20020a05620a409200b00773d05a1403si1244996qko.542.2023.10.31.07.50.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:50:19 -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=PD9YTCVT; 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 1qxpyZ-0004pV-9u; Tue, 31 Oct 2023 10:44: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 1qxpyX-0004or-RI for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:13 -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 1qxpyV-00029y-6K for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:13 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40853c639abso44758205e9.0 for ; Tue, 31 Oct 2023 07:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763448; x=1699368248; 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=ndIjKuvnqGHRvHRZNJZiZGvMt1TC/HbwEzRPVDvch8c=; b=PD9YTCVTH/Q6MC+s7LGhcKuMOvaLV+HHqRxxlPYKuUjaG6RTxLC1bf//hmehw4uI+Y dQRqKMlyfMQQ8osMOuDytkOdRxlgQVX6K85vWEpST3vA4zs30uPP0yvemntxb02/e9Qg Sn2FAo3w9Mt4uvAxopngOk0I0EqUbsaH0JzrvqvMNb/Y+4TtshV4h+EtwUGW5Y3U7PxD jeFkwZdkB5aYhEQt30qEapeYDFcZO3Jsx+piE6wCPtghjOt9I0JEvJ26q1UkCE0LzQPJ 4CQHDw6vsNioVWallsCKB7Kse/O99SMqdpCCl3yT+hlp2f3wrkPhQFeZHtq3tRj85sMj QBUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763448; x=1699368248; 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=ndIjKuvnqGHRvHRZNJZiZGvMt1TC/HbwEzRPVDvch8c=; b=tr0bZpX7CV8yfM2P/+qLcX/y0bkMUOLkUpQ6FGG3vXuSRqrgbsbp51CzU7uxzS/0bD tTU47c80okCj4a7HE38sh33m3otLOaYL90MqhVqHmomQvJySAwOL/7i8u5cZ1yNb/+hc rXXtNWnTmf/xxmz5CJ2oFBKxsp/5R0brQ6PupkpfSDykwingASNlgHfvY9z78BOhKx0i LDX1dZHCxKP7ANSMz1X2OjW2Fn+O0F4dQTZkYIL/tcRDRKRuPmvaWjrV2x7JWUCtuvNj ckNHpmGgjjEi4f44Yp4sJ/oO6JargFBQDEGxlpXqpBSDRMgmbwHeiEDBHVhl74g63ntF prCw== X-Gm-Message-State: AOJu0Yw8pERP6g9U2+oKSPEiGi4sMl9+YjHc7QBoUDZv1P/tjPHIcukX FIHi0yzJz+2MF+C1KRGZEODT9g== X-Received: by 2002:a05:600c:1ca9:b0:403:9b7:a720 with SMTP id k41-20020a05600c1ca900b0040309b7a720mr11482656wms.1.1698763448125; Tue, 31 Oct 2023 07:44:08 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h10-20020a05600c350a00b004064cd71aa8sm1964851wmq.34.2023.10.31.07.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BF1EF65711; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PULL 10/19] tests/docker: use debian-all-test-cross for m68k Date: Tue, 31 Oct 2023 14:43:52 +0000 Message-Id: <20231031144401.1238210-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-11-alex.bennee@linaro.org> diff --git a/configure b/configure index be7cfeddc0..aa29cfb797 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 66b8844246..d42d89b26e 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -46,12 +46,6 @@ loongarch-debian-cross-container: variables: NAME: debian-loongarch-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 47e58a248e..fb93eca537 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -122,7 +122,7 @@ 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-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 Tue Oct 31 14:43:53 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: 739574 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1687839wrt; Tue, 31 Oct 2023 07:46:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmZTHbYaZaaZ9OmbARDSqm8fVcVjI9StdUI52d+Eri7URZrVrWWM0y4a7H4c5Yc0xpK9xs X-Received: by 2002:a05:620a:1a81:b0:779:e171:3356 with SMTP id bl1-20020a05620a1a8100b00779e1713356mr15188381qkb.53.1698763589217; Tue, 31 Oct 2023 07:46:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763589; cv=none; d=google.com; s=arc-20160816; b=fsTV4Vjwy1tRHuYUXPBSMN0K3X+r5sVvOQ06U3YChcVqfuS7q3U0aBH1oBXT75FsEu PPeULNBa8jF13IsIOMGV+eZDmI9cut0v5T+O38DT6WtSgfFoLg2JA09lPsK21s+9azKb ymPwzv9/x1KDMq4LoSAvKspgAFc8ZnqqVmISER7WLgWuMkGqdQ85wQTpOUEfrPZKqqdF PThpfTYa9ll2yzLeF/h/fjlX0OylpnG/tHvjT9kBIKM6Fy46We0LSyQ6k2O/L5+BgLE3 9217mtRJlONrpdSsop4OoKIvVrW5ev8k6ve87nNtPXazdYhaaijTQy20BvLwmd48SbPt Yqbg== 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=LVFhKh46M5GfStLPcCrXVqXvAAmQhHpnjdsY7O4fjsA=; fh=LultvDE5KmYCspChf6UrcXF0J+sB9F86yHHmgOA3JH0=; b=cGErmTQsIHRfbyW+mnOaA5Zc/X1QsZ7mvLRHRX/E2qKS5OczBujl45GwldqveRz+AJ qKSpbnI1osfVqwcNrQ1Iy/VdSp7KGo0bpv0luk/lfN6Li1PS/68bVOvzoWHhRoqJC65N 7b2AohjXFAucH6CnhM5sfqxkM8AYpf4yea7Qmp5KkoXj8t7+n2AbHe9gOEgsjcOeL0bE Z4RQCgM54fqICMzzi/0jfDcnJNLwrVdUcSMW5hP8VFh/Tb6RM4oZ12xg6/5+j7BjFqYq DIzzJVldzAAKl3zWZz0eDyIgQH11CEEQPJsS7zPooRH5cHmUHsS1s72xDceXHxZNiYB/ 7Bhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xD8A6YUq; 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 o19-20020a05620a2a1300b0075f02d4d588si1226906qkp.117.2023.10.31.07.46.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:46: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=xD8A6YUq; 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 1qxpyd-0004t8-Vc; Tue, 31 Oct 2023 10:44:20 -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 1qxpyb-0004ra-Vz for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:18 -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 1qxpyZ-0002CR-Nl for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:17 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4083f613275so41441325e9.2 for ; Tue, 31 Oct 2023 07:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763454; x=1699368254; 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=LVFhKh46M5GfStLPcCrXVqXvAAmQhHpnjdsY7O4fjsA=; b=xD8A6YUqDhp+srO+lLY5Dwnu6Mio9ZD/IVGPMDUDbVfGuzQtp+plTZMhnx0EDp/0XP MyAq7/wVKffGQp9tlcm06opQ1kkYtjvAWZ8wIlK9Y1FFDHaLaBl8ui35l55XN8cHUuN8 itqu6YG+cFxOsuTzCFkk2a9ywz57r3zvCZpdSqKJHSSOslnBY/qQWDYrCJVQtTilaF9v B2sOolFmj2cdv9UjXU9c6nYezmUPVOIzqPa6gsWCZqeJUZ3v/tTVxfxhb4g7D+kD4mhv hL3f1xgozrs2mjXeyvC1XUlsycYs6pSaHspdZxV/8l7ehBycdZJPwhyj93PZsTB2rPZ7 lQfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763454; x=1699368254; 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=LVFhKh46M5GfStLPcCrXVqXvAAmQhHpnjdsY7O4fjsA=; b=HO4SdldEReYvSKybUGCNvqAcmqJR8omWgHcg0G21o9UJxPnVoPh0xJCjNAOCOPujC+ 9VZn0mmN4YQcyEYxIRwJvDHk4KLwu9mvsCZ62LzptjIPRbP1s5Tzd4oBf1ntZK7OAlsE qu69UqLil+6Kj5Dwb5+fJJh4jiN4GsE10mPK26BuLstjAZeYKkds6V/8Sh3Z16OquZK1 6pFdm1Z/rGwtmV8ACHn1V6u8UD4zlNHOXfaAtuCqAlV6gspyaiBW7Qm/U4Pzt8Gv9MG0 U0EUh0TM1+B9sD0lO/MQHBi91XdCpkVoQk72ZTiCWvx9dwaJ4O7XKctA/ImeouZb2CNt sMeA== X-Gm-Message-State: AOJu0YwBzRxd+OjMbgKmNesXKMLAiNkLKEz/3nD5WIvPH6nJAriW170z OnbXz15YaEJhWIH9kSVezFWGRA== X-Received: by 2002:a5d:62cd:0:b0:32c:c35c:2eea with SMTP id o13-20020a5d62cd000000b0032cc35c2eeamr7724723wrv.6.1698763454398; Tue, 31 Oct 2023 07:44:14 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v12-20020a5d4b0c000000b003143c9beeaesm1680729wrq.44.2023.10.31.07.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D806D6572C; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini , Jiaxun Yang Subject: [PULL 11/19] tests/docker: use debian-all-test-cross for mips64 Date: Tue, 31 Oct 2023 14:43:53 +0000 Message-Id: <20231031144401.1238210-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-12-alex.bennee@linaro.org> diff --git a/configure b/configure index aa29cfb797..2dddc3c82d 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 d42d89b26e..df5eb3ccb6 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -46,12 +46,6 @@ loongarch-debian-cross-container: variables: NAME: debian-loongarch-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 fb93eca537..5831744a39 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-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 Tue Oct 31 14:43:54 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: 739577 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1688217wrt; Tue, 31 Oct 2023 07:47:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHCk63yQjLwhdSEdcQU+r0FDXw/EQV5MapdIaR//PxRlwewrvqyORv/6kJ9GH57Ikq8FQ5d X-Received: by 2002:ad4:5e87:0:b0:66d:2785:a2b0 with SMTP id jl7-20020ad45e87000000b0066d2785a2b0mr14909425qvb.29.1698763636178; Tue, 31 Oct 2023 07:47:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763636; cv=none; d=google.com; s=arc-20160816; b=I9SgRAxe4rxDdAtwwE3jVFvnDJlP39RjFMoFraJNTSSz9z++7IQkGulI53Z2Dj8p+L deFWPAYxCWWOXWHAHccSr6nbjvsSZFcd693BaItikjE5S4jvPWTxnrqNrO4voeIeBgCg Th4CFHC9C0HoVs3jPrOdQMkiQHBwJDZknqgEueJpLVo98WV7OiNwWbl597QiV90zF1sV S0wIYixKJjVigNfddhT0PTMOhNSoE8mWX8gOixfLh4IqBL3oC8YeFZ9723gdXTCzSav3 +Zp5BVVR4W5NM1rG3yrWq+L5a2dWPYfrqo2kJB8kgYam4pcibhClJxHZG5DgMsqaUGyT 8gfA== 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=zcyv0RYN9JSVoQBV0y0IqvvxryTWpI+BdywLMNyX2vM=; fh=LultvDE5KmYCspChf6UrcXF0J+sB9F86yHHmgOA3JH0=; b=Cm2kUzBpNO7CJf/RVKDu+Pcp3KOkob88QOuzgLiLArpcLLISVHbDsvx9LKpxhzkmN9 NV5EoBEP/IPl6+Z/FNJavjojG7yG6vQPeYTczIeL7JAIns9E4sN66vmMPVar3P2cEIMk Qo0vxgNRYnP+qpJzueS9RWZHuGf0tCRwbAVx7AonjY/9SAlJMMWlM9eSCt9817xbjAox 9+B8PQZ3Yrv8T8jWFFtxgDSG8Hcoci0HUC+9j7Zr51VhDc1nDKPZRpQX7iDT93W/SJ4c 699aG6SOJ0jyh6We4hAAMOgrO5lGr2EEs5GRSCpQk8uAVWXQKrQNVXM0DGekzetpDNP2 XLtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DIKdI1As; 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 dk13-20020a056214092d00b0066d10e104cdsi1180330qvb.363.2023.10.31.07.47.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:47:16 -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=DIKdI1As; 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 1qxpyc-0004ro-7P; Tue, 31 Oct 2023 10:44: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 1qxpyZ-0004pZ-F9 for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:15 -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 1qxpyX-0002Bb-M2 for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:15 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-32d9d8284abso3643249f8f.3 for ; Tue, 31 Oct 2023 07:44:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763452; x=1699368252; 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=zcyv0RYN9JSVoQBV0y0IqvvxryTWpI+BdywLMNyX2vM=; b=DIKdI1Asyx9CPZXDGS6qNz1sjP0cPztllb+D2TXz3yspKCYBTn2M+ge1ULpyODv73+ 8vBLA3JNYxqGkAzrnIpqMQs+pkRzbVfRoRwKkwY4AsFm3Q8pFwsYEkMxRD6v/1XQqfWy Usv5mPFZjdAitd6EjB5YCp7CUuBi4XYMxeFktshigzGiqYVV0lYDhpYFvI5S5EWhuOJ2 BoiXov4H+B1w/DKbFVY0DWg9bdI1JFCCWOSrhfNfS95zhtPEE2hLDOOBcdiOxksORrlz zwOxkLO/JHn2Bhh6OGNc7guonLdie1V8mP1Q3slLCRSpphBv4SW4XLCJkzrSA5UwFrVm fZBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763452; x=1699368252; 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=zcyv0RYN9JSVoQBV0y0IqvvxryTWpI+BdywLMNyX2vM=; b=RhBfHpngML2J9MPCDi4i5TPv6JvCWSZ0mjvzFnXf/SYsMr/2uGfTmkvpbpYJWFyy5B SCrb5Iae2a8uvBezfGiUmeg6EnbJex+boLCKcCP2A0DMp9QD3OEpmqnL8bo7+hK8/hLh BzjFBrd8OwpooP03pw6NA4esPergDh3gqaOr5GEqUNRKKi+mr5FFF/UtkxrKllOkUq98 7JivgvBxigY2NJ94PQ6/Srv0V0z3CD0RnOb3g9gsSffzl6wOFhjYQlw1CJlV9oWJ4x6w shEjPHRtN0da4rRUlkgO5+ry1XbiwJxC0uqYV7Rg661+KJD9+EhVSJTPSWKSeuoy8fWO hiTQ== X-Gm-Message-State: AOJu0YxXIOHA3mA5BY8Dbr1WvZNZuax/czQ5fg71+NEKP0lZUtDMuexa PQpy29uq2Rxsd3FAImkYLUNagA== X-Received: by 2002:a5d:4c45:0:b0:32d:a2d6:4058 with SMTP id n5-20020a5d4c45000000b0032da2d64058mr9422563wrt.62.1698763452299; Tue, 31 Oct 2023 07:44:12 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id w12-20020a5d544c000000b0031c52e81490sm1668986wrv.72.2023.10.31.07.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id ED46465712; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini , Jiaxun Yang Subject: [PULL 12/19] tests/docker: use debian-all-test-cross for mips Date: Tue, 31 Oct 2023 14:43:54 +0000 Message-Id: <20231031144401.1238210-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-13-alex.bennee@linaro.org> diff --git a/configure b/configure index 2dddc3c82d..791c48c4e4 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 df5eb3ccb6..053330d6f4 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -52,12 +52,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 5831744a39..dfa9617bb9 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-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 Tue Oct 31 14:43: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: 739580 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1688851wrt; Tue, 31 Oct 2023 07:48:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG3jVX+aQnHKJC9sPVcVR/H6BrBMdmV1XNTrJ+iv0ZAW2KgDw4Qj9RDIe/Gjcw2Nb3xB94t X-Received: by 2002:a05:6871:a083:b0:1e9:97eb:15a with SMTP id vq3-20020a056871a08300b001e997eb015amr15210113oab.36.1698763713711; Tue, 31 Oct 2023 07:48:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763713; cv=none; d=google.com; s=arc-20160816; b=DhbzZG6Q4VpNx/O0uLXETaVWgRYi4WLp1VDVxYGpiPr3y9r6yENCiRPPtlwvo0Pjfo FTPXGMezf8jNrxkCmrYedH9RM+i3HgAqkvQGSr6nBVuJFh3/iv+nVQLT3WzZDDNtRGBs qeqaRPlyu8qm+tkmaf2/XvfnRuTvTNFFoPD1GaTPG1m/4C9CNssGQrq5bu1OQlr5yOqQ L2w5nDDeXvrtU8U/k05qd2KjYm5Bziox2ofKaw5IPu3VSag9GWInhzKZgPea6l4y1Eec orgOId0rX3l6nhCfOEvbk2Ke+1lOjdFRSIrbemmWsqsQD8LmekUJinmk3TK84QcX/Rln Gb3g== 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=FNAPZGi/6P6pcPJMsH3EA8QH82A+OUjUKwQzzU5zh3E=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=cQkJXdyWB7wHlQTVvnjLKoay5mSZC35A+s7orOG+fdjVWRHFBG2BbMquZmfzorpNic gv9tMuB2xWJdrb1RGRFtuWtPu8kaNRte8cc5nczvEN/TebETXTsz+xFLJ37K5ZrzdJZt k1Zs5A01H+fEat6ZXzg5BNyg15EiavLCUCsRCotw8bVMawHnp/kgNejuOJlULWj7chrt rHy7EDn9MCZJpE114EEnL/77d9pISI/3t0cz0nmYIOWOpwG8ogZaPqpQmzJX9dVEUZTH Nwrigmpw/RN28K/KY4aVAnA/68Kv84r1qTFkHEc/QGewCEi9/kN3oCjfGLjV34gNb9o9 VWwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nYaRJMdn; 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 v7-20020a0cf907000000b0066d12fe2089si1143824qvn.608.2023.10.31.07.48.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:48: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=nYaRJMdn; 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 1qxpya-0004r5-I9; Tue, 31 Oct 2023 10:44:16 -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 1qxpyY-0004os-0C for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:14 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyW-0002Ah-88 for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:13 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-32dc918d454so3656545f8f.2 for ; Tue, 31 Oct 2023 07:44:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763451; x=1699368251; 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=FNAPZGi/6P6pcPJMsH3EA8QH82A+OUjUKwQzzU5zh3E=; b=nYaRJMdniZtAkS6mT50SX9z9XLazprI9DFLc6IB/NxB6mcInXKtS67DOhRmOEy/+zn lN1syDL+1xuqTkyE11e/jt2Uso0XTvqw/7JC6WtDkghM4Jt6dAYZrLUStbwQQkPr+ZSu 5CYzYY/+8hLyPAgrp0YywKV5mJ0fzjPw9klT0rtF9HYRsfpVck/UyJdkDAp0YBhnLZwr 8txx2WW9Pxhq7pIMr4CyHKV5apelC/udQwj2OFDJLyDeM85Ai3QL8JNMMatxLZs6eV+l FypaEO+4aBNcVm0MEgDiIdj2Ck2x9TMw8TkpcLyvrAXm+NfgvQ1mdiiv25Izwkyzpx4H ADYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763451; x=1699368251; 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=FNAPZGi/6P6pcPJMsH3EA8QH82A+OUjUKwQzzU5zh3E=; b=gf2c5AcwnJbPZo59WovZyGJhNnVXiSlPGMYkIxPPLvPasJ+F9drZXbcLQuUhCdIt3n atRApkMrKEYB+kxgJJZFaQ5stm6lqTm0oAE+rQvLYwJLyimdX2olXxob5POxtH+rszTc oktelrJpc7Pl8Ew09Poal7QbKjVaJxS/bMaEsN7hXJNxA2hCeSYAJWjenp4Y8EqT5FQF EsGH2gIjkC1jW5jSDpucTjF7EGpjXByrK3zB9KHql4llwh3SByWhImxX3WzF5Y57wbZ5 +60MFXv5iDfLeH4jJFNnQ82iIIt4MqeAFbL2uWHKaPv6m3PrBye2+WxvzBc5lpFcwZmT GNfg== X-Gm-Message-State: AOJu0YyY3FP+lIZiC8rJ/0Cp3NfJos2RLEE3lIRqiJTwQwTFfgLKwgLo iKsEbnWGFC5/VI0eMPMxthh623VkxgY/6INVHjI= X-Received: by 2002:a5d:6a85:0:b0:32f:7ebc:cf71 with SMTP id s5-20020a5d6a85000000b0032f7ebccf71mr5524422wru.1.1698763450853; Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l12-20020adffe8c000000b0030647449730sm1652141wrr.74.2023.10.31.07.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 144C96572D; Tue, 31 Oct 2023 14:44:03 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PULL 13/19] tests/docker: use debian-all-test-cross for riscv64 Date: Tue, 31 Oct 2023 14:43:55 +0000 Message-Id: <20231031144401.1238210-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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, T_SCC_BODY_TEXT_LINE=-0.01 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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-14-alex.bennee@linaro.org> diff --git a/configure b/configure index 791c48c4e4..0e0f0c60b5 100755 --- a/configure +++ b/configure @@ -1347,6 +1347,10 @@ probe_target_compiler() { container_image=debian-all-test-cross container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- ;; + riscv64) + container_image=debian-all-test-cross + container_cross_prefix=riscv64-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 053330d6f4..98940d0f3b 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -73,13 +73,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 dfa9617bb9..dc55ecf001 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-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 Tue Oct 31 14:43: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: 739575 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1688022wrt; Tue, 31 Oct 2023 07:46:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhPlxdhdNqk43IO4SFghtbQMTzWY8ANfc39kNtHEkjYPFCK/9bk4j1yiD8F4wvAGOSrlvI X-Received: by 2002:a05:622a:15ce:b0:417:a514:72cd with SMTP id d14-20020a05622a15ce00b00417a51472cdmr16818159qty.19.1698763613066; Tue, 31 Oct 2023 07:46:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763613; cv=none; d=google.com; s=arc-20160816; b=AdbVzSqbdOvS4B81hoKRIyCFUHZrbH89gBIN1HjmcGL+6yUp/PU2w8jZkWkKdKMY/Z 5MldpRWmiuwIbm2ZhLhnqfh/S6Wpqt4fVF6bBHjYnDttcwGGa3wiPJT2+wgjSjFJ1dPT k2RCsA3fh4+FnjfqLq8h4OOKw4y+LGAhGtdDeZGiPsvQcgIItO5oj5afwEZocriV69mD 2ZLITjt7pdlHemosuhZH6jblw3GpjDMsr6Gm+7u9Zc5qwIUcxxwCJNQ4gPhX0E1YCdGu ZZiSZnfm6aieST0nrlYHS+8uaSu+7JCkJ5hbA2Xihip2gENs9f5HCs4q0U5J+hommo4h YyeQ== 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=0q9opczHMBVwOLIFJvZ4NidlFBVmSFtp8ozOnDPze2c=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=l1NLVfawGzuA2bINVnznAasxWi+hkidsntR5uu5XyNgsM/atjmkuvHWDdtUT8Ohd7d +Staz4DSp8eVs5tQ1vPHn293AQt+6Z+F7xhM3P+uPmBQ1AA7gZ8ZpVTG5h08Wd+CrT19 uvoJLmfBkV/rMWhS4q/aMI2ETWJ+GgKa5G+NV6ZlPWrsO/kdodpd2QX8hLsMZcmgoSb2 YMvQHeau7tBnoGufrqToDOvnri7uQUXUd19ki+bGyJi7mRrq5fkOTcvp2stQD/+5AAVx 8qKshrfKfk4s/lXCGG63FdraG/AyxjzStvqLmNEmZOW00xMB4+AZcAKfIrDCEzS8k2Uv yV/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UdnbWNJO; 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-20020a05622a01c400b0041cbcce90c1si1244414qtw.531.2023.10.31.07.46.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:46:53 -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=UdnbWNJO; 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 1qxpyc-0004ru-8l; Tue, 31 Oct 2023 10:44: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 1qxpya-0004qP-0b for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:16 -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 1qxpyY-0002Bh-6a for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:15 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4079ed65471so41480645e9.1 for ; Tue, 31 Oct 2023 07:44:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763452; x=1699368252; 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=0q9opczHMBVwOLIFJvZ4NidlFBVmSFtp8ozOnDPze2c=; b=UdnbWNJOP4MqPW6p49JzHLYGZICOlsCb8OMsRP6dnfw3oVvwsijbF9n0ZdrdwD3n04 ilxpL+JHn4gLCyPkZZuov5CP9Evf0aJgUq/+TMRz3cz/+uO/Ec1WDRnKnqZBhSIO0noz X7nLcn8pmgtcFha2Hvep/mwLBB3qgoh6lDSE0uukGtCqbZcaWVfqK5AXycSqTLU/cAY0 2vha3mmYJd2pDu8Xb25IXjcMrz6IjSibDHiUvg9JfqZB//55MBqlSDNQGjTRh2bfDPtj O1ovtkLQfrkiWJLozb8h+IZICKv4eV0hp84XHM+nK3x9iA15+Ng2gr6YyGUOHaF+xDUO +IAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763452; x=1699368252; 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=0q9opczHMBVwOLIFJvZ4NidlFBVmSFtp8ozOnDPze2c=; b=twT+rQqt0fGwXJDx1+J/BPY7g1kFmggICLpaozJq7VCkRa4pRIrU5cp4TZIH8J4o3K V/hjZ74vyebw9bupAC4La0/HNpT5A8BxJ0ucwMZyNpCjTM+ErOcqLovfPU7fHdz+Ss8I nwqNdAefxsjnj98XOzPDSDUq89677RBpBcfHK4hQZXS1rCJclxeEa3Bbohy1z01BjS1q Iw2Qrt8spLkB+WoLVeWt+NM3rN2snfeS+cGADJPfEE7U6jbHCFyN7mokZaYz6CrBAS8R GO1Oxe9tLP3NOoe2Kab4mC0PoJlnXtjL0vrM/ysFfdf+oIDLpnshKZ8273Hr31NLhpzP lMAg== X-Gm-Message-State: AOJu0Yww4RM/hgelpuDDpVv5i9WG7gODZHRkj346Wo5A//4t8NI7D5Jg GWcWc8POxTd1XDmowDJNIYRCsw== X-Received: by 2002:a05:600c:35cb:b0:406:44e6:c00d with SMTP id r11-20020a05600c35cb00b0040644e6c00dmr11157523wmq.2.1698763452603; Tue, 31 Oct 2023 07:44:12 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n20-20020a05600c465400b0040588d85b3asm1885190wmo.15.2023.10.31.07.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2CB146572E; Tue, 31 Oct 2023 14:44:03 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PULL 14/19] tests/docker: use debian-all-test-cross for sparc64 Date: Tue, 31 Oct 2023 14:43:56 +0000 Message-Id: <20231031144401.1238210-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-15-alex.bennee@linaro.org> diff --git a/configure b/configure index 0e0f0c60b5..f1456f6123 100755 --- a/configure +++ b/configure @@ -1355,6 +1355,10 @@ probe_target_compiler() { container_image=debian-legacy-test-cross container_cross_prefix=sh4-linux-gnu- ;; + sparc64) + container_image=debian-all-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 98940d0f3b..463ac493ad 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -79,12 +79,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 dc55ecf001..cd4688bf07 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-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 Tue Oct 31 14:43: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: 739572 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1687608wrt; Tue, 31 Oct 2023 07:46:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFn367FmY5Qj0dHeKf1BPPgzs0HMvmVmkOfEmvDAS9WwpeeMsJhDk1L6u2Y+ONrzbx2oToN X-Received: by 2002:ac8:5e0a:0:b0:41e:5c9e:dd86 with SMTP id h10-20020ac85e0a000000b0041e5c9edd86mr6503535qtx.63.1698763564947; Tue, 31 Oct 2023 07:46:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763564; cv=none; d=google.com; s=arc-20160816; b=kF7W8kcyozYj6cNfFz5sRaUmJYE7OXroGHI61J9fWyJndAkQa+p2BlqAKir3o/xcCY Ill2a0CjaBwZgcwIvrvK+YZui3W166Zs9r6q+rfV4e1v5K7ToCiQV9brualQFbEZI46D N7QwqNNtkegLd2Ghx82MlMgOPRp4k2WerNQ5mOAj0b0x2Wmaefa0HYnskjnMSdlyY970 GBlLBQXnf2/rtEm+dbfbdW7q5Jmkr82mAYmyzONyATN+rM6SGmA90WYsugWJ5HWvJc4Z STyhsGeFtT/D5TYktI2HTBKU2fqXPuS5reDFtUPPxPIBjTqjzn9JgzS1ij3v4ES7COTy GAcQ== 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=UcNQcZ23IH2l6ThOjQB5817AinZo/599nsQ8ogdvZxs=; fh=RNVWmd7TwlX/wyQcdhmnon4JQcsRaZwH7hItUZb0D88=; b=FC+MzByvBNEf/gYLFV654QV/HXrPtEswh6sb3Mppu295zk1LHB9nh3MaTX3KySVgcU KXP82gE1uqcrSX3xWbxDxzA10qpQ5s9jL8/2t9n1fcnvO9oyCIP9wYEpv9lvuZf0FIuQ 9T9l8NeCj5QlRDfdJjgGixgk9Cibu+EP88Hc1mrGObmljthSR0S4nHyb/UeJx/Z+Kijq Q4FTWdIl8nBULUufigIdW4k2grJxUTY8fl95ufiVEB2QNzUh1t3M/tyuL9NXnpwKAbNX fieMyGFmokeGYTtTa3q//E/+S6OAkJmX2KLHjJh1yPyfSAeDvoDJ81zuncmb75IMlt7k ERxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VeD5eYBx; 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 n2-20020a05622a11c200b004196b9a23bfsi1154115qtk.613.2023.10.31.07.46.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:46:04 -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=VeD5eYBx; 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 1qxpyc-0004s8-Vv; Tue, 31 Oct 2023 10:44:19 -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 1qxpyc-0004rd-1J for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:18 -0400 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyZ-0002CN-S9 for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:17 -0400 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2c50906f941so82257431fa.2 for ; Tue, 31 Oct 2023 07:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763454; x=1699368254; 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=UcNQcZ23IH2l6ThOjQB5817AinZo/599nsQ8ogdvZxs=; b=VeD5eYBxMMFDpdQkHtd26wnvOQDAAsgE2cJCr7EUFZJLR4UOYRFKNN/IHnQTHkXpGv 4XHtIVlgTVzJHO/d/GujeQaokGWa1f+SKiNCQVT+kL5tipNLWglH34tfG62QLoOb74ve AFU1tsPSbNRfK0b4sHdTD/xvOJLpwa0iwwUPGvSVPurYqCqBCPN5x/dIg0vyxne7Pk7p oL8aX9xqLVTsLW/5vcPs9m++YrKEa5z31oJWBCZr6p1CF74j2dgDLGo5jCgSQbup1l7J TaM9U8fnKd3vidQyEzYXenkiiGej50aLTpEbNw/ux49KPDEWARHjoXvi5j8h+AbH8VPI MMPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763454; x=1699368254; 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=UcNQcZ23IH2l6ThOjQB5817AinZo/599nsQ8ogdvZxs=; b=Y3AeQBFnUcyKlDwPvhX3IfCptJq5JsM6jVjXI5xnpuO2LLEB4lTf1Wd2GiEAWuyo+F Jks26dRt0DSmmodtjrN+2NcmxHGlT3Ca/xiy8gv7b2yiH9iJML/DL/wAXPUDYVSvc6hr q65wir14n9nV1VZQn7tD5jdIM8EzxavCNqVYe9MK+4SvAVT2P/BNuytPZaaovpHQRx2V /yGyZJvnoXcjl+Wq/JUXdWSeDgextA4ILfHSgToJzzz6ahFHXriZ65T53wMONLpoOuBj 5kSKyU1NIH7WUUWN3nNS21pUXsecDR0x3HmIelARcrt2x04/bS4kV2z8z0o/Zu0QQXGs TqMg== X-Gm-Message-State: AOJu0YwoAz3FPTrKc1RqqqJ3SuUZ2IH3jfV0a/MVUEuCDRcd8Xn0YY4+ JcwBYb8cZqfropT817slAtwrgg== X-Received: by 2002:a2e:9086:0:b0:2c5:1d11:5688 with SMTP id l6-20020a2e9086000000b002c51d115688mr9890672ljg.14.1698763454133; Tue, 31 Oct 2023 07:44:14 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v21-20020a05600c471500b0040836519dd9sm1974949wmo.25.2023.10.31.07.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 406D165722; Tue, 31 Oct 2023 14:44:03 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 15/19] tests/docker: upgrade debian-all-test-cross to bookworm Date: Tue, 31 Oct 2023 14:43:57 +0000 Message-Id: <20231031144401.1238210-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22a; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22a.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, T_SCC_BODY_TEXT_LINE=-0.01 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 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 Acked-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-16-alex.bennee@linaro.org> 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 Tue Oct 31 14:43: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: 739576 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1688159wrt; Tue, 31 Oct 2023 07:47:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGgnJTOX+CrDHoKx+VRTGPQ+CfsTun183PfZHxJgIbd+4yoDXrZWfitPJImuwJv5d4UVRzS X-Received: by 2002:a05:622a:44f:b0:412:1e51:8fef with SMTP id o15-20020a05622a044f00b004121e518fefmr14578362qtx.30.1698763629798; Tue, 31 Oct 2023 07:47:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763629; cv=none; d=google.com; s=arc-20160816; b=t/oDuZbQ8TyB+PAUMXotT0YI7w0dIQu73OhpUI8gLefh1TH3f33qLXyuCRufLcLtG3 a/tdb42/sunfeXBuAqtuEPoQiyx48oZOx1nI0UN0xy3SHvYYWqDxtHsagla3BH+jH9gf temgn8XqIEQtDS0QSv4dKFsKqUwILShxeOaBrXGmxeVYgIez9pHhoTPT3gW1wJ4og++O gb52tzcMvmxovm/EgRoo8X1+w6F3bvKNaj5gZb+EfcVHGV+OSJyMdj5cgxZs1J5SiN4s bHVn9znogWpuhNaUCIGEHon62my1Wty6+UmJB0afICxwCM3MmnEYS/XREopPyp7ZX7zW iNTQ== 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=LVt32BVhuMD6mZN5AcPveEcpa9SvvyPpVXag3OAT//A=; fh=SzlSU5amjcbxiAlyeAEUroviu/QzYjQp8F+rgY0sMA8=; b=d6/O/qporc8VThsUhsITlM62bSFoY80KkatwWMocC6WLY4Fp7SL5uEKawN5I/gZxs/ oncNRKwXbAYwmEwIq2Seb02OBFOK7mAdiI80N4v31BXGuCyQ3JxiBSNCASvaI78hqHa7 hyI6VrAVBoDZ8u232JgAcj5RZNGRx6mMRjdD+534auGDgxihH5ICvyxqZpQLajhBgy/j jTAPGEdxGlq5vpwrhgFJ2zBWVKyWX/vPy6jBnL3y55VGR6oVL2sPCJWWfyL4F9x7+ewR TTuilYEfv2UxVj46exIjta8XRTzezP7J+nsTU4Gs7psaibFyKvmg2z8WtpTjwJYQmcbp LJOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cITNaC7p; 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 l6-20020a05622a174600b0041cbbcb8088si1232441qtk.242.2023.10.31.07.47.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:47:09 -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=cITNaC7p; 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 1qxpyf-0004tT-SP; Tue, 31 Oct 2023 10:44:21 -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 1qxpyd-0004sn-M8 for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:19 -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 1qxpyb-0002D1-TK for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:19 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4084e49a5e5so47188915e9.3 for ; Tue, 31 Oct 2023 07:44:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763456; x=1699368256; 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=LVt32BVhuMD6mZN5AcPveEcpa9SvvyPpVXag3OAT//A=; b=cITNaC7pCBNqLeY0DcyGQyEPB2xSoGUt4KH94Yk4qvZH+tL13oIX6K7PlGGVMC/EBs xVh0aHO73yfCcDjE663gVuBoz40QYEt2So/O6BYDLlgHXwjdZFJCX/fLG42b6auB4w4k 8ei6czSde7FXcEXjBYXObKJcvVcqDJnCgUj71FMAIN+f4Bz/7UFqn+zyZtNEGEN452MZ dkGFdozX/xEt5Gs96QMOojsZZ4npFBVu7RVjZRW6qoLBepYu2wpfn+Eb94KGcFsAsfMw Ht2XFDC522oW5Alc8IHNJrVIoDDqbwyS10GoRPt4svmGz2ZNYWs949y84mT0Au3qwAFR Xk6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763456; x=1699368256; 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=LVt32BVhuMD6mZN5AcPveEcpa9SvvyPpVXag3OAT//A=; b=n2UrqPi8ml4+YUd4Yb/O66hMVabfbL92/xvkkI2fSOZUMyhdO0/xAQTkdRy6MKrf2s V/OgJo9s+kyOPNzu8w6JdRVBXosQ431wEm48HmYKyl8ovxK5JtCYBkRwvKILiCZRqHud Z0Qe6wDc6qzq0buyfWtGDe6W8c8b/iqzuC4+mBMnf8Yvw9QQCVsjqsOIdksegOQXJ3I5 b1w4sAPGLK39y61Ee/XQlZUsGcq93AI99GKQvTZaJZstt2hvTZT9qqRnCAD3GdtrERHA uCgDwfW0vaJJyBzKU2VupQjSzdjmfXt7TFYgKoZXHiNXx4tDMGIGSjPiDAgnPr0b0O3H lEVw== X-Gm-Message-State: AOJu0YxlXwEkKZyeqXozqGUonRfX2DXfiRbQgRpf81e6/Rtjxhns1mO0 1g8kbJp2Wr4V3DN8mwrN7Iuyzg== X-Received: by 2002:adf:f7c3:0:b0:329:6dbc:e9a8 with SMTP id a3-20020adff7c3000000b003296dbce9a8mr10352317wrq.8.1698763456591; Tue, 31 Oct 2023 07:44:16 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o8-20020adfe808000000b0031980294e9fsm1647761wrm.116.2023.10.31.07.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:12 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 532346572F; Tue, 31 Oct 2023 14:44:03 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , Fabiano Rosas , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 16/19] gdbstub: Check if gdb_regs is NULL Date: Tue, 31 Oct 2023 14:43:58 +0000 Message-Id: <20231031144401.1238210-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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: <20231029145033.592566-17-alex.bennee@linaro.org> Message-Id: <20231019101030.128431-2-akihiko.odaki@daynix.com> Tested-by: Fabiano Rosas Reviewed-by: Richard Henderson Tested-by: Richard Henderson Signed-off-by: Alex Bennée 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 Tue Oct 31 14:43: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: 739578 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1688420wrt; Tue, 31 Oct 2023 07:47:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKO4oGinvl8UwMW2S1+HLy/tgkCWNEp48Jq4LaJ0AlrU/d7wfUORjj2gWG0BbqgCEzRV2c X-Received: by 2002:a1f:1787:0:b0:495:3d9d:535c with SMTP id 129-20020a1f1787000000b004953d9d535cmr11550728vkx.4.1698763662403; Tue, 31 Oct 2023 07:47:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763662; cv=none; d=google.com; s=arc-20160816; b=Z4a+hB1sAkpgLObTPggIObctNSWIDZT3fVcMWeCqYM3lVK4b5QzIGgugB7ZS0cih/t mqprioV8NKO/QtIdOh0SnkxF4c2BDy3jkPJv9VGQfIQ2EGUfoV/AhreO2eozZTl4Kvn9 nsQmOW3rCqYq9DzTTYf95bA3HgfwDl2yubh6tAdn6J0zmGMlm0yfKUTms/tnBz0DDPkh pMUt7Khbq13ImH6qaJYyHpx6QCearu5xh81CBH0z9tcwxr37cMhU7I9dyU69bXEqsZ2k Oz+dHDxOtm+YJz9fq5Fa+wrBpf2BTmDCoPnmuzRiqYOLlZCdVJH6SO1skfNQLg8tN1Mz 4cyw== 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=1qbOhazxvRm+dj6LmIpa3iG/xAEISl7lgrvcn9urKP4=; fh=T34aL4dDb6pW7HFZVEwzWmjbo6Ml3Zgquw2siC7JNxc=; b=yXVJlIjJUqs8raeNue9o3BCvwkSaTrcARBvQ5iNYROa5V1aGmoA5Ut8Od00PkZrdgI EoYNw6Kbm63X5gcHyuh0cLTBLPKx/7IF90o5RbIzapKe0qezsyEDo+seYr5jh0Zw6+iR CuV1xdJi07RMt/L0Mjyw+aO/SPJIticxdypv+NZvgLI25lDCGnnkFTBTR7MXmwJAso2G a/Pe4IuScRkJzyO4LSU58Ih308HBaEqgDIMOpxBiPMuf/A51viKGIv8+CUeWAXD6eqgk gc/UgeGQmbB6blCgyfnotb8KIfhJpZaAqvjCFCrJATdpE7P5QDl3DFQDMkaHy4WLzwU5 Q8VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MKJItzpl; 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 f18-20020ac87f12000000b00418122a226dsi1203835qtk.159.2023.10.31.07.47.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:47: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=MKJItzpl; 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 1qxpyf-0004tS-IV; Tue, 31 Oct 2023 10:44:21 -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 1qxpyd-0004sN-Cc for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:19 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyb-0002Cx-O7 for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:19 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-32f8441dfb5so1691756f8f.0 for ; Tue, 31 Oct 2023 07:44:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763456; x=1699368256; 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=1qbOhazxvRm+dj6LmIpa3iG/xAEISl7lgrvcn9urKP4=; b=MKJItzplfXKlre/AAi14zwIUHJWWfDYieklHmTVLk7TEGgU74llGPnGsr7dYAtHkV8 v0SK+6hPB8MHVAhbTQtMtU5xO3cAEn9+V+pE0+oNjN2zSq+CHjQ3TqOuJG8r3+0MgpKQ ARiDRETpFqApPgXeBSmaZ0DxES1m0BYn18qp7KK6uZbAVG+SIieN6iObvmlNJZ0rJTWF 6LqX6ITudMRrNuE+bI4HSHr+6HMSdUk3jXt/+ZbH7CGT0f10R1oTu+ahrel0Wj450upM NRiJqWW+BcuEX57ycKYWpYhJsuIrzYL2eYze1ujheAZPlWa/dZMA+qEUxMxWDnOozust yRsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763456; x=1699368256; 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=1qbOhazxvRm+dj6LmIpa3iG/xAEISl7lgrvcn9urKP4=; b=nx95+v17e4fga53EUKRS7Mwlz2ElmGvHT7hTvE2Mn+oZBVWNOydPgBjpAuntYUHUbe RQFMLOGKgJrZPVl1WxnGH7xv6HAvfKPHatXE6+TfY+tvuJdE04jP68RbU0Si3Yj7OuTG MHgnHO5831vm00deUR6DIa7zD5SM98H/Uk5N6KsCvR1Fg9Iy4XN9jXwNkMNp4xrkQx1r UdGnRc3c+2ppjWK2g/q1RHu9gYIY5uX7JLkjYCbzLWzSKnyANSn59axZ4Dw9pEV5xHXM qsjAvQKjTSamiS7SU6DdAGYAqxRdM1o7Olz1qo9W5SsXhE3paLNI+fVNTESHXm41EKwS Bmpw== X-Gm-Message-State: AOJu0Yy+Qmm6aIZzgUnyQrBFtZkzDaUGvcVVFK2fwQv9HX75/3dBUTEt niQ8/QPRLOsWPTsRzxtIWbw1dQ== X-Received: by 2002:a05:6000:2a9:b0:32f:7cea:2ea2 with SMTP id l9-20020a05600002a900b0032f7cea2ea2mr9626642wry.17.1698763456291; Tue, 31 Oct 2023 07:44:16 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id g9-20020adffc89000000b0032da8fb0d05sm1649917wrr.110.2023.10.31.07.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:12 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 68AFC65730; Tue, 31 Oct 2023 14:44:03 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Matheus Tavares Bernardino , =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= Subject: [PULL 17/19] semihosting: fix memleak at semihosting_arg_fallback Date: Tue, 31 Oct 2023 14:43:59 +0000 Message-Id: <20231031144401.1238210-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 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> Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-18-alex.bennee@linaro.org> 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 Tue Oct 31 14:44: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: 739583 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1689954wrt; Tue, 31 Oct 2023 07:50:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5EKqM1jaRe4+GsuGEHkSYz/sZxsouz0PdKeQaLjJw/SCpSGmS7oyNgm4hoP4aLyzBjPB1 X-Received: by 2002:a05:622a:1910:b0:41e:4744:4b42 with SMTP id w16-20020a05622a191000b0041e47444b42mr18883991qtc.56.1698763855017; Tue, 31 Oct 2023 07:50:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763855; cv=none; d=google.com; s=arc-20160816; b=vEYtVrVPcrCLS93IMI1/gLyN1cIO5sjSiw2+vZPbgWH8YG4/oafcv0Tft7q5okSBQz a3x+74dCJT5RSuXA3t5bqappsDxUl5n3dY4wbQWy/F0W/IhZMM7Ghm5l28JF0hnmlgLO M4AnPJ8tvDXwh2LoOAvAQrcjgXUi/LhgBFzjTJwiPDZez8n197fASpjR7zX1+CRtTXio LbAGB2AWyX2Nl5roDzHN4T10aPkbk7ALfG8yR/U+pkq/6payIIRkwFxKEPpkfqz+Notz y+9lwMZY4IS1W/N0bZ31WTVNNMiULAscBSQDSXcRIwBoRtU/tnDbpCNEOR90w0VvKQmT 0ACg== 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=fxHSMYBWiTSk5NVD1xEg3KSvT3Ex+9zHygSFCiZHI5I=; fh=BA4mOxYmahrlypOdKOCdwmSiZeojxOGGShCWln9rROs=; b=RToGL/7/t3E1Y74RU4VdFK3QJX0KWY9sGuVEcd6W8XxbL2Wr5invpsxPaD3+66HOx+ tdO1IMNMOJ6fWW7CVRYP1ejgcjatIIAyOWsOYp1baE5QDnQzn/ERHUlcuBtbKi6KMpYz G8knandy3YtT4S/ogyQ0o+mTkG/onUCnQCiTv0ioTGUzh6+fO+De9/fduNkWZoZgL2T3 pgk8KeJVHOkV0m1CV7bNCUQZ6LMOx838UHQu3OZAy0PWZJdEx+zVnzOgQfBqfSAJ4FVS Fxkax2LH95S2GLdH6f81QwgFk/bdoJ3rtvi2nLFb8Gjf+uEL9VopsAg49HohIVsEajte CNow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zfOvebfE; 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 a22-20020ac85b96000000b00417a3aa1fb5si1210128qta.573.2023.10.31.07.50.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:50:54 -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=zfOvebfE; 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 1qxq4y-0003GC-Co; Tue, 31 Oct 2023 10:50:52 -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 1qxq4w-0003FT-I3 for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:50:50 -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 1qxq4u-0003QA-Mv for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:50:50 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40906fc54fdso45307105e9.0 for ; Tue, 31 Oct 2023 07:50:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763847; x=1699368647; 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=fxHSMYBWiTSk5NVD1xEg3KSvT3Ex+9zHygSFCiZHI5I=; b=zfOvebfEq2gjqh6KxCvhcxjECJZOoGUaLx4eDySJyc+zILBmWswMfrOENJonsHfDRX EXBUlYi7+r0/EMoyQ4yaT2cs/ZkpjjU0G8htZ04ROt7LVwohHdA+pPD/oMl2Qt4DihLR U5AOsGvjOwVmQm0ORNnzerty+yb3rtSJ52iJ8S1UkutB+wBEyeaH1o+3tcK2RHoyEQDq K2UAkyxNLkAiDnWyMwLJr9tZKl1vxBf+56p3wn9t/PDZdXGuFteHIyw6kEZxcCghImwy axHP4LvjyAlhb6ECZNcNPTPndTu/ggnM+R5EH3xsfHdX2U/YnXqZYDKYNONjjGrTl/T1 3+JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763847; x=1699368647; 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=fxHSMYBWiTSk5NVD1xEg3KSvT3Ex+9zHygSFCiZHI5I=; b=DyQ85zZpZJwEXNbwJZS1ea515qSD7JaRnQj4ufOdpq5wwhSQB1YXWpzs7os6BOI+9y k1IaEBuGan/VtVN6rtzobq/3yXyS6qO7MiNm0kywAkezo+2HL6zJxqB9zhHTUAeHreSI 0s/MPGHwqfmPsFkISAdXCxOHtklrYBAPC39v5IvqxavEqfbS/4RAGX0l6tPmm0uNcDyT Ooi3xW184OwEWLfPSjUfltNqRhFzLPLaSWZCs+6UOl6/qIgl30YwEFgZmKs8/99RSPiz abdmxybzSzXCtR8bmlZV4bmuetdsZmt0MNoU7E4DYh5bcg5zQyitofZeZtoMLCzHHOSo 29Ow== X-Gm-Message-State: AOJu0YwIqRMGZt9jw+B1ys3XmMOJEpZbitQJc+eGp/D8VXfA39plEjsw W1Wa75NGQlr38+ifQt73SbDvGw== X-Received: by 2002:a05:600c:1d07:b0:407:8317:ad81 with SMTP id l7-20020a05600c1d0700b004078317ad81mr11622791wms.1.1698763846831; Tue, 31 Oct 2023 07:50:46 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n12-20020adfe78c000000b0032f7eaa6e43sm1662612wrm.79.2023.10.31.07.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:50:46 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 79EBA65731; Tue, 31 Oct 2023 14:44:03 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Paolo Bonzini Subject: [PULL 18/19] plugins: Remove an extra parameter Date: Tue, 31 Oct 2023 14:44:00 +0000 Message-Id: <20231031144401.1238210-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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 Message-Id: <20231029145033.592566-19-alex.bennee@linaro.org> Signed-off-by: Alex Bennée 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 Tue Oct 31 14:44: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: 739584 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1690042wrt; Tue, 31 Oct 2023 07:51:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGIBpgEhKaUCHc3aDBatREnyHeQ+ymXnBndCsXzvZ/lMcnKmk+94cJU/rFB5xY/xB3bDYzz X-Received: by 2002:a05:6830:20ce:b0:6bd:836:4fc2 with SMTP id z14-20020a05683020ce00b006bd08364fc2mr14230067otq.17.1698763868437; Tue, 31 Oct 2023 07:51:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763868; cv=none; d=google.com; s=arc-20160816; b=CkVDuVbivL2GBMQ9F1Gvd9vPnVX0rJLkHUjoqNKdbvAMEe4TtX3rtNuGnqrBb5tTM/ TqirO3z5AsM49E7awtLsoW3vz9O45UVT68IPvk4Yc4pqIBq9RlPF3842YFUTqIgTmGTD O84eKSXcEataaNPhsTYw5QI2wMA6Fa/Nqn9VNprDlRfLXqmaRSxCzdjqtJqWc1cYy+Q3 mdPdL6r27U8Dtd3PkOfdUj+mktV8VnAmdz+yC1MP9HRDuFM9zMUl2D1TiD2cXouMAnvi 2YL4rf9EQWziafjgWGko8OYlUtZwOGCiuOeIe84cwMiQSRCQCgZ0eEQrFV/aMWEQE+kA xh4A== 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=MskYzFDc1y3cPl8dtH4nowGz7t8WHCsbi7Qu2fzhCJY=; fh=AMG/uwHY8NZjIiAQRB4Izr6FUA03Ke3KLuwA6wGMuBM=; b=Yor0J+9BOEeZqL2vRCih8oO1H7s71JU2bdtDSOykXeQDGTEKvlXinopY9+s7XlU4QQ HaUtEqhHJR3mYWncbVftiWgOYBpU5UsI5zhDrrMoBanCJJYiI3gRVRVxf9WuZ27QgPd7 v/7dF1rPqR2gfYnYlMo9f7S0Nya9Tig7RqPXtaslDu0JvVoi16lz0f3kA7ar1kPo6VLn pwmdc9hSIlbd7iw8yiAMiIIMAPK0+LAedVsEsL/OUygOvaERNP0ItlQ3n1ZzArQXGvCa CVFiR8CKlaQQqzYvYzQGXEcSsh0qpDYnweTFnP+LzZINAClTwahR17UO5OxW2F7AJChh IRNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B8VsjAaQ; 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 u20-20020a05622a011400b0041953bee755si1138058qtw.441.2023.10.31.07.51.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:51: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=B8VsjAaQ; 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 1qxq4x-0003Fe-K0; Tue, 31 Oct 2023 10:50:51 -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 1qxq4w-0003FM-85 for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:50:50 -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 1qxq4u-0003Q2-GB for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:50:50 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40839807e82so34526355e9.0 for ; Tue, 31 Oct 2023 07:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763846; x=1699368646; 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=MskYzFDc1y3cPl8dtH4nowGz7t8WHCsbi7Qu2fzhCJY=; b=B8VsjAaQNj9odKgWhUV6v41LMvAJ/FDX6GTdIW6DkoTVf66+ClEQhqfGMlaoMY7Q76 EOSK/owVNu5STa0P2444Xukj9w/cM/UeKJabhdrDUfNNJKYTTjs3tnLxnSBv+oFvZxZ5 bDXVuC0aVKWoMgtbHR2jVJn8A7dfWdo9rKMflM0jsdQftUdwTU9bD2ohLG/sRtHmQJ/6 9TeT1J/3ptOnJ7MCf1VEFdpQb0macQkf8sWbAC+MLRgrftOhF9vZjUvvxMaV7PGQYGQ5 w/FYOguzle6XDcnBMc1PYqnEQYm3yNLFl3zP/7OXCjb9XKQ4U5Pw/Zx9XrXcdgIF6sFk dB/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763846; x=1699368646; 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=MskYzFDc1y3cPl8dtH4nowGz7t8WHCsbi7Qu2fzhCJY=; b=E+zjL2ihAbfcB2Ul/BoEmjAufLFEnkDxXiqeL6lsxzbHrVwYabyl3zI/b3Kd0vzthK noCKF6XIIu3gYRCv3sunsxbdw/OGB8Mbfu5b3WizqB2jP43rh0qfCsmO002Y+cvuDReO 1Xl9IOEBteK9xpFJiUp9J+G1eCX05z9fFgNePuG61FwDDrheMJKJLidZYT8mRTozVpmt Z2SSrcBoN212T4xIO4Jgg6QWqabu4eEzz6D4WZsRGFCROvlADc7ZelPtMNwPxSXAmnmj QHGyBswvUY5A2LwpIb5pUfWkkUb1u0WbPFBIxD7MwJWRjtPJqXD5RgXDVStRuWD4hMx7 bVaw== X-Gm-Message-State: AOJu0Ywzk8VmsLPlZkpjmOUNXkmnKabLPTHHcjkQpT8rynOoxfiKyVwR hsYK2NLsLV8brEiJ6+geXtorIQ== X-Received: by 2002:a05:600c:5387:b0:408:33ba:569a with SMTP id hg7-20020a05600c538700b0040833ba569amr3584550wmb.8.1698763846521; Tue, 31 Oct 2023 07:50:46 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p15-20020a05600c468f00b003fe1c332810sm1965418wmo.33.2023.10.31.07.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:50:46 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8FD6665732; Tue, 31 Oct 2023 14:44:03 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cong Liu , =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 19/19] contrib/plugins: Close file descriptor on error return Date: Tue, 31 Oct 2023 14:44:01 +0000 Message-Id: <20231031144401.1238210-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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 Message-Id: <20231029145033.592566-20-alex.bennee@linaro.org> 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; }