From patchwork Tue Jul 26 15:20:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 593448 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b811:0:0:0:0 with SMTP id fc17csp3642263mab; Tue, 26 Jul 2022 08:22:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sc4fYAsmkbYQRhQCLWgebjwgMAkQVxNMq0GJLYd8uTSAK7EidwhL323SVFMxPTvdDvYk5i X-Received: by 2002:ac8:7d95:0:b0:31e:e0d3:60a4 with SMTP id c21-20020ac87d95000000b0031ee0d360a4mr14771964qtd.106.1658848948829; Tue, 26 Jul 2022 08:22:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658848948; cv=none; d=google.com; s=arc-20160816; b=V3uZPWsm/Kf1Las89Dhy11s695bdiuRl/yPOe9heZKKE4OCsWWH7tVPwmcaKvb8ZRX 3XtaxTbFgbtMBd4Xgo1Tv6XmtbG/6yKtgy+DzXTxC+x76ezAr8sqn+rU8fSH2pax67ky rb37YchsFJXTZEp08D4PpQ8MxF4Ts3/GWBD89DPjQ/KC5ihfla5kBg5gTEi9BA9qsbIy y6ypOhzLJEad3a01+jgrNlZ5hKv4D87rsv4g0R70AkyOuMdL/zp027XV5ZCRrL5VQJv+ ZH6tnsZhGwxP1P/aULFXg2EL+fPQsRSWBcLcS18mj48kxeLRO0B6z+3r5fuvVv6g3M6R 6H1A== 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:to:from :dkim-signature; bh=MAULpYRElXb/JnZHgFpotDF/VeeWBZVTrWblujY9hI4=; b=GRhf/duuYbD5MJsZRuT5PJ9JZPyn8cUXfWLg53kVjz62w7VDT6b9LBnD2xVDM13aSX MQeEJR0lR+TsHTLUU9XPSijcWGbRkVAM5Qbu46am8vEaKJjAuSxrc3BWlMqLszFkTJO9 2LfPMBb0f8kw3Ew7KxRVlgbRzLbTz8N09Jyg6qWyvHgTmOslQSxHy7lhP9V9Ucf7TXn2 92kZ6cke0QQdKsIgifmChN5Nmizk6l4xqvvAd98d1a1q+i6GOb3atlytWO0gwbuLqjWy 4SLddorwkvZJwWxArwJcCw1Y3rYV+Sho+mJuQBgBvkOcFe6Fs7WFvNxzqeLw2ERnyp2w VYMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GoGfcSZo; 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 fq10-20020a056214258a00b004702cb5ce6fsi9262208qvb.379.2022.07.26.08.22.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 08:22:28 -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=GoGfcSZo; 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]:34272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGMOC-0006OZ-Cq for patch@linaro.org; Tue, 26 Jul 2022 11:22:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGMMB-0006Nf-2v for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:23 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:44859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGMM6-00062e-DR for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:20 -0400 Received: by mail-wm1-x332.google.com with SMTP id b21-20020a05600c4e1500b003a32bc8612fso8356982wmq.3 for ; Tue, 26 Jul 2022 08:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MAULpYRElXb/JnZHgFpotDF/VeeWBZVTrWblujY9hI4=; b=GoGfcSZoxmH6tRjVbHuGdyzDkyLC7pfEo7cjdC0k86XdSXoRDOCvp4PLJ8BKRvHoZw v8rmY76TuW5hFNHkooLXzJIljNDDohx8bNM0v90PdZzLNVxDskRcNBm6f+hpJkU2zS2P EXCVTxneGqQazaoceWJGfmTNsTKps3YNSWq0CSXxFVW1uvPscOyuJlr/l4D4CekALQwe smys15L8Kum9/9qLFeYxgsDJZfKKy+pWzyQyjLYxuuox16Q6010JBWIi8GTCMN0T0M5p XtkrUHNyVyxeKXpOYpvi2GWS+gXJ4OexH68Fbbw9MrnjozYmTUQ4ogWDe3ZeFjTdDqgW gu2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MAULpYRElXb/JnZHgFpotDF/VeeWBZVTrWblujY9hI4=; b=YdfEZ1fUtK1IWo5uK7gBouXrdWt0qthiVlVfkFcWBZptm9EliRRxgCGIsp7Xl/EQQS GJMaX+MPYw4HuNabQaX021XsEIiBSIUiWDKh3uokDJ/yieG2sIDujK25TaZ3tQhereJj MZSnpBV+T9ZBi9UoeFlWJf/Oa/KVabQOWxDNSJGXDuBq0Lpksvdidz2nY0vpx4Mm7lr5 k0+XwPF1CSYEBYEyjh54IFJO94JeYVDk4wrE4HoAqiZSFuO1VYsZ9KzIXW9C/usPycko ZHEsbfTrhKYiJNnbZgcn2bw6AJINC0UWKee5dodxGCPjv0jmKEue/LikzoBBWV2YC02E 2Odw== X-Gm-Message-State: AJIora/exv5SLLkbjzMjmWNPFUZZlF+4ggGiAhKYMW0mqejWt1UazNKn DpB4B2b/zDTwCgrjJZ8Dmf5RtcRn8jPV4Q== X-Received: by 2002:a05:600c:a03:b0:39e:4f0c:938c with SMTP id z3-20020a05600c0a0300b0039e4f0c938cmr12290904wmp.145.1658848816399; Tue, 26 Jul 2022 08:20:16 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a1c2705000000b003a1980d55c4sm21932739wmn.47.2022.07.26.08.20.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 08:20:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 1/9] scripts/coverity-scan/COMPONENTS.md: Add loongarch component Date: Tue, 26 Jul 2022 16:20:04 +0100 Message-Id: <20220726152012.1631158-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220726152012.1631158-1-peter.maydell@linaro.org> References: <20220726152012.1631158-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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" Add the component regex for the new loongarch target. Signed-off-by: Peter Maydell Acked-by: Paolo Bonzini Message-id: 20220718142310.16013-2-peter.maydell@linaro.org --- scripts/coverity-scan/COMPONENTS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/coverity-scan/COMPONENTS.md b/scripts/coverity-scan/COMPONENTS.md index de2eb962416..a61d011d9a4 100644 --- a/scripts/coverity-scan/COMPONENTS.md +++ b/scripts/coverity-scan/COMPONENTS.md @@ -143,3 +143,6 @@ testlibs tests ~ (/qemu)?(/tests/.*) + +loongarch + ~ (/qemu)?((/include)?/hw/(loongarch/.*|.*/loongarch.*)|/target/loongarch/.*) From patchwork Tue Jul 26 15:20:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 593452 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b811:0:0:0:0 with SMTP id fc17csp3644371mab; Tue, 26 Jul 2022 08:25:24 -0700 (PDT) X-Google-Smtp-Source: AGRyM1smuOWTzuRL4HcwCGJKyMpE02+KRsvPqBALmBSfGhx0LPn05/ibHKyVHjJjJDaOTBh5/3kT X-Received: by 2002:a05:620a:4256:b0:6b6:63a3:7289 with SMTP id w22-20020a05620a425600b006b663a37289mr5822701qko.39.1658849124068; Tue, 26 Jul 2022 08:25:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658849124; cv=none; d=google.com; s=arc-20160816; b=Wy2zvs2a6g+vsdfRlQ3DxkU8s2+bVmUKwkUqfK80AOR5rrJIssbCCuuyC5G9DAJ3rq 5lze8AB3XIQBTcVSmEBJCfTD6Vs30ghodB5c4phrZxy8ZxpgmOGx5aQkD/eYYX8WF+mJ lSzugb77C5PjSfUG8oQAnZJl/Z1p/JtWJb+qBVCiDQTXi8wl9oXipZa/fnIfzwl3/bBj Je6MXYIVNikBf1QKUPoZFlcNhAN2xvfnZiDpdmMjAVM6Uk8ZZHZ2Q6brWe8BpAn0gEGa d7FfIXqZdap6cOoxdofpuBHCwk9jhYgerrqhPerVXG5ps6XDjEF4WDI6p52RzK9T1U8Y w/MA== 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:to:from :dkim-signature; bh=Ey2A/ataBvQCviganlANpFwD3PZb1j/1pS05PcMDR9A=; b=e13I+vCll/YcyA17URDFYGUWSHznI8r07OcxeyD9XWV6zbBXw6CyvlfVsUxco1n/Zs XJiFFw9zc6kXEBgS6r1R99tK42iaBz7HYBEiOz0rk20K1OghRgBVvHBz2I7sTEQxY0E9 G8ATG0hnUgYY0j/5nVDo5+U01G2KkiNwN5d82JF2RyNkoIa7Gagmq/Ld1ckVVmLmaV50 kVGWzArMOp8+vU16ELBbCTaY3Dy9AQVa0CI8t2wZu+/xV+kvFthYyDHkQTiZyw3WSYTl Woealq/2KkpZ5+PJ0F4cklKebvhD2PweABer1DTB1G/UDfu3mriYgWbRl32m/igXafF3 eGbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="oGYB/00/"; 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 f11-20020a0562141d2b00b0047356e43955si5694379qvd.333.2022.07.26.08.25.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 08:25:24 -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="oGYB/00/"; 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]:43290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGMR1-0003cm-Hc for patch@linaro.org; Tue, 26 Jul 2022 11:25:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGMMD-0006Nv-Dw for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:25 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:33489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGMM7-00062i-3B for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:23 -0400 Received: by mail-wm1-x336.google.com with SMTP id a18-20020a05600c349200b003a30de68697so1149631wmq.0 for ; Tue, 26 Jul 2022 08:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ey2A/ataBvQCviganlANpFwD3PZb1j/1pS05PcMDR9A=; b=oGYB/00/qxQ+aB5ZIL7hPc1MkryipGMmfiKR2ErMGJLSCj+s9nq/X6NGlPFBBew8hs kCvMAmA3oy8hFsLMWxC60ypvXeY5HnUdHt8KL7jNHwF2yeNu5S1AiOsSPhi0TlKNYfyq bGrGAI5AWsctMa9AfpQSpz5PX9II8GM4FKQFQCmLIsQESVsJhWSjxfih5Ys8Qz6T+yNp RNDWfC9Ed3Jbg2iPGztGlPOHvnj6UirXDnE2XzWjaQjTqZumBbUrKbz7ul09lKXzvmec J4p2PetrfJo3IhTYAPwz3OTKrIZCNPjgPoXq6QX/AE/yRKoKj08469TacJpXwqvg0e0I TrAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ey2A/ataBvQCviganlANpFwD3PZb1j/1pS05PcMDR9A=; b=mbVI9TT0qXvklL0DthSzgH1az+bWQOG9u5G/Tr+z7c1ePqXQwss/k7oNneJCEMT7QP ICnz4PS/Qz/p3Om/jd5EaGgGo0meIaPNXUTCIQm6WM/i4BlMOYyMbIkouhWCe+zsRX+Q Sg17FcOorHqwne4WnB7PErnvfTfvLgi0Yw/vTSB0AG+lmOebjWnz6XRSH16moF2V2V6x m0YkeD4jX4adwcq2yVlCQXQI1mbk8B3R+njBm4IQS0w6n8MZKFGFPwEn0llYB+ybLtLN idz1AhhdGVvilD2ygNr7Rji8un9SGbCRkrcB3HFPofbCglRkwM6HmAT1rPcymKzk3Adb KsCQ== X-Gm-Message-State: AJIora+1QrtRxDQxQH6syVcv3ixIslp8LrVgnCHL212UJivPiHYbwbT7 h2zgSIdRpTFyJK5kUTEQ5WPkISa5R5aLcA== X-Received: by 2002:a1c:3541:0:b0:3a2:e2e2:d80e with SMTP id c62-20020a1c3541000000b003a2e2e2d80emr12672473wma.184.1658848817427; Tue, 26 Jul 2022 08:20:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a1c2705000000b003a1980d55c4sm21932739wmn.47.2022.07.26.08.20.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 08:20:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 2/9] scripts/coverity-scan/COMPONENTS.md: Update slirp component info Date: Tue, 26 Jul 2022 16:20:05 +0100 Message-Id: <20220726152012.1631158-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220726152012.1631158-1-peter.maydell@linaro.org> References: <20220726152012.1631158-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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" Update the regex for the slirp component now that it lives solely inside /slirp/, and note that it should be ignored in Coverity analysis (because it's a separate upstream project now, and they run Coverity on it themselves). Signed-off-by: Peter Maydell Acked-by: Paolo Bonzini Message-id: 20220718142310.16013-3-peter.maydell@linaro.org --- scripts/coverity-scan/COMPONENTS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/coverity-scan/COMPONENTS.md b/scripts/coverity-scan/COMPONENTS.md index a61d011d9a4..3aad9cdfaf4 100644 --- a/scripts/coverity-scan/COMPONENTS.md +++ b/scripts/coverity-scan/COMPONENTS.md @@ -108,8 +108,8 @@ qemu-ga scsi ~ (/qemu)?(/scsi/.*|/hw/scsi/.*|/include/hw/scsi/.*) -slirp - ~ (/qemu)?(/.*slirp.*) +slirp (component should be ignored in analysis) + ~ (/qemu)?(/slirp/.*) tcg ~ (/qemu)?(/accel/tcg/.*|/replay/.*|/(.*/)?softmmu.*) From patchwork Tue Jul 26 15:20:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 593451 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b811:0:0:0:0 with SMTP id fc17csp3643169mab; Tue, 26 Jul 2022 08:23:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t9GAw3/LY2SwIauQ0YTtIRwDo92Wr4VoWL/rutq3kGNA/dzixzzs1ung4IVSP1Kj3nkM4m X-Received: by 2002:ac8:5a13:0:b0:31e:e59c:5cd8 with SMTP id n19-20020ac85a13000000b0031ee59c5cd8mr14850691qta.681.1658849027379; Tue, 26 Jul 2022 08:23:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658849027; cv=none; d=google.com; s=arc-20160816; b=SKwjMzGs8J27/wv7ZvOZVKvIYvVsLICgEy0r8oqg9QBNP3gy0F/zcIfkcFo2x6Y9wE xQJgP5KKFJrpbG0SvUf8phmXOgPwSVOyZ17UpYgsCaaU+ivqKDR6oiG2tRcXF1xR5LtE TqftpnhoiEY1wXQh0aSYoU72X/VfkW1HL7fLFmyKEYlCWNeJ0P6+fIECH059vAI341AA qE/ZF8aoVxZwTq3YMrlgwL0HmVkLMVAxqG9wYLzj/cS7j4DJSi1hYnDsKKCdMxg1XO1e NflZLPCaoYQsQRTM+QOLI6bE+D8fT9x2phzZ+YR9qq1oC3c+T3TDwT+RcBM7lGvBngI8 NzIQ== 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:to:from :dkim-signature; bh=7vIR8LJZ8u7IRlc0GXx+4QrCXzRdLBy6u8yi1hPp0UE=; b=R+x6+0Hbk2t3V4dxOeqNIT8nm2z5lkjAW/kH1xWr7IKxlyzZUieRClS+LaM6rCtW7h TwRDEfcZ3QywjBNxjVrhJ/fl/14DJEci9vfb15amN1ImzVKmOSkDSfRmIp8t0D21j2AR MPy0oMiUH7ictZJcArbaH7vrTkRaQEj1Wi5/yIbpHaxe7qKx1/TVRTFNx9Q4OeWlZQc7 C4rmxHHHFW6imcaSelchKTc113gqb+m2FiaI028ghjHldCTAEJMsvcSBcwu1EoOq8lS3 agZi7H4oqB2YR6ysEiTCAanTf002zS6ss/ZkdJqoapq0f2p3MmTXEooYQ7euaKIIIxAj XKYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MHm2Y9BG; 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 de44-20020a05620a372c00b006af3d7a4cf6si9431540qkb.463.2022.07.26.08.23.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 08:23:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MHm2Y9BG; 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]:38138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGMPS-0000Ao-QK for patch@linaro.org; Tue, 26 Jul 2022 11:23:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGMMD-0006Ny-Fb for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:25 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:42686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGMMA-00062o-M7 for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:25 -0400 Received: by mail-wm1-x334.google.com with SMTP id 8-20020a05600c024800b003a2fe343db1so8366862wmj.1 for ; Tue, 26 Jul 2022 08:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7vIR8LJZ8u7IRlc0GXx+4QrCXzRdLBy6u8yi1hPp0UE=; b=MHm2Y9BGb19f84rVZb2skA/p8PswnjpAKEcDm/HX3MphLgTjxwtr3Z6rKpbTrZBjOw ez3wTBKUYBw2V55USDgxApOBj9CoC3yzH2iEBN5GgN+ZDCFvq4SsM0PoHwho5KWjShCj S2ek+Qp0H4zmLB4MAI83R9lMu8Ou8JeRQ3K2PIO1Wz+D1ckPHSUI25RwI4FFe5BNRQ2W oTkVZAHvjnecN20wlVy7Rn+zdWJ3m4Yc16KsTb3tbndXoLg9GRuzXCJ+pVDc52R+6iRo eAxtq5THi7gWBwqcrNZ//MHxCfcIuZjzwe11SYzLcrdGdKBGzqNhtoAdP7JWOvVkoAXi docA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7vIR8LJZ8u7IRlc0GXx+4QrCXzRdLBy6u8yi1hPp0UE=; b=S971ALgK/6BPzDuPrPsf8G7ZkKMnX+/l2l442cStq4aM8burI9TNln3X0usUzgvamQ QIwjA01QSKV2u4OcJHi4ELgn6V1V3G+IN3IWoNtRo5kZSuyKwLtbM3XHAkWc8j2QM6A7 Is0bSVONUPn+lfcXbIGYqBcE9CYPUpGoX2JtL2yJT1h6vLpkiLpJe8kkuf+HedZ48TSW 9jsv/Q8Crwx+qXX5xdcRAjG9FHaLtXdK4nV8r+MgzVuyPiaoeFCgxoGEyb47SFXiRMAs /VuG46MJnH1nx8fZCan+uk3yAwiMYQRli4QlrtJuqJfE9BLtpJQ4n9FIvhOQn2d6fZJh +9Og== X-Gm-Message-State: AJIora8BbZIlDtVmPpoyqBIDkvaWVaUKPxOiwZbYFjQRawUNqGOuKlPR 6OakzkY1R/+Rvb+40ZUdpATE1jLzxq3/Jw== X-Received: by 2002:a05:600c:154a:b0:3a3:2fae:9bae with SMTP id f10-20020a05600c154a00b003a32fae9baemr13072029wmg.23.1658848818355; Tue, 26 Jul 2022 08:20:18 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a1c2705000000b003a1980d55c4sm21932739wmn.47.2022.07.26.08.20.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 08:20:17 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 3/9] target/arm: Add MO_128 entry to pred_esz_masks[] Date: Tue, 26 Jul 2022 16:20:06 +0100 Message-Id: <20220726152012.1631158-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220726152012.1631158-1-peter.maydell@linaro.org> References: <20220726152012.1631158-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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" In commit 7390e0e9ab8475, we added support for SME loads and stores. Unlike SVE loads and stores, these include handling of 128-bit elements. The SME load/store functions call down into the existing sve_cont_ldst_elements() function, which uses the element size MO_* value as an index into the pred_esz_masks[] array. Because this code path now has to handle MO_128, we need to add an extra element to the array. This bug was spotted by Coverity because it meant we were reading off the end of the array. Resolves: Coverity CID 1490539, 1490541, 1490543, 1490544, 1490545, 1490546, 1490548, 1490549, 1490550, 1490551, 1490555, 1490557, 1490558, 1490560, 1490561, 1490563 Fixes: 7390e0e9ab8475 ("target/arm: Implement SME LD1, ST1") Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20220718100144.3248052-1-peter.maydell@linaro.org --- target/arm/cpu.h | 2 +- target/arm/translate-sve.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index e890ee074d3..5168e3d837e 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3387,7 +3387,7 @@ static inline uint64_t *aa64_vfp_qreg(CPUARMState *env, unsigned regno) } /* Shared between translate-sve.c and sve_helper.c. */ -extern const uint64_t pred_esz_masks[4]; +extern const uint64_t pred_esz_masks[5]; /* Helper for the macros below, validating the argument type. */ static inline MemTxAttrs *typecheck_memtxattrs(MemTxAttrs *x) diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 41f8b12259e..621a2abb22f 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -529,9 +529,10 @@ static void do_predtest(DisasContext *s, int dofs, int gofs, int words) } /* For each element size, the bits within a predicate word that are active. */ -const uint64_t pred_esz_masks[4] = { +const uint64_t pred_esz_masks[5] = { 0xffffffffffffffffull, 0x5555555555555555ull, - 0x1111111111111111ull, 0x0101010101010101ull + 0x1111111111111111ull, 0x0101010101010101ull, + 0x0001000100010001ull, }; static bool trans_INVALID(DisasContext *s, arg_INVALID *a) From patchwork Tue Jul 26 15:20:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 593456 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b811:0:0:0:0 with SMTP id fc17csp3649464mab; Tue, 26 Jul 2022 08:31:59 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vIWVLG0wsl978ICIsHs8lx3u78Js+PXWcnxU0mB7GMiofc8PD3A2OAB0RVpnjMvMcQjhlQ X-Received: by 2002:a05:620a:4714:b0:6b5:f7b6:7d67 with SMTP id bs20-20020a05620a471400b006b5f7b67d67mr13119970qkb.469.1658849519254; Tue, 26 Jul 2022 08:31:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658849519; cv=none; d=google.com; s=arc-20160816; b=GVms/zlNz1SfoGoQUw1REeIndiuRDRIKuLa1OA5FiZ+2o8qlNTa0UXB0mvj2+y0KNc 4SO7dvQ2GzJHKlXSUxel/SJoHNvNeMaux8SNh9JwKeKeXJMK72Ke3dzev082BL2qdawi T5g+YNiP5UyR8SWOejmQBiHpAO7TWWcY6FqRBaOB8M8MAinT+lWymum2lP1gY1R99UIC rhoK5b5mpBeHAm6C2JNxNQpU1Mcl/0mD0EHKiKPHwgP+cOZmBGrMQhTRV2EBA7CGbsUJ MwktXv50RBoiOTyorFqJ4zjEtBMsKyq+rWjVMpIiw8PyEo+q9OvZMidKp+hqsQFQobSP 1yJQ== 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:to:from :dkim-signature; bh=N6+ztaKWxKiaj7O7Q3eQxFwJtwwHvO1y0ZcflvRK1lM=; b=ouLOymxLtheeWTyB4Lm6ta19lPxqOHXuzgWrO1+FMm1gD+iy0rtIgFaZpEFXfxnsZc 4Sp2w+92RsAN8vJG9OS1T81FH//pGVoxVrI5tTo6v0ctH3ftBSjGQuXdmfEy0R9KD3N3 5yQtvE5tlZ3bGmZK4beiqPTUQ8XjV6bLUj27vQ9T4H9NJ6eR5WEuNcSW5B27BUtsoPzL 1yQTr9Ah5Nr7yi96S6xNC4Q90uXRCzSi6U4x7ddCbgmoNhmSuZEKTLZbnJX4wRk4WSMf sWiS4cy3fdqyL2VXL9YtGwkNGbXngWS7w2sMk0AbB4UPp1JvIiExwnCouav6b91Wpjne Qsag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wNrUUwAs; 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 a9-20020a0562140c2900b00470aaf52e01si8319872qvd.113.2022.07.26.08.31.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 08:31: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=wNrUUwAs; 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]:56904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGMXO-0004di-Pm for patch@linaro.org; Tue, 26 Jul 2022 11:31:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGMMG-0006RZ-L2 for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:28 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:33603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGMMA-00062z-MI for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:28 -0400 Received: by mail-wr1-x42d.google.com with SMTP id h9so20667852wrm.0 for ; Tue, 26 Jul 2022 08:20:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=N6+ztaKWxKiaj7O7Q3eQxFwJtwwHvO1y0ZcflvRK1lM=; b=wNrUUwAse46VXkuSJN8mYTkeBG1xIHOQRiFbJagq9lof6c6db7UFjYGKpqdsiWq+lx jkq3rOW4M4jp5byJHbVouS1dbsqNO0eO+l39gVFaJ+Lr2F6b6whf5bblw2J0keFftOY7 L3EAdnxiK1H6aKRcCSkiFAc+FYJmDRZAO8o8KnoVh3hmrYMRBuAoCMAHq2HkQQXg+7V7 xYPmCbWlrRecp0+Lr1o+F1rLoNO8cLAPXfI//vubctRs80DMyVljOsv4/w/ERtyH/A1D uteu6p5r0Io39EgKMsyqOC2QoNm+4OjZqFCTM+lJ8Z5TPPgQ3MBIMtXK8CQtDO01OFod SQ+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N6+ztaKWxKiaj7O7Q3eQxFwJtwwHvO1y0ZcflvRK1lM=; b=NKzT3ivQ/hHsMfpHA1WdE0xRJTyyn8Yy01FV4eIWW8sipAuIeYe9U1MAX3Xik2o6SF dPpw/uD3a48/Dd9SmVEgB0jtZNpkSfSx1k0v+rVo8EtpnDyCposr81A1SeeSTeH9u5pi 33rF+/eztuC+C/YLeh2iBCPjFbuZhhWrEbvpWNregeMJls1H/LwnT34U2ouok4//A+Wc QX/LUTq78YY9hPeOu0pEP7laD1He9osR+koXpyM2A56wMIR3uBGcn45ASAezBNpiVbwG XuCEvxPbaEr2zb3x/FQdnfGz3tDr5++UnhwA2zcQqNLFaoZWSoDF8ghnfzYsRU9qfefM YAPA== X-Gm-Message-State: AJIora844a6s8J61UElFsbNUIKzSan5XTdjeSibtP6QztPz82UFCRMi0 G3Us5eN1WiPT2XcHWa8jNAMa53M5rzo2wA== X-Received: by 2002:adf:d1ef:0:b0:21d:983f:4b8e with SMTP id g15-20020adfd1ef000000b0021d983f4b8emr11595443wrd.334.1658848819277; Tue, 26 Jul 2022 08:20:19 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a1c2705000000b003a1980d55c4sm21932739wmn.47.2022.07.26.08.20.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 08:20:18 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 4/9] configure: Add missing POSIX-required space Date: Tue, 26 Jul 2022 16:20:07 +0100 Message-Id: <20220726152012.1631158-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220726152012.1631158-1-peter.maydell@linaro.org> References: <20220726152012.1631158-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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" In commit 7d7dbf9dc15be6e1 we added a line to the configure script which is not valid POSIX shell syntax, because it is missing a space after a '!' character. shellcheck diagnoses this: if !(GIT="$git" "$source_path/scripts/git-submodule.sh" "$git_submodules_action" "$git_submodules"); then ^-- SC1035: You are missing a required space after the !. and the OpenBSD shell will not correctly handle this without the space. Fixes: 7d7dbf9dc15be6e1 ("configure: replace --enable/disable-git-update with --with-git-submodules") Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Tested-by: Dr. David Alan Gilbert Message-id: 20220720152631.450903-2-peter.maydell@linaro.org --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 35e0b281985..dec6f030346 100755 --- a/configure +++ b/configure @@ -2425,7 +2425,7 @@ else cxx= fi -if !(GIT="$git" "$source_path/scripts/git-submodule.sh" "$git_submodules_action" "$git_submodules"); then +if ! (GIT="$git" "$source_path/scripts/git-submodule.sh" "$git_submodules_action" "$git_submodules"); then exit 1 fi From patchwork Tue Jul 26 15:20:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 593453 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b811:0:0:0:0 with SMTP id fc17csp3644544mab; Tue, 26 Jul 2022 08:25:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u7D8lHBLfXo9oqpe/1TJOuc9Yjku0ACIBXaqu7S37+zQogt2vrwsbZqNVDVFGOFYmey4v7 X-Received: by 2002:ad4:596a:0:b0:474:99d:e65f with SMTP id eq10-20020ad4596a000000b00474099de65fmr14838246qvb.63.1658849137068; Tue, 26 Jul 2022 08:25:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658849137; cv=none; d=google.com; s=arc-20160816; b=vuZHnl9hXfPP+TrS3elaqZFc8qaMt73XKYaZVpfn99KE+TlpG8cr7hg/A/QobKOFYr Aaz/8/Kh/h0nam+VdFfc5c1daPR5y1dvgFrcvUz7uXYhJ44i8ndCDcVwsQPazB5l5vaN enHa43f3sny7W8fED6dc0eDD66Gy8ODI4MZ31pOW7h3LvHq2+fi4PyCA2eLSsRQJxjdh JlRsIJOcA4klV7K3Z3Htvk4HbDpCeIjaE2ybTr0/LsSLlYK5hQ8myYpwzE7BNFdyTsuN OlNXHYmXj8Xaz8s8H76Mj0f5RNiCp1ieNDOA0o8NzE7T2uW3WHBg9ofG4A0u13afnpny +FSA== 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:to:from :dkim-signature; bh=4EXt2WFXE+cYyllwhs3b3h+DGb3HVin2P2P0aToXQ9g=; b=bBCsVFnJQgKhmCOl5LOFeflJ7ge7AOuE/KtuKvhFTKvCWnAptg+JCe9IDyNovW/m5v h4TJGVjONKrIN9sSNHOzFdQHj16TBYvgbHceb0zx4Nl+Db0e5OzgPEsKKnjAb6PNefER Q2Dan0AZfDtv+/ZekbYRy4AIoDlcArRDpEVdmRaVxKiqk+VDurIULCppFRm0sEDgIOHI ig3QecScM0EBrWBljlqgzO7vGNjw+aZTLd88JqTooEjOQXz5AdcpxdXS+NCyOXK8IHjx f2Lveo54NCuDO8pCY1/VYmxCEM0cWGL4ou1CqsLvWVOSRt53GHTl3n89loRVy3taYmHo pFLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NQnkdnNN; 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 c5-20020ac87d85000000b0031eced89afdsi8249903qtd.517.2022.07.26.08.25.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 08:25: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=NQnkdnNN; 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]:43688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGMRE-0003sR-K5 for patch@linaro.org; Tue, 26 Jul 2022 11:25:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGMMG-0006Ri-Ov for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:28 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:39849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGMMA-000633-NE for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:28 -0400 Received: by mail-wr1-x42d.google.com with SMTP id d8so20534592wrp.6 for ; Tue, 26 Jul 2022 08:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=4EXt2WFXE+cYyllwhs3b3h+DGb3HVin2P2P0aToXQ9g=; b=NQnkdnNNOpifRbydF7sNu+aOYdbAErmwB1+i+S/ZluHU1e+gQ2UKskz6Z3sl5ohs8F c71b81H5X+/9klDtwv8tnWwuDJ0E6FiQYRAVRydmv0N6CYhxzWxTBAitc3HULva2Tr6e XG35INE9hc4rVUTgJXVAU79EWDIx8a4dCNfgFWx7y9xZbmUCcdebEI1BsKZP7zQvWItr M8ewAv99rM5YBe9vssrxWsElTgrX18GW/r779s9hkSOCPCWWfdKtrU1G7uw/ZMu8EwGH jhMArMVKOgZYVK0ZKTmcwg6b5a0ssaTvvZ9g5jCmwMM2RxGhfiX8OtJQMRn5fAnmvLRQ ehmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4EXt2WFXE+cYyllwhs3b3h+DGb3HVin2P2P0aToXQ9g=; b=dcc4V8Gb2CAxEKVej/TOubK2C5XX1HFCUOopWUiF8e5MQHLlyodZ3hciaIy7dC/xhh 0Ej3nxsX/ylqBYdix4MA+0V6rTO5xenk94wwbGLmhiLaAJi4kYr8wopvQNoYus9te4Yy HlIiyN1jzRwzRW+5GW2p9rgz1ioerV5KGMiK2c4knjXrvbDqAYAdF95l8QEDQjz7Lg9w 8xF68idjk1p9K8XC77NRvYMLlMJeTAz96vwhgvNKyTj9GlfrugMvBCTwpPuXC+phkeXF rOuRrojfHY4gSLOJky4s0UPaz5SEvrA1puEyqFpkVnmA8N1mh1GQ8nK7lIadjYSVd1CM CAxA== X-Gm-Message-State: AJIora9pFm+RNlq2Ih4ws305Y7fILxuABrr2nVLVBNteh5Lz5fIKUc7t wKR93kfNqPVZfr2Xi1JtO0GWZDKT3iM8lA== X-Received: by 2002:adf:f807:0:b0:21e:5094:aeb9 with SMTP id s7-20020adff807000000b0021e5094aeb9mr11520016wrp.497.1658848820103; Tue, 26 Jul 2022 08:20:20 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a1c2705000000b003a1980d55c4sm21932739wmn.47.2022.07.26.08.20.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 08:20:19 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 5/9] configure: Add braces to clarify intent of $emu[[:space:]] Date: Tue, 26 Jul 2022 16:20:08 +0100 Message-Id: <20220726152012.1631158-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220726152012.1631158-1-peter.maydell@linaro.org> References: <20220726152012.1631158-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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" In shell script syntax, $var[something] is not special for variable expansion: $var is expanded. However, as it can look as if it were intended to be an array element access (the correct syntax for which is ${var[something]}), shellcheck recommends using explicit braces around ${var} to clarify the intended expansion. This fixes the warning: In ./configure line 2346: if "$target_ld" -verbose 2>&1 | grep -q "^[[:space:]]*$emu[[:space:]]*$"; then ^-- SC1087: Use braces when expanding arrays, e.g. ${array[idx]} (or ${var}[.. to quiet). Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Message-id: 20220720152631.450903-3-peter.maydell@linaro.org --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index dec6f030346..a56c3d921be 100755 --- a/configure +++ b/configure @@ -2343,7 +2343,7 @@ if test -n "$target_cc" && # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the _fbsd # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386pe. for emu in elf_i386 elf_i386_fbsd elf_i386_obsd i386pe; do - if "$target_ld" -verbose 2>&1 | grep -q "^[[:space:]]*$emu[[:space:]]*$"; then + if "$target_ld" -verbose 2>&1 | grep -q "^[[:space:]]*${emu}[[:space:]]*$"; then ld_i386_emulation="$emu" break fi From patchwork Tue Jul 26 15:20:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 593457 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b811:0:0:0:0 with SMTP id fc17csp3652785mab; Tue, 26 Jul 2022 08:35:54 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uo3mIqZN5KziOycf/En2I6z1q/A6BZpV+veoIYWWXlpUKBEkSw2KcYdEVtrX1+UDUsLrF4 X-Received: by 2002:a05:622a:346:b0:31f:c40:eac0 with SMTP id r6-20020a05622a034600b0031f0c40eac0mr14716873qtw.326.1658849754538; Tue, 26 Jul 2022 08:35:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658849754; cv=none; d=google.com; s=arc-20160816; b=JKtwbuu1ed3gTnNUJ26jQjwcbTR0OOypSdUHdnyRLpqNzKIOVbLqtcBtR0cHsYBhg4 teBon8jl0L0OqGzzGuSF35pQljG1TP2zlPf0MmtVL71cv71uRqOHhvPad9rk0lx/a6+u TILLLeuv7gLwNoc71vg1QuliHM9B1+FxSnar9G9+5JUHEUTpj2LejZWQDHQd8qAR5GZS +0TaBJiP0xvEex+3VgdeufahgPnwSkFVoHRQjFDmWZBV0/Rsln+6XWyUMOPaAIwthoIn Uc3vchqDNXYbPByLILboyD1r1BoRcE661b/5nVtIFZVzpF85DbC9MfAJ/OJS/ylSUCcy PWMA== 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:to:from :dkim-signature; bh=J0a1TUw/2CURKscI5PXWjufgRvMWjB7jxGP1SOJi5DA=; b=AaFmB2p70h967K/37Eqzwgx0FOmBvnxgZZWkGrfu3M4CD99QKw+pDbeX2hB0Wh58gR 7o1bCDpGrBifGw04w744Ptg8EU50yq9v/5WkRLH2oqDG5dfYm6PmPIkoCElFtJXZsGRh ACaLiDAl65kAAGsb9x/wJAbRfc4nGhHR++OauUeKWOiPFYd+HnwB/OQJUsnBI3KQB72Z SfxsCSmouq0sLs69cgsD2cnMMyi2Kq0D2n4UACNvmX+inHCTmxQJa/WT8B1FZWYvBnTP xGDMH0gpkXUgjpygR2F9VwZ7F6QPJi9tq/DHkYfP3f3D7harrWjRHFZ1rhbBO+wh30e0 GM2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kh2gwuaq; 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 ff10-20020a05622a4d8a00b0031f386cd81asi3266652qtb.328.2022.07.26.08.35.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 08:35: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=kh2gwuaq; 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]:33378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGMbC-0007zX-2U for patch@linaro.org; Tue, 26 Jul 2022 11:35:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGMMI-0006SY-47 for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:30 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:41482) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGMMA-000638-MV for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:28 -0400 Received: by mail-wm1-x32a.google.com with SMTP id x23-20020a05600c179700b003a30e3e7989so8382367wmo.0 for ; Tue, 26 Jul 2022 08:20:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=J0a1TUw/2CURKscI5PXWjufgRvMWjB7jxGP1SOJi5DA=; b=kh2gwuaq4JLh1UtwejwEMiph+xjIKqDHxFqBox++bhgmq0MSXdEB86mQVBStVxi5cP g4XnFQfslrbLR2Hwi8i2BXBf35NvX9LcDYCdVupzv2x1pzDb4tiagdqywQsXLBBR+I60 FzClmtWAlUZpKXtBPtYxKsGMhgiy4IZlYZw2gysJYj7zDDvDMIqSBzm50U0UM+43mZBX H2Kyt5X+/DxlGnloZ0P/D06AImmdE82l0yoCNmfNRVTQyqm0GKBoK5hs3ma5EgT9jfTK AEjbFro9iiyxeNGUcLruWDniTlkHFESs/BMqlPXNudtfbiwXhWbv6lcPInh83fF6P3Jb svLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J0a1TUw/2CURKscI5PXWjufgRvMWjB7jxGP1SOJi5DA=; b=j/7MHnY/xK5FPFSLoEyitifBaR01xpzJnZUoevD3S/Kbc5uKvMu7bozB67EUi0/IHC JNmJB1vH9VQE1yWnxTvwIg4FVP0N+ofLOxNjdHURhCV9TLu0qG3QRLjuuNCNZXQ58f+i jDnXNheOff7Qj798VVzKyMYEFq/45ncAYhJC47HGSlQvavPm0o9PPisitykYSGhZGVHV sAOjHZx+gzGQC9c7DvGkVw852tIb4HycrVVvi7DgNzIN3o5hb/EYvCpGX4X2aAEmJrT8 V/blSuPT5Dx3+jo9/sER9myQ9rClAh8NTojFB6N03Pp5YTKEXQNwfLsSQTO0dkvw/MY9 g1zg== X-Gm-Message-State: AJIora+/IB/HyeeFzdhMyIS58F66ERKz8QSEY3gbloVlEU/dRNg82zrI MENPazqegFkEWUz/rqDLLsG/y8x1SBI6Hg== X-Received: by 2002:a05:600c:4e4d:b0:3a3:1fe6:6b20 with SMTP id e13-20020a05600c4e4d00b003a31fe66b20mr12679805wmq.197.1658848821268; Tue, 26 Jul 2022 08:20:21 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a1c2705000000b003a1980d55c4sm21932739wmn.47.2022.07.26.08.20.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 08:20:20 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 6/9] configure: Don't use bash-specific string-replacement syntax Date: Tue, 26 Jul 2022 16:20:09 +0100 Message-Id: <20220726152012.1631158-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220726152012.1631158-1-peter.maydell@linaro.org> References: <20220726152012.1631158-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@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, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01, WEIRD_QUOTING=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The variable string-replacement syntax ${var/old/new} is a bashism (though it is also supported by some other shells), and for instance does not work with the NetBSD /bin/sh, which complains: ../src/configure: 687: Syntax error: Bad substitution Replace it with a more portable sed-based approach, similar to what we already do in quote_sh(). Note that shellcheck also diagnoses this: In ./configure line 687: e=${e/'\'/'\\'} ^-----------^ SC2039: In POSIX sh, string replacement is undefined. ^-- SC1003: Want to escape a single quote? echo 'This is how it'\''s done'. ^-- SC1003: Want to escape a single quote? echo 'This is how it'\''s done'. In ./configure line 688: e=${e/\"/'\"'} ^----------^ SC2039: In POSIX sh, string replacement is undefined. Fixes: 8154f5e64b0cf ("meson: Prefix each element of firmware path") Signed-off-by: Peter Maydell Tested-by: Thomas Huth Message-id: 20220720152631.450903-4-peter.maydell@linaro.org --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a56c3d921be..c05205b6085 100755 --- a/configure +++ b/configure @@ -684,9 +684,10 @@ meson_option_build_array() { IFS=: fi for e in $1; do - e=${e/'\'/'\\'} - e=${e/\"/'\"'} - printf '"""%s""",' "$e" + printf '"""' + # backslash escape any '\' and '"' characters + printf "%s" "$e" | sed -e 's/\([\"]\)/\\\1/g' + printf '""",' done) printf ']\n' } From patchwork Tue Jul 26 15:20:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 593450 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b811:0:0:0:0 with SMTP id fc17csp3642267mab; Tue, 26 Jul 2022 08:22:29 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vVR49KTvIBzPkcwGVvRX1k/s4Nd1g0LYm3TGR7QenPQpVYIxcl0d8zENtyAidlXSNtuKD/ X-Received: by 2002:a05:622a:1c4:b0:31f:2881:5600 with SMTP id t4-20020a05622a01c400b0031f28815600mr14081517qtw.101.1658848948993; Tue, 26 Jul 2022 08:22:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658848948; cv=none; d=google.com; s=arc-20160816; b=BV9mvDJX5/Aj3gk7TamAUSAeeFKoTGjSGIaQi7KuOjxUzlzMErKGk/dLRU5gPQRsXG r+VmdIzaX6fvf9ON9uoJKNHdVH8tk54kBJxYzBkeGeK6OQAxPup6F22cX5s6v0yEyw/G tqzpWKCW+6gJDx+TwXRzFGkC5Gy9g7KK1aVyqMPlGAfVQ1vAbjgEzEAAdYqpKEM2wYpk pDM63rj5GT2xcS2iGVuqHDP6Jte2Hd+PvZ9cMT+HsIZreRMu4AVuhP34oKmdlftdN/C6 TV+r7NelxY1xmxpjeS6QWb4oHlL2npcPLlw4BQy9+YID2c5KYISondIRr0mekE1DVmlv KySg== 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:to:from :dkim-signature; bh=onmBEojmdX59I7Osh+OHhyJMsX/Lk+u4yvlTQZ7RGfE=; b=nnjNWC/RO2neW7hpUEvfoEkipixDF8eV5xbc5Jxovn2+A5ymqEX5x0YKa6aeyYY78m Rc5TkuuYg1fiP6rSpDTq94BLGveem3HNyGev9EcP/2WqSKr/5YY0LVUVGt1Zqd7r20sx a7/vR36OjB04gMLjkCdNJx6avnuWzk+tkyD/UIOEqP6jH65c7Fn6jlRhjf12MUMvxTcF 2J81KrOCdE7+e2fTIVWqB58tRg1ZPAnliF0lzveH0GrAivLpe3qJC1j4NC+Tob3WPTLz Ms/yu56HTadfDHzfz7Ora9PZJEJ7YNotsLvw5mMgQ4rj+H3PG4uuJ0M6Bl5xN33JhjNX ht0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V4KOAQEk; 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 x17-20020a376311000000b006b5fe5d7194si8234292qkb.169.2022.07.26.08.22.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 08:22:28 -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=V4KOAQEk; 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]:34412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGMOC-0006SF-JL for patch@linaro.org; Tue, 26 Jul 2022 11:22:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGMMF-0006OO-RH for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:27 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:55081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGMMD-00063G-69 for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:26 -0400 Received: by mail-wm1-x32c.google.com with SMTP id n185so8952791wmn.4 for ; Tue, 26 Jul 2022 08:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=onmBEojmdX59I7Osh+OHhyJMsX/Lk+u4yvlTQZ7RGfE=; b=V4KOAQEkjr9b907Afki63iSTKg5sSu7Qkc6Qeb41qx+LToQr339wnDO0ZNySLtg5po 0d3Fw/0cfsttNqZN55NnhaD20ivP3Voi3EMZ3dmCB9UKfTYN/lopnYQ+kDc5qK2qz3YP jmlGOSyg6r26Se7zGSOtRsjXjLR2MMxhKQ8RFglns1eWZpYYaKnQhT5FxugISnr2UThW 8zXA5HEnIRp/HAthmKK+RfSz3wdFBFupuJvLWG+2f9KEYrSxOqIPYvNqsaQ/KrlvAmU2 2a7Ckep3yFYDpmIrsRX/IWMK04GwcqrhpDclUOKK+HHRJfJUckEYZvgjPIS1Ar6LxGh4 GswQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=onmBEojmdX59I7Osh+OHhyJMsX/Lk+u4yvlTQZ7RGfE=; b=M8+5fRcDDWFaMBVcMXEhwMhv3IKRKRt8C9XGi8OM9kjbCrAGSysnPSPnoLPzI21Ut+ ur4FUrRXSQRWn7aTNwfmCVJPw9WEhWl+q4/relYrqznWIOK1+nEotuKxYHDV4elPMv0Y J/5qHE4J9FfYHq5byYHnifToB4zyAXZFxj68daMnRRdyBV0KV0p0CCIdT93PSSpZOTwx ujh4N4Y/TY3xhXsHtp9cosk/+4BHI64+aumUHSFtPWDJzyNYJz/ZafNO1ntkFv0kr6nD HGndDOTWQqA30t+s2014+nLWCmVZa/PoTsJY/D5N4lXkEUfg5H+WN+zdd28dg5OwQF9o T7Tg== X-Gm-Message-State: AJIora86toK+z+AtOSAnIXvoY5k1UsEXYxU7HLYmkh1kP4PO5kgc9f+K jw0Ll1I+2aOHEzVxx2aP+N4izVobqFDlzg== X-Received: by 2002:a1c:cc1a:0:b0:3a0:39b1:3408 with SMTP id h26-20020a1ccc1a000000b003a039b13408mr12406395wmb.157.1658848822040; Tue, 26 Jul 2022 08:20:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a1c2705000000b003a1980d55c4sm21932739wmn.47.2022.07.26.08.20.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 08:20:21 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 7/9] configure: Drop dead code attempting to use -msmall-data on alpha hosts Date: Tue, 26 Jul 2022 16:20:10 +0100 Message-Id: <20220726152012.1631158-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220726152012.1631158-1-peter.maydell@linaro.org> References: <20220726152012.1631158-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@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" In commit 823eb013452e93d we moved the setting of ARCH from configure to meson.build, but we accidentally left behind one attempt to use $ARCH in configure, which was trying to add -msmall-data to the compiler flags on Alpha hosts. Since ARCH is now never set, the test always fails and we never add the flag. There isn't actually any need to use this compiler flag on Alpha: the original intent was that it would allow us to simplify our TCG codegen on that platform, but we never actually made the TCG changes that would rely on -msmall-data. Drop the effectively-dead code from configure, as we don't need it. This was spotted by shellcheck: In ./configure line 2254: case "$ARCH" in ^---^ SC2153: Possible misspelling: ARCH may not be assigned, but arch is. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Message-id: 20220720152631.450903-5-peter.maydell@linaro.org --- configure | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configure b/configure index c05205b6085..d0e9a51462e 100755 --- a/configure +++ b/configure @@ -2251,13 +2251,6 @@ if test "$fortify_source" = "yes" ; then QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS" fi -case "$ARCH" in -alpha) - # Ensure there's only a single GP - QEMU_CFLAGS="-msmall-data $QEMU_CFLAGS" -;; -esac - if test "$have_asan" = "yes"; then QEMU_CFLAGS="-fsanitize=address $QEMU_CFLAGS" QEMU_LDFLAGS="-fsanitize=address $QEMU_LDFLAGS" From patchwork Tue Jul 26 15:20:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 593455 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b811:0:0:0:0 with SMTP id fc17csp3646747mab; Tue, 26 Jul 2022 08:28:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tavpJVSrA1hsMGUCfvHT3ElBefiuZCnfLaQ5ixuwH+8FxH4iuAYFC6QR94kOpk/iUHGBAc X-Received: by 2002:ac8:5794:0:b0:31f:34a8:8315 with SMTP id v20-20020ac85794000000b0031f34a88315mr10469098qta.360.1658849333675; Tue, 26 Jul 2022 08:28:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658849333; cv=none; d=google.com; s=arc-20160816; b=fM8ge9d89NXLbAIMQs4eDcuX1WMl+Wv9K9iUcoVzPZlco+hzzRaPXbxuQwK4+v20pT PllT9p2+hiMJS/m3td0/5Jfk+psVZ/ofvEd3yWmW4uWkTZBpvTkWFTA0dN38V/eDrdsY Qjd36qKil3nNdLKKbdhjZv9vVlDnoWCaiMaO1ZbT/GgoJGUo/mA5NtuM+fMKpedy+w6P m8EIhiQDm/wpjH6EllbLdD+nT8gOcRYZH3BzcVEhiLIc5F615p/VcaBj+NQzMP9hSr+H FR4T5PUquNN18UchZLftFLCs33A+kFJaW62AFvPRxS/sNr9p+DqLsAqc6abnkCL9iIkf aPGA== 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:to:from :dkim-signature; bh=0ZhXnkNY51Ak8uQsgToIykxdNgR1qaaFhrhnxOotnMI=; b=Ijaq6JO+MPf396K9JWU/oQTcxcROsMEzRqNZG0aCQVSlDC/TtuAFL6Znoxfvw9jrVq mnnKEYwBEYPyFs549qXhmosqKTs5jrTvELox+C5gB+Qip1B8ng+9dGssTGL5/anXule9 EX4E9ebc4fkgmX6JDEYLRKkX7bD9UMQTkds12EHamhdFGSGEJ5ovBretAAhGmlbRKVM1 0XlUGEtoXYgslkRQV9hheNS0tgtF0VAsXyi5PZio+K6S1O2APjYQ+XkLVz6PEqiF4u3G c/rJoeS6UQCXs6a4xw0ZnoBPHx6OvhyCxUv5KRl7tpA7l8in2BvHE/rrSSTSwpj1sUa7 ro9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rlKTRKlL; 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 gu4-20020a056214260400b00472ac0d3957si11537159qvb.198.2022.07.26.08.28.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 08:28: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=rlKTRKlL; 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]:51474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGMUP-0000pP-AX for patch@linaro.org; Tue, 26 Jul 2022 11:28:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGMMF-0006PO-O3 for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:27 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:38607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGMMD-00063T-6l for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:27 -0400 Received: by mail-wm1-x334.google.com with SMTP id f24-20020a1cc918000000b003a30178c022so11544509wmb.3 for ; Tue, 26 Jul 2022 08:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=0ZhXnkNY51Ak8uQsgToIykxdNgR1qaaFhrhnxOotnMI=; b=rlKTRKlLGVsfdBXWgsR/5GtJeUTDisi72aya2fNJ8tgPWRzxVvuCewl1dguEjHMrN7 chjVcTfB94EWhHRbi0aHVKrNMRf1+9HoWXKPwoe9mD6G42dpR5O7prgwaSucfqivkCMx 48fUQuZ6VO/yf68iYzUfRCGOm6XBsN3lTopzG6PPDZY3lPloySQS9592JZ9eLGNz1/52 vVkBelkH+itmNIWwtZ3hglwi8u3hfZj9IgLWK6PpWz9Wvv7qPK0I+UhXlgFYOlLwx2wE wC20s9/OpEON6zw04f1MCVwmp2sGnsAgYVJnhIOLD4blq1d64B1KcxEaa1AhgaJ7eCVX usiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0ZhXnkNY51Ak8uQsgToIykxdNgR1qaaFhrhnxOotnMI=; b=0xAKQzGevzyEzGyWf+KgjpVBhiIAXjoseGVMm7CuIxY9HTeWG/llyXPo1q9HT8JBmm usuec1RCjPPLYEcxjkMm1ESRmd9IeJhj3j56ZqPj9uiv9sSPf5nS9ed0xw/gBh/KPOtv 47vV8ZkoUhQ6YHqr4gjPCpNCz1Et2Btr6JsP5C1PGKDGsppZ7dutbFZaciPeWX0WVkJg DH77UICv5AjY+ugvSvjm/9wKKWIfxS1k+GymjhV6mO88GVM0z1E4tzgJ621kQ1IVf7kL Zw3J912ldACDyWnFPoFEdtxSw8ot/7lnGRKC1Q75AMkl1TfvD1tWMC/n5XYA3TelvqJ4 24zw== X-Gm-Message-State: AJIora83lpPhIovOvAC/lrx/qW9+uM6idtm2oHINvW+LXNNxMq9AXvKc ujN7fF44KCjN0mnVfUcB71g/Ru/7G8RnRA== X-Received: by 2002:a7b:ce8a:0:b0:3a3:1181:20ae with SMTP id q10-20020a7bce8a000000b003a3118120aemr12119396wmj.96.1658848822869; Tue, 26 Jul 2022 08:20:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a1c2705000000b003a1980d55c4sm21932739wmn.47.2022.07.26.08.20.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 08:20:22 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 8/9] configure: Avoid '==' bashism Date: Tue, 26 Jul 2022 16:20:11 +0100 Message-Id: <20220726152012.1631158-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220726152012.1631158-1-peter.maydell@linaro.org> References: <20220726152012.1631158-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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" The '==' operator to test is a bashism; the standard way to copmare strings is '='. This causes dash to complain: ../../configure: 681: test: linux: unexpected operator Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Message-id: 20220720152631.450903-6-peter.maydell@linaro.org --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index d0e9a51462e..2c19329d58c 100755 --- a/configure +++ b/configure @@ -678,7 +678,7 @@ werror="" meson_option_build_array() { printf '[' - (if test "$targetos" == windows; then + (if test "$targetos" = windows; then IFS=\; else IFS=: From patchwork Tue Jul 26 15:20:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 593454 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b811:0:0:0:0 with SMTP id fc17csp3644591mab; Tue, 26 Jul 2022 08:25:40 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vY8zRep2lxAXkGnYJmOvcoq2BNpWMeGBLUcDoY+k/BTGHQhuAcWXpOFUvDypZWKaNozLvF X-Received: by 2002:a05:620a:46ac:b0:6b6:74c:6b53 with SMTP id bq44-20020a05620a46ac00b006b6074c6b53mr13616530qkb.620.1658849140578; Tue, 26 Jul 2022 08:25:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658849140; cv=none; d=google.com; s=arc-20160816; b=ISXPHSUocs5RbuAPkjiHWPG4Tgw3+JjLMuGi3vUiuwu4hr0tYf9qLJpMEz31F2YDIR cJDxbCpwn4MDUUmDHSjiAIqve2Ymmj/JcduKAcivQvsGbBXN8Bo10TsARYtpH8pANGHS lRmbFPr8+cE6Yae5cbppJ3GsHs0M5wkyIVsfWoVd7LJRecLOd8iJa8ruSgC5ek1AipZi HVTWZI7GZS5m0cC4w+2rmFLKszRMrvGVybUZcGPhXRStpTyw18q8kLsa1RALmTfV9OGV yDGatViWIk3T+EPPlqQpLXFbWjIqPBwJ/Gg4bfkr1PCOQ/ofJtYMvIF1fRiTRv3ntE7z RwyQ== 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:to:from :dkim-signature; bh=pjPZonZgIif23LZ1eMjprz1ddmRluH8DP+Iy9f6sgDM=; b=weM1PhXDI1bflkY86kqEWd8weWVYhyAB/4AMw6pMTZ7zLgeK+n7gAGK2vLWGgSLHtf cTGtAxW4f7oHh688/hgeGw/LVdEmwzMoez7KkgeLZpFWQl2HnBh605ZbTjHq2UuMRbPk fqB4mZGdNO07zmP3W3nb/MCSIOQNhz3KgcIdmGwRgkXRTbZRrPCEThWu6q6fgTlhPIfU SOtD9RcZyg/x7/YxufERj8RNGMhCl6rDSULyzzqGTtkkdaGgboKOrr12r4wpRlb9x/Tq RkhfbP0zGmoOZIHzLP/wvJ/wrFZVTAQD5dtaSGgUY/3e9VBGRxMujrpmOrm9L065VQBj ScbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=twyBhViC; 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 n17-20020a05622a041100b0031bf5ebaaf3si12257327qtx.47.2022.07.26.08.25.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 08:25:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=twyBhViC; 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]:43740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGMRG-0003uF-O1 for patch@linaro.org; Tue, 26 Jul 2022 11:25:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGMMI-0006Vg-Rl for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:35 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:51736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGMMD-00063j-Ey for qemu-devel@nongnu.org; Tue, 26 Jul 2022 11:20:30 -0400 Received: by mail-wm1-x32f.google.com with SMTP id id17so8962783wmb.1 for ; Tue, 26 Jul 2022 08:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=pjPZonZgIif23LZ1eMjprz1ddmRluH8DP+Iy9f6sgDM=; b=twyBhViCa3bdyDCbXVONj55ckcfmc3r4DYT7tfLNsRIkfzbCfJAKB/DzeVZh32s6zR O9u7FdQLu/U0wDycfsBBno2m4r9GotOpteYrkgvQG5giVR2lznftvE6j0fsr7GcXvXqP BnK31OchApsHrC6EEfAt22Ox5HB2qqu9/f4Aiob1x0eF54oL7r9kjpHn32L6rzCVqksK CGhpwq86ty127nqcoeU8JpX/WLszlqtwPL3yA67LlzsBCXlav9fnap7tJYmosW0udDwO A8u92dKK4W1NFyzvSRp6TjQMfUpjor0679LByECHoTA8voddhZwcWcTl0HmQyVa82Pms 1CZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pjPZonZgIif23LZ1eMjprz1ddmRluH8DP+Iy9f6sgDM=; b=ebI6dJfD4Bdl0Md4M/LAMW2pLl95wVEcZkL8gI+uJGYoj2fESlAAXXiWWdAtybFzNl 1W9zsHoKUn4sCBAYUnagkg+l9PS/BtDe6YIg/ahxjHuXajzHaF2C2ShU0+5O9NL66OcX oN8vhC7Te2tUQm5101CbHRtuifcDi6L58UgN5W9aS5vqGn84vxwMsj404kio2kx00sQJ 5LMO+P4OJZ0Q89Alpy0ka8IY20lCs3zatOKdgTiWBTTjQB6KAnC7Zw2qKzaE3czyfDoO 7ujUud9c42tG8tpDN7JdJww7aO5WtLu3NZ/70XwU8HfItuXMrdXGYbNom3AhLPKC1Fnl AaGA== X-Gm-Message-State: AJIora8tBdtx0KYBkqz+dBPpwoXHHA2NPoTfGxhCQJ5CMrS3+JKIXHgr LiiFxVAs6i/qZlm/dr1crOaoOzyDT3YV2A== X-Received: by 2002:a7b:ce0a:0:b0:3a3:1adf:af34 with SMTP id m10-20020a7bce0a000000b003a31adfaf34mr12306948wmc.127.1658848823710; Tue, 26 Jul 2022 08:20:23 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a1c2705000000b003a1980d55c4sm21932739wmn.47.2022.07.26.08.20.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 08:20:23 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 9/9] hw/display/bcm2835_fb: Fix framebuffer allocation address Date: Tue, 26 Jul 2022 16:20:12 +0100 Message-Id: <20220726152012.1631158-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220726152012.1631158-1-peter.maydell@linaro.org> References: <20220726152012.1631158-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@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" From: Alan Jian This patch fixes the dedicated framebuffer mailbox interface by removing an unneeded offset. This means that we pick the framebuffer address in the same way that we do if the guest code uses the buffer allocate mechanism of the bcm2835_property interface (case 0x00040001: /* Allocate buffer */ in bcm2835_property.c). The documentation of this mailbox interface doesn't say anything about using parts of the request buffer address to affect the chosen framebuffer address: https://github.com/raspberrypi/firmware/wiki/Mailbox-framebuffer-interface Some baremetal applications like the Screen01/Screen02 examples from Baking Pi tutorial[1] didn't work before this patch. [1] https://www.cl.cam.ac.uk/projects/raspberrypi/tutorials/os/screen01.html Signed-off-by: Alan Jian Message-id: 20220725145838.8412-1-alanjian85@outlook.com [PMM: tweaked commit message] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/display/bcm2835_fb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index 088fc3d51c5..a05277674f2 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -279,8 +279,7 @@ static void bcm2835_fb_mbox_push(BCM2835FBState *s, uint32_t value) newconf.xoffset = ldl_le_phys(&s->dma_as, value + 24); newconf.yoffset = ldl_le_phys(&s->dma_as, value + 28); - newconf.base = s->vcram_base | (value & 0xc0000000); - newconf.base += BCM2835_FB_OFFSET; + newconf.base = s->vcram_base + BCM2835_FB_OFFSET; /* Copy fields which we don't want to change from the existing config */ newconf.pixo = s->config.pixo;