From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616521008; cv=none; d=zohomail.com; s=zohoarc; b=PLaNoiiWfCTs5OpAbINhDbAVSc+AMftplOGS0lI/vcB87YS0291b/cYq2d5bV96LBB5hjPOM0YWgUTcaHzPqtIy5FqLHIZ022sUSjWTVU6IY2ePt7WS6c1DX6vJ9C+ssTUjwqH96GQ9xgBdQiO5GAqLBijn1/D8bRF3pV992yzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616521008; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SFKqwWA28mZoYIjZ0ZOK5EiDbcG9dnnim+9hGp91sS0=; b=GfCxW22h3a3Qn9Qz1E5JjKE7zbgTLk0dfOrkmb1TrCbhvQkIZMZ/60g8PXlPlTTGTa0o+fdRRrVEDupf2wB8n2KLqPVaqhKQOWW+KqpbCCm5+dPNxY2esQP3czoi7biFksX1btpMaGLAn+sKZdAIkltS5kz+Zh/xi72oB4Rl6X0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616521008974567.3666479037765; Tue, 23 Mar 2021 10:36:48 -0700 (PDT) Received: from localhost ([::1]:45116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkxT-0002Ao-PX for importer@patchew.org; Tue, 23 Mar 2021 13:36:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHK-0006jR-Gs for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:14 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:39864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHI-0002md-Ts for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:14 -0400 Received: by mail-ej1-x629.google.com with SMTP id ce10so28236160ejb.6 for ; Tue, 23 Mar 2021 09:53:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c10sm12870554edt.64.2021.03.23.09.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B72A61FF87; Tue, 23 Mar 2021 16:53:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SFKqwWA28mZoYIjZ0ZOK5EiDbcG9dnnim+9hGp91sS0=; b=WTW9MqNOXGNmMOd3t8aIoO0okHhcZF+wXpsBs3m1cJXi1+M2Fgt/2gOH6INSexNzeG YDFdsUVaUJctComUueN6iNpRfpLhLI7LnvyIjZ2soZtpL7CiVz3SAOKiyZf01P7QxDEA Yu0dDfKxOCxbtfSrSjE25dnrsP0rDuhy1MXKHV6daykeD9YZNorPCwZjPFamXBrA7hSR fP1tomMjoUF0FHk6HaMao41AemIlBV387/pM6wDNjR8JZJGk6HSrI3H8vXSRw8VCSU7f LExmwq3QgsoWFfyM8tUPaRgYoI7qGK7BMNpDVFjADke4pytkVa0fNgtcZbW3lUcVIvVP gl7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SFKqwWA28mZoYIjZ0ZOK5EiDbcG9dnnim+9hGp91sS0=; b=C0PaOIfaFx6RAJ27YJdHaftXeuUzM7s/XM9pz+yHlWbokJhmld6f+7kGh0H4fYwduC W5NZOCW2qzzSj/MPGyp2pbaB9ftb+LpbOReym5ysjgagpnaVegeTNQ1O3NU/M614Pp52 DuIlBViuQUds5gHGr5eQBhPX9uybqfwrZRNypmbu7dqYz2VT5UBM+eYF1FzZsL7JmX6P CeCd2XpJ36lzJLgR+O7EUKq+djReRHRYoUPxnMKCInHX0dyR8BVIv5oGOatNhS2r5QMo LjfxcotJtCEwaWG95E2m28DLzzOHTjnev2xvYLCnTT7C9Jf7r7qv57ZWCHFf2Hf+A9GG sTsg== X-Gm-Message-State: AOAM530d9OaC7Prhsx6ynk9Qon//tJS7PPQRroMy6SNVhL2fC8dTBzIX +XuLHN3JAr8eGiCqSHa3AYzmbQ== X-Google-Smtp-Source: ABdhPJxyPz/F4eFGeld+UmzLuwsV8Ywg3J8hC2gXSFZaicM9wF2O+K3MRJqJfNJYpM9/vqzTxuqJzQ== X-Received: by 2002:a17:906:3750:: with SMTP id e16mr5799198ejc.75.1616518390954; Tue, 23 Mar 2021 09:53:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/22] scripts/kernel-doc: strip QEMU_ from function definitions Date: Tue, 23 Mar 2021 16:52:47 +0000 Message-Id: <20210323165308.15244-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Some packaged versions of Sphinx (fedora33/alpine so far) have issues with the annotated C code that kernel-doc spits out. Without knowing about things like QEMU_PLUGIN_EXPORT it chokes trying to understand the code. Evidently this is a problem for the kernel as well as the long stream of regex substitutions we add to in this patch can attest. Fortunately we have a fairly common format for all our compiler shenanigans as applied to functions so lets just filter them all out. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20210320133706.21475-2-alex.bennee@linaro.org> --- scripts/kernel-doc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 4b19851b2d..240923d509 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1745,6 +1745,9 @@ sub dump_function($$) { )+ \)\)\s+//x; =20 + # Strip QEMU specific compiler annotations + $prototype =3D~ s/QEMU_[A-Z_]+ +//; + # Yes, this truly is vile. We are looking for: # 1. Return type (may be nothing if we're looking at a macro) # 2. Function name --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616521349; cv=none; d=zohomail.com; s=zohoarc; b=iITe1BdJ5OW2bvm2uQee8SKp5lgT7O7DrFbgGWQ2zzBz0gF29fPH3vUbTTiIscb96XOpEqxfrkAscZsVMpFTStw9SIvN8jrf5jddtLmgfyRWeiL5ITECyDYwtrhPNQX4iqC+MhbTGvpUKXcAHUnRqrYMjCKG9ztTTgGoW8eHgoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616521349; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=38YJNB9Ogff3zSddosbf0AluinWmSMypRv1mu6k0zgc=; b=L1rcBP8xLNE9A4mymXapm240wCb4VixRZcbqo05oggfY0z6AKFYeNVpnt/xpQ2yyUT8tcBXHBmgUhrW/2X5FY2BosRInV7pI4XAFfWnEJTRWyU4IpuvbCXTyuaYamK2+18uHKKYnxQo/dQ3722VUNj2hXy9bgq047rNwwj2Ep6k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161652134971674.56532672120761; Tue, 23 Mar 2021 10:42:29 -0700 (PDT) Received: from localhost ([::1]:53556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOl2x-0001Qx-0k for importer@patchew.org; Tue, 23 Mar 2021 13:42:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHM-0006oq-4x for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:16 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:42652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHK-0002oU-GB for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:15 -0400 Received: by mail-ej1-x634.google.com with SMTP id hq27so28247535ejc.9 for ; Tue, 23 Mar 2021 09:53:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v15sm13109264edw.28.2021.03.23.09.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DE3CE1FF8C; Tue, 23 Mar 2021 16:53:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=38YJNB9Ogff3zSddosbf0AluinWmSMypRv1mu6k0zgc=; b=RkRWSUyP3q3F5SpgkEp+FIa7rvEBp2LiWwLw71O4pZvphuKdjB4msRrMn+nxy+zVdi XTpjqM0p1pqjSn90IlDT5u9G32LjRRPenmMpDAu+rqyBS0QcpZAUcm0muFODpInYSor9 SKsjCjlh5op3YgAMg0NjKoWTPnQzMy6nhNNBteFR7Z+aRXE1dUk+rXOPATLs1SrzV4a3 MXA06+TIIdxs8z3U3++o9jZ9GKCGHf9wYiTTUUlLPcgqwFk9eOP1zf3tfBgBOrwL5kqM u/eIm6rfcKI1ElHknigK0PRZ6dGzq5+ogYm87dCQuolRODKxu9LtQ7Pl4h9cwttIWIkA /wog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=38YJNB9Ogff3zSddosbf0AluinWmSMypRv1mu6k0zgc=; b=OrnW1/B1EdiwMcN9rjJTVFU3q8uY2dxPxcP87O/H/NyHqti5KLGqdRSg8XA5raE+t7 8iaD/1OXvO5nxK6Pyf4Rts1SgvQ6wXU1hIsYIh2Xd3MDBNILm7b79ImB+q07YrLCpWKp /+tyG1tJAyvmENNFfjyn0ts0cGLaK5ta6VBcJY4aD7yOpLA1r16KbJCZL6uxSRXCwvJ8 ymE1rIes7fGMJXOUFbJZlZ3BXurzdthW9hKwVwzhJUG1o4XhsnCKKGQbejeFqOOfIzel NVOF3KywRZjAK/tR4YFE/VJp8eOUBAPi8d/Fud3+T30zLkO8Wu8i+H3D/j5uXENENzUe Nefw== X-Gm-Message-State: AOAM530YvxoRUCa8h6W2urPjzoWZebHawNVOvfAV3XBsKXK8IznHWWq0 3Pe4Xt/Db4z77pKIs+L9O+JS2w== X-Google-Smtp-Source: ABdhPJx/4PHuSOLP1+1u3dlXWwrgzqqTIqSl8uKQiHUiflkHg+RCX+11AytKMvlUHBTVzJgei+eKhw== X-Received: by 2002:a17:907:3d01:: with SMTP id gm1mr5925546ejc.214.1616518392968; Tue, 23 Mar 2021 09:53:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/22] docs/devel: include the plugin API information from the headers Date: Tue, 23 Mar 2021 16:52:48 +0000 Message-Id: <20210323165308.15244-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aaron Lindsay , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We have kerneldoc tags for the headers so we might as well extract them into our developer documentation whilst we are at it. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Aaron Lindsay Message-Id: <20210312172821.31647-4-alex.bennee@linaro.org> Message-Id: <20210320133706.21475-3-alex.bennee@linaro.org> --- docs/devel/tcg-plugins.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index 39ce86ed96..18c6581d85 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -63,6 +63,11 @@ valid during the lifetime of the callback so it is impor= tant that any information that is needed is extracted during the callback and saved by the plugin. =20 +API +=3D=3D=3D + +.. kernel-doc:: include/qemu/qemu-plugin.h + Usage =3D=3D=3D=3D=3D =20 --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616521356; cv=none; d=zohomail.com; s=zohoarc; b=gB0yrePjsmzkRYChMnWSA8chexJKL3HkKxbhcJUvfZ6WX/Guxbr0Eqi4iJEdha8lVXLHVYT4lL5zSSODJngS96MYM5j87XrizP85T3xPckcHvOE1ZOnSXqLQW9ySDR+09gK4aEzc7C9lJ4ZZd8Of0nQEYFjCksmQZ5Pt1Op1cRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616521356; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5VH/iDuZ8gOKK9M225cC8SQA1L/b8jfUqqAkjkoetSc=; b=CSkDl6eBm+Tq2SAT8DK1Ux5ml0xdbpLdKvKdmpThZ50HCy+3ZkGYyeHcTFC4HW5lTxWgBocFC3H78egiNnIgaOurnZfhqpVHjDCX+nF4K0QP01iIDthjlHIA7++yUet+8norH6EiHe7mP1xVv3jjjuBSfM0fQObpwRTfDVd8Ed0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616521356130253.49958919426206; Tue, 23 Mar 2021 10:42:36 -0700 (PDT) Received: from localhost ([::1]:53900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOl34-0001m3-RA for importer@patchew.org; Tue, 23 Mar 2021 13:42:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHP-0006yu-Df for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:19 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:41891) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHN-0002qB-J3 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:19 -0400 Received: by mail-ed1-x535.google.com with SMTP id z1so24294267edb.8 for ; Tue, 23 Mar 2021 09:53:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h22sm11379745eji.80.2021.03.23.09.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 181EF1FF8F; Tue, 23 Mar 2021 16:53:09 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5VH/iDuZ8gOKK9M225cC8SQA1L/b8jfUqqAkjkoetSc=; b=i2xImALxk25LiGVgYSL78aj4ZXbZzI0Opw3+bwkjnUFr1VJB0fk0xJ9rsSLw4hLKCj XGV68ovPnZfotNq9RIRVc6TpbdkXRWD7AC8cRUXrurZM7M/ZMed8ARxHX3E8q5Q8myhf Ff3xLJf+ob16woLSiRN/nyfTIF1AZsUJoASyQe6uD+3Oae8xFf6sEHvUVrJzniFX5H8/ uweWwVUf5/fz4Dm7F9GPKoXMpbJkW6k1WtquHWztv1ULXmH6stHvuW2isG6INLLuNg85 2JwxbCwJTz35vAhzCL3TampKoszYZBsaQljAb9goYATrW+wIcBUD9gL2ta4rrn24WSfy y6ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5VH/iDuZ8gOKK9M225cC8SQA1L/b8jfUqqAkjkoetSc=; b=CRFeHD5+ZSkqWOy1eHbSXgkTvCTAbi5GHhJbruCl1uv1JLJEJD1bu5YOKdT93Yo/dP LkyWi63BRIrMC0RzPxK1xpIoiOhSRMGt9Tr02EDAVyb4d2O0XpW6bs1KOg/0b9TALACU tFPC/ltJf+uI5hcdBAktfCxPJp8Sa5V3hqeYgw8j5rMspvcAjnvaXoQ5SZL7aictJ/kr a/fG3dctSRKpXbUU4JqhUXEHyu7R3nm8YpgbXZZPbo5SuWkarwbejOIqbcGvOqEc3OBv KlTZ76sK/uaSIhEBvDDSNFIyjFhcDmuD48qeAlUgXpL006fpFAdX1ck/DVsIoDRXPY/4 LExA== X-Gm-Message-State: AOAM532kwf4u7EK+Anlbx5grGf2ao0xWRL8q86ohdyzV1qZ8OUqdMYt1 OBgy+SnfNhJxSqTEsuKT9VtwRg== X-Google-Smtp-Source: ABdhPJzxYs8nSjR+4pdJoBU3du2mmy39wlXpU24+742Jr9KgjcC6Ll3MirX9SfXSJM1uYkH58SmmjQ== X-Received: by 2002:aa7:c88e:: with SMTP id p14mr5355908eds.119.1616518396199; Tue, 23 Mar 2021 09:53:16 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/22] docs/devel: expand style section of memory management Date: Tue, 23 Mar 2021 16:52:49 +0000 Message-Id: <20210323165308.15244-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x535.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This aims to provide a bit more guidance for those who take on one of our "clean up memory allocation" bite-sized tasks. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20210320133706.21475-4-alex.bennee@linaro.org> --- docs/devel/style.rst | 46 ++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/docs/devel/style.rst b/docs/devel/style.rst index 8b0bdb3570..260e3263fa 100644 --- a/docs/devel/style.rst +++ b/docs/devel/style.rst @@ -385,17 +385,37 @@ avoided. Low level memory management =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 -Use of the malloc/free/realloc/calloc/valloc/memalign/posix_memalign +Use of the ``malloc/free/realloc/calloc/valloc/memalign/posix_memalign`` APIs is not allowed in the QEMU codebase. Instead of these routines, -use the GLib memory allocation routines g_malloc/g_malloc0/g_new/ -g_new0/g_realloc/g_free or QEMU's qemu_memalign/qemu_blockalign/qemu_vfree -APIs. - -Please note that g_malloc will exit on allocation failure, so there -is no need to test for failure (as you would have to with malloc). -Calling g_malloc with a zero size is valid and will return NULL. - -Prefer g_new(T, n) instead of g_malloc(sizeof(T) ``*`` n) for the following +use the GLib memory allocation routines +``g_malloc/g_malloc0/g_new/g_new0/g_realloc/g_free`` +or QEMU's ``qemu_memalign/qemu_blockalign/qemu_vfree`` APIs. + +Please note that ``g_malloc`` will exit on allocation failure, so +there is no need to test for failure (as you would have to with +``malloc``). Generally using ``g_malloc`` on start-up is fine as the +result of a failure to allocate memory is going to be a fatal exit +anyway. There may be some start-up cases where failing is unreasonable +(for example speculatively loading a large debug symbol table). + +Care should be taken to avoid introducing places where the guest could +trigger an exit by causing a large allocation. For small allocations, +of the order of 4k, a failure to allocate is likely indicative of an +overloaded host and allowing ``g_malloc`` to ``exit`` is a reasonable +approach. However for larger allocations where we could realistically +fall-back to a smaller one if need be we should use functions like +``g_try_new`` and check the result. For example this is valid approach +for a time/space trade-off like ``tlb_mmu_resize_locked`` in the +SoftMMU TLB code. + +If the lifetime of the allocation is within the function and there are +multiple exist paths you can also improve the readability of the code +by using ``g_autofree`` and related annotations. See :ref:`autofree-ref` +for more details. + +Calling ``g_malloc`` with a zero size is valid and will return NULL. + +Prefer ``g_new(T, n)`` instead of ``g_malloc(sizeof(T) * n)`` for the foll= owing reasons: =20 * It catches multiplication overflowing size_t; @@ -409,8 +429,8 @@ Declarations like =20 are acceptable, though. =20 -Memory allocated by qemu_memalign or qemu_blockalign must be freed with -qemu_vfree, since breaking this will cause problems on Win32. +Memory allocated by ``qemu_memalign`` or ``qemu_blockalign`` must be freed= with +``qemu_vfree``, since breaking this will cause problems on Win32. =20 String manipulation =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -485,6 +505,8 @@ In addition, QEMU assumes that the compiler does not us= e the latitude given in C99 and C11 to treat aspects of signed '<<' as undefined, as documented in the GNU Compiler Collection manual starting at version 4.0. =20 +.. _autofree-ref: + Automatic memory deallocation =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =20 --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616521017; cv=none; d=zohomail.com; s=zohoarc; b=ZWUR6jkUNzgAOaKB9oMdyBmKjZaxaGHV9MIvpQEdp0mztCsHCn7uYGb1WMY01VzgUq/7MYWaOmnt7f4NVMti2OwtNEq85H8yoEcRwe31d9mGhYG1a5VxIpHfLii2QAAZIVleLZoyb3RVSLGFCbfEYQsK9/TOJmpOFR7s7996CVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616521017; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=adoaEeyH702QtvflbrtFYg4Hiq6sgiikmEwdr9S2R+w=; b=YojJ/WGwlzbrWAehzIPx9yCCb+S9AFcus5X4wOumUyV7Ndnqp2cP8/dACSX1njY7WxwS4cZDAdxVTWu7oD5fprPgkx97D64xtYhwqZGgvu0amoPpMD59TXmkoMbe6pfnfCF4cV8Y98XJkDbvpf/TtpgT2O7Jsq94RzmzdYRyuzU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616521017598741.9706218927253; Tue, 23 Mar 2021 10:36:57 -0700 (PDT) Received: from localhost ([::1]:45496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkxc-0002Ra-9d for importer@patchew.org; Tue, 23 Mar 2021 13:36:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHN-0006s3-5D for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:17 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:35561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHL-0002od-AF for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:16 -0400 Received: by mail-ej1-x633.google.com with SMTP id jy13so28214927ejc.2 for ; Tue, 23 Mar 2021 09:53:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m7sm12858471edp.81.2021.03.23.09.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 432011FF90; Tue, 23 Mar 2021 16:53:09 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=adoaEeyH702QtvflbrtFYg4Hiq6sgiikmEwdr9S2R+w=; b=E7wOd8lzFx0xMtDK+PuNP8FTlMU8GwMHVkOY+OX2Mqvbg72wogmApFrA/WNk30S5Fo fNQmq7tODBAUkOV2sM5wqba+7zvbF9/Mx58QQ8kbPNoOYBPL9BR2WHB6e/UQ+f5ZfnX3 i7nrZ3De19ElS3ma3zOZLKy/Yh47tMa+AjJrdylxL3TAbAkGu2a9VpqoZIttJHBFq38y 4E2qNhm98GD9/aik2ffNPSCVL3+4+HGwIXbgO79+uev1zKbLT3KFDWYBraha5Nr8lgQo IrDaQUU4Hp3MguTr91Lo57q2zPv6KHxWJxYb0rbQIxszUr0b2uotknqkta7bkseOWBAa io8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=adoaEeyH702QtvflbrtFYg4Hiq6sgiikmEwdr9S2R+w=; b=AaYH6FIqj7KT7zJExd9TNXS4g6pFtAbkhKWX3cuKRdhooIoN8Ci68pk1Uv1vugHEIN IErp6PuKLwlJiUYHRc1A98e1zUDz+IdqdocE2zslqUMSZ9q197yY4B1mqwyFvK5I1iF4 jSS9tyulhS/IZ4Hf6QrkY0zb/xBGM8pPNKIP0Tws626tsbEJdPHueE2UKIIDrsO75aJ3 N8e5ffujF3bsZuoF7KFggvAohgQCBun8wj/qI9GPQ37KyIwgQSMtFOx4i9MOUOFf+Fa9 6aG65rHLanW6o9epTyIegjKchr17rODwak+7EX3F5pIdFfTec7eN4xdXdMHsU5Y+PkDG YF6g== X-Gm-Message-State: AOAM53374UOrlRQ/OraJ8KCnhXCQCqWGm8mgxcrj4ovZP9mzuv5OT68h fYpKzVnMfULStLAwKAnPLVzvTQ== X-Google-Smtp-Source: ABdhPJzvbo4S0L4XYx8ciG2SEHqYDRjrIeEhg1NrhQtNEte6jmKouQS1HPiIGfUVfYQ912Ew8WNBDw== X-Received: by 2002:a17:906:379b:: with SMTP id n27mr6022199ejc.182.1616518393581; Tue, 23 Mar 2021 09:53:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/22] tools/virtiofsd: include --socket-group in help Date: Tue, 23 Mar 2021 16:52:50 +0000 Message-Id: <20210323165308.15244-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Connor Kuehl , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) I confused myself wandering if this had been merged by looking at the help output. It seems fuse_opt doesn't automagically add to help output so lets do it now. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Connor Kuehl Reviewed-by: Stefan Hajnoczi Updates: f6698f2b03 ("tools/virtiofsd: add support for --socket-group") Message-Id: <20210318100911.16261-1-alex.bennee@linaro.org> Message-Id: <20210320133706.21475-5-alex.bennee@linaro.org> --- tools/virtiofsd/fuse_lowlevel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index 1aa26c6333..58e32fc963 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -2450,6 +2450,7 @@ void fuse_lowlevel_help(void) printf( " -o allow_root allow access by root\n" " --socket-path=3DPATH path for the vhost-user socket\n" + " --socket-group=3DGRNAME name of group for the vhost-user= socket\n" " --fd=3DFDNUM fd number of vhost-user socket\n" " --thread-pool-size=3DNUM thread pool size limit (default = %d)\n", THREAD_POOL_SIZE); --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616521667; cv=none; d=zohomail.com; s=zohoarc; b=Wg1h8KayWzqLbQ2/zg2LpDKs0K3jDlzS9QwJRsYSyJRKhyl7b/9y9KEhrjH2F9PBWbVAhdJTK3+DZO+YzLwfymB9kYXC0W9S5zn/FN+rbuE2dZf93t5U6Msphv/7u4qH6313ejRG6nBhI5sjiFsAmAMRE4Xin2ikyu1kv5a8IcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616521667; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Jk5ERwGu56c2IAJn/MZ8IZ5ABY47KhRhfviVSUiHwKE=; b=hIIA91DhtbJauBxrS2PAbMDn22XnIod8uqC+W0a4US+0nXTpcvLJ1ZcRh8xO//gcnwc8Seaj7jHIRBcDQzKiXHCQYXfhCru7ATmTuP7Fr+YQ6gPeDX2Grs/A7/NnCusKgjQ00rBzbg0QpN+71hh+ajFjz4oKqu7+GmzHw4PYwNs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161652166758972.69764483982931; Tue, 23 Mar 2021 10:47:47 -0700 (PDT) Received: from localhost ([::1]:33690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOl85-0007c3-NF for importer@patchew.org; Tue, 23 Mar 2021 13:47:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHQ-00072k-SV for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:20 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:42654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHO-0002qw-FW for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:20 -0400 Received: by mail-ej1-x635.google.com with SMTP id hq27so28247830ejc.9 for ; Tue, 23 Mar 2021 09:53:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r17sm13251449edm.89.2021.03.23.09.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8C66B1FF91; Tue, 23 Mar 2021 16:53:09 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jk5ERwGu56c2IAJn/MZ8IZ5ABY47KhRhfviVSUiHwKE=; b=lqYfg/1LvWD0Uz0LFImxQ0Hif93zZ7J6GF4S/GZ7JXTar6JvnETiSPmrUOv98zyVUq ToKujwG9UuS3LiESttIcRLHhgEFj6oYK4A6glmVN16ExoIKzlcLFh2mSkUVYOlil4bHz DeKC/FpOr/x9FjT3oRDKuzRIwuJYm1k6rQ+sayhrb/GMd72P0xKcdhMRp6/IX3BK1175 qrsRUUJ6P+Zz247TKjCc9CBt+JELWVbFmNNlj89wP/jY2TXp5l/fMbySWmZscdXqTdWM n4Evqq6oGBKx8ZO4dTlQR75143KtbCOoKviJmZBz4WxOf+QXUUa511/UfOLLC0xxoWth rWzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jk5ERwGu56c2IAJn/MZ8IZ5ABY47KhRhfviVSUiHwKE=; b=gPddvCRiG/CdqKyOHHOxZs29YtHAYfr7SaqriUlnPXua/SLjJVwjbdhn/Ov4U2M3OT xfzWP1IxXMOdeJGvg3aMEvT/VER74wNoB+qRwZ6QU68pg6dq1ZKe5nnDqVIFFFaRt8qP dzohC84O8tF827v4lT5vIrS21bxSd26pRx6Tmg5kKluwtwspmXqhcs7xbyIwWnxClN0h rn8IruOPCnv9LbZF4GNXLInKstdmSXp3apsLmnoOIEVrMd6UTyA23MU/YjMt5e/hiw5A 3wgzSGKvnt+EKuvyncYeBfgdg9KxyqrcB7UD4TDIuo+1uF79YfUinBaCNXFkkVfsV8Bs V6/A== X-Gm-Message-State: AOAM531Lv2UCldsdOZGZpdysDf5urkdwh/sF2J14jEdg2u0XEaXS9dOm LQCxl1/DxiAV2flGCEg5TnOFRA== X-Google-Smtp-Source: ABdhPJxf8iZS3/TE4BHCWz1ub30tyT/uklwW8eyUycIXz4pUMIXR1arEz5+/OnYlTL7vGnQou98SCg== X-Received: by 2002:a17:906:688:: with SMTP id u8mr5707401ejb.38.1616518397061; Tue, 23 Mar 2021 09:53:17 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/22] semihosting: move semihosting tests to multiarch Date: Tue, 23 Mar 2021 16:52:51 +0000 Message-Id: <20210323165308.15244-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , "open list:ARM TCG CPUs" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It may be arm-compat-semihosting but more than one architecture uses it so lets move the tests into the multiarch area. We gate it on the feature and split the semicall.h header between the arches. Also clean-up a bit of the Makefile messing about to one common set of runners. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20210312102029.17017-2-alex.bennee@linaro.org> Message-Id: <20210320133706.21475-6-alex.bennee@linaro.org> --- tests/tcg/aarch64/semicall.h | 18 +++++++++++ tests/tcg/arm/semicall.h | 15 +-------- tests/tcg/riscv64/semicall.h | 22 +++++++++++++ .../arm-compat-semi}/semiconsole.c | 2 ++ .../arm-compat-semi}/semihosting.c | 5 ++- MAINTAINERS | 1 + tests/tcg/Makefile.target | 3 ++ tests/tcg/aarch64/Makefile.target | 18 ----------- tests/tcg/arm/Makefile.target | 22 ++++++------- tests/tcg/multiarch/Makefile.target | 31 +++++++++++++++++++ 10 files changed, 91 insertions(+), 46 deletions(-) create mode 100644 tests/tcg/aarch64/semicall.h create mode 100644 tests/tcg/riscv64/semicall.h rename tests/tcg/{arm =3D> multiarch/arm-compat-semi}/semiconsole.c (93%) rename tests/tcg/{arm =3D> multiarch/arm-compat-semi}/semihosting.c (85%) diff --git a/tests/tcg/aarch64/semicall.h b/tests/tcg/aarch64/semicall.h new file mode 100644 index 0000000000..8a3fce35c5 --- /dev/null +++ b/tests/tcg/aarch64/semicall.h @@ -0,0 +1,18 @@ +/* + * Semihosting Tests - AArch64 helper + * + * Copyright (c) 2019 + * Written by Alex Benn=C3=A9e + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +uintptr_t __semi_call(uintptr_t type, uintptr_t arg0) +{ + register uintptr_t t asm("x0") =3D type; + register uintptr_t a0 asm("x1") =3D arg0; + asm("hlt 0xf000" + : "=3Dr" (t) + : "r" (t), "r" (a0)); + return t; +} diff --git a/tests/tcg/arm/semicall.h b/tests/tcg/arm/semicall.h index d4f6818192..ad8ac51310 100644 --- a/tests/tcg/arm/semicall.h +++ b/tests/tcg/arm/semicall.h @@ -1,5 +1,5 @@ /* - * Semihosting Tests + * Semihosting Tests - ARM Helper * * Copyright (c) 2019 * Written by Alex Benn=C3=A9e @@ -7,13 +7,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ =20 -#define SYS_WRITE0 0x04 -#define SYS_READC 0x07 -#define SYS_REPORTEXC 0x18 - uintptr_t __semi_call(uintptr_t type, uintptr_t arg0) { -#if defined(__arm__) register uintptr_t t asm("r0") =3D type; register uintptr_t a0 asm("r1") =3D arg0; #ifdef __thumb__ @@ -23,13 +18,5 @@ uintptr_t __semi_call(uintptr_t type, uintptr_t arg0) #endif asm(SVC : "=3Dr" (t) : "r" (t), "r" (a0)); -#else - register uintptr_t t asm("x0") =3D type; - register uintptr_t a0 asm("x1") =3D arg0; - asm("hlt 0xf000" - : "=3Dr" (t) - : "r" (t), "r" (a0)); -#endif - return t; } diff --git a/tests/tcg/riscv64/semicall.h b/tests/tcg/riscv64/semicall.h new file mode 100644 index 0000000000..f8c88f32dc --- /dev/null +++ b/tests/tcg/riscv64/semicall.h @@ -0,0 +1,22 @@ +/* + * Semihosting Tests - RiscV64 Helper + * + * Copyright (c) 2021 + * Written by Alex Benn=C3=A9e + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +uintptr_t __semi_call(uintptr_t type, uintptr_t arg0) +{ + register uintptr_t t asm("a0") =3D type; + register uintptr_t a0 asm("a1") =3D arg0; + asm(".option norvc\n\t" + ".balign 16\n\t" + "slli zero, zero, 0x1f\n\t" + "ebreak\n\t" + "srai zero, zero, 0x7\n\t" + : "=3Dr" (t) + : "r" (t), "r" (a0)); + return t; +} diff --git a/tests/tcg/arm/semiconsole.c b/tests/tcg/multiarch/arm-compat-s= emi/semiconsole.c similarity index 93% rename from tests/tcg/arm/semiconsole.c rename to tests/tcg/multiarch/arm-compat-semi/semiconsole.c index 6ef0bd2450..1d82efc589 100644 --- a/tests/tcg/arm/semiconsole.c +++ b/tests/tcg/multiarch/arm-compat-semi/semiconsole.c @@ -7,6 +7,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ =20 +#define SYS_READC 0x07 + #include #include #include "semicall.h" diff --git a/tests/tcg/arm/semihosting.c b/tests/tcg/multiarch/arm-compat-s= emi/semihosting.c similarity index 85% rename from tests/tcg/arm/semihosting.c rename to tests/tcg/multiarch/arm-compat-semi/semihosting.c index 33faac9916..b3fd16cd12 100644 --- a/tests/tcg/arm/semihosting.c +++ b/tests/tcg/multiarch/arm-compat-semi/semihosting.c @@ -7,12 +7,15 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ =20 +#define SYS_WRITE0 0x04 +#define SYS_REPORTEXC 0x18 + #include #include "semicall.h" =20 int main(int argc, char *argv[argc]) { -#if defined(__arm__) +#if UINTPTR_MAX =3D=3D UINT32_MAX uintptr_t exit_code =3D 0x20026; #else uintptr_t exit_block[2] =3D {0x20026, 0}; diff --git a/MAINTAINERS b/MAINTAINERS index 9147e9a429..8249014614 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3284,6 +3284,7 @@ M: Alex Benn=C3=A9e S: Maintained F: semihosting/ F: include/semihosting/ +F: tests/tcg/multiarch/arm-compat-semi/ =20 Multi-process QEMU M: Elena Ufimtseva diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 24d75a5801..cab8c6b3a2 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -32,6 +32,9 @@ all: -include ../../../config-host.mak -include ../config-$(TARGET).mak +ifeq ($(CONFIG_USER_ONLY),y) +-include $(SRC_PATH)/default-configs/targets/$(TARGET).mak +endif =20 # for including , in command strings COMMA :=3D , diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile= .target index bf53ad0087..56e48f4b34 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -41,24 +41,6 @@ AARCH64_TESTS +=3D mte-1 mte-2 mte-3 mte-4 mte-%: CFLAGS +=3D -march=3Darmv8.5-a+memtag endif =20 -# Semihosting smoke test for linux-user -AARCH64_TESTS +=3D semihosting -run-semihosting: semihosting - $(call run-test,$<,$(QEMU) $< 2> $<.err, "$< on $(TARGET_NAME)") - -run-plugin-semihosting-with-%: - $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ - -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ - $(call strip-plugin,$<) 2> $<.err, \ - "$< on $(TARGET_NAME) with $*") - -AARCH64_TESTS +=3D semiconsole -run-semiconsole: semiconsole - $(call skip-test, $<, "MANUAL ONLY") - -run-plugin-semiconsole-with-%: - $(call skip-test, $<, "MANUAL ONLY") - ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_SVE),) # System Registers Tests AARCH64_TESTS +=3D sysregs diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target index ec95156562..5ab59ed6ce 100644 --- a/tests/tcg/arm/Makefile.target +++ b/tests/tcg/arm/Makefile.target @@ -29,37 +29,31 @@ run-fcvt: fcvt $(call run-test,fcvt,$(QEMU) $<,"$< on $(TARGET_NAME)") $(call diff-out,fcvt,$(ARM_SRC)/fcvt.ref) =20 +ifeq ($(CONFIG_ARM_COMPATIBLE_SEMIHOSTING),y) + # Semihosting smoke test for linux-user -ARM_TESTS +=3D semihosting semihosting: CFLAGS +=3D -mthumb -run-semihosting: semihosting - $(call run-test,$<,$(QEMU) $< 2> $<.err, "$< on $(TARGET_NAME)") =20 ARM_TESTS +=3D semihosting-arm -semihosting-arm: CFLAGS +=3D -marm +semihosting-arm: CFLAGS +=3D -marm -I$(SRC_PATH)/tests/tcg/$(TARGET_NAME) semihosting-arm: semihosting.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) =20 run-semihosting-arm: semihosting-arm $(call run-test,$<,$(QEMU) $< 2> $<.err, "$< on $(TARGET_NAME)") =20 -run-plugin-semihosting-with-%: +run-plugin-semihosting-arm-with-%: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ $(call strip-plugin,$<) 2> $<.err, \ "$< on $(TARGET_NAME) with $*") =20 -ARM_TESTS +=3D semiconsole semiconsole-arm +ARM_TESTS +=3D semiconsole-arm =20 semiconsole: CFLAGS +=3D -mthumb -run-semiconsole: semiconsole - $(call skip-test, $<, "MANUAL ONLY") =20 -run-plugin-semiconsole-with-%: - $(call skip-test, $<, "MANUAL ONLY") - -semiconsole-arm: CFLAGS +=3D -marm -semiconsole-arm: semiconsole.c +semiconsole-arm: CFLAGS +=3D -marm -I$(SRC_PATH)/tests/tcg/$(TARGET_NAME) +semiconsole-arm: semihosting.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) =20 run-semiconsole-arm: semiconsole-arm @@ -68,6 +62,8 @@ run-semiconsole-arm: semiconsole-arm run-plugin-semiconsole-arm-with-%: $(call skip-test, $<, "MANUAL ONLY") =20 +endif + ARM_TESTS +=3D commpage =20 TESTS +=3D $(ARM_TESTS) diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Make= file.target index abbdb2e126..a3a751723d 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -69,6 +69,37 @@ run-gdbstub-%: endif EXTRA_RUNS +=3D run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read =20 +# ARM Compatible Semi Hosting Tests +# +# Despite having ARM in the name we actually have several +# architectures that implement it. We gate the tests on the feature +# appearing in config. +# +ifeq ($(CONFIG_ARM_COMPATIBLE_SEMIHOSTING),y) +VPATH +=3D $(MULTIARCH_SRC)/arm-compat-semi + +# Add -I path back to TARGET_NAME for semicall.h +semihosting: CFLAGS+=3D-I$(SRC_PATH)/tests/tcg/$(TARGET_NAME) + +run-semihosting: semihosting + $(call run-test,$<,$(QEMU) $< 2> $<.err, "$< on $(TARGET_NAME)") + +run-plugin-semihosting-with-%: + $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ + $(call strip-plugin,$<) 2> $<.err, \ + "$< on $(TARGET_NAME) with $*") + +semiconsole: CFLAGS+=3D-I$(SRC_PATH)/tests/tcg/$(TARGET_NAME) + +run-semiconsole: semiconsole + $(call skip-test, $<, "MANUAL ONLY") + +run-plugin-semiconsole-with-%: + $(call skip-test, $<, "MANUAL ONLY") + +TESTS +=3D semihosting semiconsole +endif =20 # Update TESTS TESTS +=3D $(MULTIARCH_TESTS) --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616519583; cv=none; d=zohomail.com; s=zohoarc; b=lqGSk02TrPZm7g5WRVCa62ovZDC4yGCG2b2a94YxJnsKMJrfseOXfCwt9nwU31I2BGXtaObeyzeT/H0odM1+WqU8mDCSBYVAaQCstOqca5jnkCl+qhXWcPpokjIkbDPLEDQOAAvS01t/BrGpQw08eS84WHc2Ad54BFettwwLjdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616519583; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v3+N3f7Vb5LczvXguqdRK6CVvsl+Jz1NumKys/F46gk=; b=YhLEo3qrc49bAwS3ThpD/m28AJAcYIqTTjTEUccpUP5F/JdV/0B4JhABNbL239ikjUh6L1IpeWesHa8OKWEgdVcUss+E8k9cQWhjaRdI7Rp+g69Fvp7pC0iBbiY6wvpYALpU1aHtEn7uRrKxxDQab9qktqG1CIk+CEskSkL0ATM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616519583512294.4274754044725; Tue, 23 Mar 2021 10:13:03 -0700 (PDT) Received: from localhost ([::1]:41504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkaT-0006Ye-VN for importer@patchew.org; Tue, 23 Mar 2021 13:13:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHV-00079c-J8 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:26 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:43956) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHQ-0002sN-J1 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:24 -0400 Received: by mail-ej1-x634.google.com with SMTP id l4so28230808ejc.10 for ; Tue, 23 Mar 2021 09:53:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u14sm11282391ejx.60.2021.03.23.09.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B67711FF92; Tue, 23 Mar 2021 16:53:09 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v3+N3f7Vb5LczvXguqdRK6CVvsl+Jz1NumKys/F46gk=; b=IHvjoOh0qOQbXkZhanMx3eINjR1OcDBjlMqs52j2DqXXlQLqbyzqMo6uceSgBf06tj viicKdo+lMIAa4wcFS413/6jl30fQXFb+4ImLshxwtXTBc7TFsOVQj5WdrZ5idQSE11H qfSkIVcuKHGnjst8zDJiUqh4ldhKd/txPHrGQ4u7GH3HAiRQ+dbtpBMeM53MMgb9bd8X gpNNAJRfO9J8essj/K1VWuztfvKBZIteoGk9GQg0mDFnbmE/n0PWXQ5VY0ljN13eLM+Z oqCpbqCsl3MCemw5Dpj051VVGgWMwC+0xYKRv2NTE+hmJ5UvRKZwdcQfs8Gd+zJe5vKp BzUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v3+N3f7Vb5LczvXguqdRK6CVvsl+Jz1NumKys/F46gk=; b=HkXs7LVK4MJWkW3Iq+pgy7JY8Hpt8LsIfZpfgL/dBpLzSV+3g1fNPrJ5zNDpwnpjt6 Fjaim5Hd1UdUZHF0b7jIoFcj17bVFoG2VEnTr/mBe4VXueUu62fy+Uq+Q9bHpT/m6lyY OAj71srHK/ghrsYoYvpQB3nx8bR98jYkJurzlXeYX4kVf6ZimZd+Y7NDkus0IKbz78Qq /s3BXszribiCzKRZ/DpZnQvbxNiq3+3+hf1FKmK7KmMuKCc/wmMh+WpiY3tvHddyoepk uFbgK+6ceDKNs1JzT1+QeL1VF2j4Gl/eTubXf0LWgwiGUmjuBJyRoe3EKbtjuauTOxuZ hB/g== X-Gm-Message-State: AOAM531Tgjrl8q7ye+x4RuboBxZ7K1SkDGXZgzcGYXIgsABH16gBXc2O nGWYzS53TxnLve1TIrZ4RKOKr8/yRXeD5BpD X-Google-Smtp-Source: ABdhPJwK+k8G+jY7R+BHpJRUUr0XHviyLwJgo/ObjvEm+uNwKhdRoWhdR5TK73FfIpEATcGJKM1iiQ== X-Received: by 2002:a17:907:20f5:: with SMTP id rh21mr5993495ejb.27.1616518399242; Tue, 23 Mar 2021 09:53:19 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/22] semihosting/arm-compat-semi: unify GET/SET_ARG helpers Date: Tue, 23 Mar 2021 16:52:52 +0000 Message-Id: <20210323165308.15244-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Keith Packard , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) >>From the semihosting point of view what we want to know is the current mode of the processor. Unify this into a single helper and allow us to use the same GET/SET_ARG helpers for the rest of the code. Having the helper will also be useful later. Note: we aren't currently testing riscv32 due to missing toolchain for check-tcg tests. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Peter Maydell Reviewed-by: Keith Packard Message-Id: <20210312102029.17017-3-alex.bennee@linaro.org> Message-Id: <20210320133706.21475-7-alex.bennee@linaro.org> --- semihosting/arm-compat-semi.c | 56 ++++++++++++----------------------- 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index 94950b6c56..0f0e129a7c 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -767,15 +767,28 @@ static const GuestFDFunctions guestfd_fns[] =3D { }, }; =20 -/* Read the input value from the argument block; fail the semihosting - * call if the memory read fails. +/* + * Read the input value from the argument block; fail the semihosting + * call if the memory read fails. Eventually we could use a generic + * CPUState helper function here. */ -#ifdef TARGET_ARM +static inline bool is_64bit_semihosting(CPUArchState *env) +{ +#if defined(TARGET_ARM) + return is_a64(env); +#elif defined(TARGET_RISCV) + return !riscv_cpu_is_32bit(env); +#else +#error un-handled architecture +#endif +} + + #define GET_ARG(n) do { \ - if (is_a64(env)) { \ + if (is_64bit_semihosting(env)) { \ if (get_user_u64(arg ## n, args + (n) * 8)) { \ errno =3D EFAULT; \ - return set_swi_errno(cs, -1); \ + return set_swi_errno(cs, -1); \ } \ } else { \ if (get_user_u32(arg ## n, args + (n) * 4)) { \ @@ -786,41 +799,10 @@ static const GuestFDFunctions guestfd_fns[] =3D { } while (0) =20 #define SET_ARG(n, val) \ - (is_a64(env) ? \ + (is_64bit_semihosting(env) ? \ put_user_u64(val, args + (n) * 8) : \ put_user_u32(val, args + (n) * 4)) -#endif =20 -#ifdef TARGET_RISCV - -/* - * get_user_ual is defined as get_user_u32 in softmmu-semi.h, - * we need a macro that fetches a target_ulong - */ -#define get_user_utl(arg, p) \ - ((sizeof(target_ulong) =3D=3D 8) ? \ - get_user_u64(arg, p) : \ - get_user_u32(arg, p)) - -/* - * put_user_ual is defined as put_user_u32 in softmmu-semi.h, - * we need a macro that stores a target_ulong - */ -#define put_user_utl(arg, p) \ - ((sizeof(target_ulong) =3D=3D 8) ? \ - put_user_u64(arg, p) : \ - put_user_u32(arg, p)) - -#define GET_ARG(n) do { \ - if (get_user_utl(arg ## n, args + (n) * sizeof(target_ulong))) { \ - errno =3D EFAULT; \ - return set_swi_errno(cs, -1); \ - } \ - } while (0) - -#define SET_ARG(n, val) \ - put_user_utl(val, args + (n) * sizeof(target_ulong)) -#endif =20 /* * Do a semihosting call. --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616522602; cv=none; d=zohomail.com; s=zohoarc; b=FPb6Bwe9Iia9ca94jAEyqRJXm0XivbBnsxKRO4BkUIgw/L4JID75jO5CxXm+I3lMxgcxReJRJ8Shxw1j6PyobmcFPaf5ccUOxRNX+s3vdVegAEkYA+7CeV5ntuytFIz+JTb8T3k389CVlOjXt2jZydyyTaZGWFcZruymZvVa3co= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616522602; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vckf+pPL5pOYGH6FyOdM2DsPAnORk+8EZCi9joz3GnQ=; b=RjIyT6GkZWSkr82WzhfX0SNYexlbZ8PqdIoN5vezsklibzoYnQJQFklJUrd0+paSIhTHqkbF4nVzrXDL11+RMiVuGWFRm/wqX67ITNwJOCzMvqotIZkhEW1K+7lrsp/sME2isyfN88+8oooB5HaB92S4VfhncJKiAlkQCxmGFf8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616522602342702.5802059425968; Tue, 23 Mar 2021 11:03:22 -0700 (PDT) Received: from localhost ([::1]:43236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOlNB-0008Ko-8H for importer@patchew.org; Tue, 23 Mar 2021 14:03:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHT-00078M-1O for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:24 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:33636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHR-0002sX-8F for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:22 -0400 Received: by mail-ej1-x632.google.com with SMTP id k10so28273241ejg.0 for ; Tue, 23 Mar 2021 09:53:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p9sm13206432edu.79.2021.03.23.09.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DCF011FF93; Tue, 23 Mar 2021 16:53:09 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vckf+pPL5pOYGH6FyOdM2DsPAnORk+8EZCi9joz3GnQ=; b=PGqxE9B0o0WWlJAJIffqm/cJQ8cgebiK5J6vRBvYUN61e0Wh6lOY/l9ar/ldJWUwv+ GMqRKJ3VBY4wMZclCkF2LhOOissvSQ7PAlJBCDjVOkMoS7hEVAU1uddnOnFtZNo6jTLJ uAJr9yiPor8SOvl5lEC+CGmpRuWhXRiL/t4y5nGS/XNVjfWCIOKt37ADswTuVKYh7Ifg 8A2pyUuUiUSpHf8sPEwG7Bh2eeBns+0l7gK9duxJFCrf0eQ4Wj6eCB6QMyig2kXrAzMe z+h3+rZx9UTyGbvEr21PI0ekVH9KtSH7KAcciYVJN/AQ20jmHR1ARJV1eEtsc8gtfYmT OrgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vckf+pPL5pOYGH6FyOdM2DsPAnORk+8EZCi9joz3GnQ=; b=LJSsXpVky/29lqTCqhb8vmdxbkNxTLzM0+kBIyGK28pOTkVrYiqjan/UeQgUVFQKiK S1wu5B1mzgf3KcUKc/oJDK2ioUrowRXeg/8wi3a0StqpWFry0PDbzktYofpBXQYbkvTg yOb/Osy8HZ5ATUfjrWFV4eoweFBFuWzrQmTRXE06T+izcJEZvykaAFtTAq0/3SvwIsTj AQspi2Nz73Aq0r5ozrXwjQDf0kzw55pwcFcBGJPsLDMMoChStTSvTa9LbXv79Umff31b ooBrtW6ZOzDwsZH3GlvF4gCL0tvtNPWZ9HiYhTH+kYmOu63v3eqkfkkLgS19N3K6ZzLc Y5JQ== X-Gm-Message-State: AOAM530BssI+F0wRILz7YYxQWHkxB1mqp9WzE4gk9T/DOfuHs/mc+K3Y l9p82fEG15qCFmV1ap7qtS+wUg== X-Google-Smtp-Source: ABdhPJxhL35q8dD3D7cWuDrpqmjTtBfMmD7/XmZU4PLJ3LH/kEiOQJYbY5W52tFzoJ0bBAQOkp6L4Q== X-Received: by 2002:a17:906:5e01:: with SMTP id n1mr5814446eju.359.1616518399897; Tue, 23 Mar 2021 09:53:19 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/22] semihosting/arm-compat-semi: don't use SET_ARG to report SYS_HEAPINFO Date: Tue, 23 Mar 2021 16:52:53 +0000 Message-Id: <20210323165308.15244-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Keith Packard , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Bug 1915925 <1915925@bugs.launchpad.net> Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As per the spec: the PARAMETER REGISTER contains the address of a pointer to a four-field data block. So we need to follow arg0 and place the results of SYS_HEAPINFO there. Fixes: 3c37cfe0b1 ("semihosting: Change internal common-semi interfaces to = use CPUState *") Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Peter Maydell Cc: Bug 1915925 <1915925@bugs.launchpad.net> Cc: Keith Packard Bug: https://bugs.launchpad.net/bugs/1915925 Message-Id: <20210312102029.17017-4-alex.bennee@linaro.org> Message-Id: <20210320133706.21475-8-alex.bennee@linaro.org> --- semihosting/arm-compat-semi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index 0f0e129a7c..fe079ca93a 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -1214,7 +1214,11 @@ target_ulong do_common_semihosting(CPUState *cs) for (i =3D 0; i < ARRAY_SIZE(retvals); i++) { bool fail; =20 - fail =3D SET_ARG(i, retvals[i]); + if (is_64bit_semihosting(env)) { + fail =3D put_user_u64(retvals[i], arg0 + i * 8); + } else { + fail =3D put_user_u32(retvals[i], arg0 + i * 4); + } =20 if (fail) { /* Couldn't write back to argument block */ --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616519312; cv=none; d=zohomail.com; s=zohoarc; b=UVPbO2XhMlEU+fM2agf6eQYQXFzlfPepRrjTE4QW9cqnKmxskv7KeBCJWiLph0dYymyS+NgOfVaImfmzY/oqwL8IB2+sb9mDatgkfYliXcid9UgKNTsT438fDE7R3eqz7+bnsC4ILsLHSqbpQxi/48ZXWnHsg58d7m6zH6EySZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616519312; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ux9gndpePTB7xFhEug2RxX0KYTVZW4sPDeYInZ3GRdc=; b=GYUOyO4rinOgDPcshd0xchIAL1X8IhZ/Ll6ZUAPLzQHPfQPB5cXGrSigu5b6qGJmD0q3pSA93OB85zH9c5HCt4J7YoRtk0BDfr9ymFz4nBSYMja05vHYvKZZVWN4QFkKtag3CXFGgwluStpYVWtYvzbQnkrfV0u/wrDWfrTI4GQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161651931225550.19965924006988; Tue, 23 Mar 2021 10:08:32 -0700 (PDT) Received: from localhost ([::1]:32938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkW4-0001Nc-KK for importer@patchew.org; Tue, 23 Mar 2021 13:08:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHV-00079d-KN for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:26 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:42649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHT-0002tc-1Z for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:25 -0400 Received: by mail-ej1-x62e.google.com with SMTP id hq27so28248211ejc.9 for ; Tue, 23 Mar 2021 09:53:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a26sm13936406edm.15.2021.03.23.09.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 11E2E1FF96; Tue, 23 Mar 2021 16:53:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ux9gndpePTB7xFhEug2RxX0KYTVZW4sPDeYInZ3GRdc=; b=Ezq+FfpaZSe8ODVhh1msn9HFloS7zcQIqxP+mZE5VYH4fXsxu1/DvuA3qM6dAU6aEe ajF00Hpbz2Nn/Iqpy23ah+Zg1JR8cuOr9bh0A/89wDsfFJyUqoKy/zbHAqprKcbMggJ8 UMrHQ1js/SPJXXvP15W0QcRpilkZdsvIXbBIHBu+Wl+hvKFDswlU+iGKHiJJZ6BOno3d uInIbuvGFcIINH38eeNlIaB7EksBPNJsCEFOYR2ULCtsfE9+v5zBJIEUY1CJuskl4ma4 oXTM1Rup9sbdng1aS1Ytbsp9EcEEoFNYXYIVSLwEWAqmYnuFixFyvFjtXGAsowExG4We sJQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ux9gndpePTB7xFhEug2RxX0KYTVZW4sPDeYInZ3GRdc=; b=ESUmfvBvEevZ3yAVyZknqxC2g1iyupkbFUb0Q5fy1bbI/KEtnuP+8F9tVzBUSNMk/J atK5qeKtxG6QJGTzgWRf/lGlAFUYDXXO7w2cNIPpyE0zPZrli55ZVCJ4coiRWZlQwjfR eU+2QEC9GHPSAxb6WvdBYE418EbqJL3LSpkvriJ4FP7YDaY+F+BffAw7BYhSk2+k1hUc nH9arnLsXVF1liBpvtd7jMGHeALOthHAhpejuGQG7AbKXDI7tNBRv40xBlRwXnGn3IDT NS2OwIFDZ6vKrNZOO+HXv+0XhStBOMOfM0UqyrVftMHu2hChKJURBcaMkxHgFYJWFrWD F5cw== X-Gm-Message-State: AOAM5304noICfh9lmN2JLrUsBe9kE1FyAVQOAlE0MvMvniJQHVx5sMlR VjwQ8Qy2KO8kgi+BsVGXa80uJdQeyqPDN5jg X-Google-Smtp-Source: ABdhPJzNNiOdRkL8D3ppyGS7M96e4Q3E0z2dOqhiy+7fBvw4icHxRaxw23M22qqwbyPgfciffvvHbw== X-Received: by 2002:a17:906:814b:: with SMTP id z11mr5789546ejw.290.1616518401853; Tue, 23 Mar 2021 09:53:21 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/22] linux-user/riscv: initialise the TaskState heap/stack info Date: Tue, 23 Mar 2021 16:52:54 +0000 Message-Id: <20210323165308.15244-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Arguably the target_cpu_copy_regs function for each architecture is misnamed as a number of the architectures also take the opportunity to fill out the TaskState structure. This could arguably be factored out into common code but that would require a wider audit of the architectures. For now just replicate for riscv so we can correctly report semihosting information for SYS_HEAPINFO. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20210312102029.17017-5-alex.bennee@linaro.org> Message-Id: <20210320133706.21475-9-alex.bennee@linaro.org> Acked-by: Alistair Francis --- linux-user/riscv/cpu_loop.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c index 6767f941e8..74a9628dc9 100644 --- a/linux-user/riscv/cpu_loop.c +++ b/linux-user/riscv/cpu_loop.c @@ -135,4 +135,9 @@ void target_cpu_copy_regs(CPUArchState *env, struct tar= get_pt_regs *regs) error_report("Incompatible ELF: RVE cpu requires RVE ABI binary"); exit(EXIT_FAILURE); } + + ts->stack_base =3D info->start_stack; + ts->heap_base =3D info->brk; + /* This will be filled in on the first SYS_HEAPINFO call. */ + ts->heap_limit =3D 0; } --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616522069; cv=none; d=zohomail.com; s=zohoarc; b=HEk8VLDmla5gUDpbNuRVVFe7qMlLrPR6bM6zSVBs2VyKjsXnkM7sk07r3CEHQp3u7ODu7IRYEwe8CbEzBb384vJ1HCnxcgaGUefBcvAaTYvd+Kg77DbUv4mtPWUZOmsM3USifZ2x1k1aK8Rckgx+jYQlhB9fXacJvUmn1nDoWbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616522069; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nV9FEUQi26PpeGtroH8dN7VBa8pABbTHxvm6zGW6zk8=; b=O92J+qdUpSC5uyA3B4rfmR24kgohgE59bdJl7tUyGFY7tPF35d5m5qzQyTA3ubzhdxygAcqtIxg8FRKnIx5gOKjwNk3RtwSt+vHiZm98aqcygHPPCaZ3w8qTbm8SQ2adsZMvj4OcciZu/6tFVVHui9kFXKeuhBGY0rp5PhBeUK4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616522069157531.3168894819948; Tue, 23 Mar 2021 10:54:29 -0700 (PDT) Received: from localhost ([::1]:50602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOlEY-0001aS-VI for importer@patchew.org; Tue, 23 Mar 2021 13:54:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHd-0007FW-EM for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:36 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:44635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHZ-0002wp-PB for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:33 -0400 Received: by mail-ej1-x62b.google.com with SMTP id e14so10028838ejz.11 for ; Tue, 23 Mar 2021 09:53:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f3sm11474290ejd.42.2021.03.23.09.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 428981FF98; Tue, 23 Mar 2021 16:53:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nV9FEUQi26PpeGtroH8dN7VBa8pABbTHxvm6zGW6zk8=; b=PxuCy63b+oDajrVFBnBx2kFZKwLtXCBhZkinNakBRYsKa409ri2bYPhvz1gdxhgSlU deW9jg60yGtHDNT1Tp3OIvZmVzaGsAb0d1MEE8J+uhBEIZms2+0P4bCousWV8oalqo/v pSxhPVLueB240BnOgz+79mhDY5X1c+8iCn4W3Sk59VTrYPCC7qv3M22zgRy+mV2hS+c7 vtzC/W5CGJNSRT2fao2UPz3l0DFbDiu4FBotNaz6LyMTmdQrgBblcbncoFU72F5AFQDq H6FVBnd3rHFdRjILhja2eZZI80M7r56FKZ3ispyODRIFz24y9g9pphaK65DfJtUtN0/s L1jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nV9FEUQi26PpeGtroH8dN7VBa8pABbTHxvm6zGW6zk8=; b=VIhgX9ZHNV6I/ADFYSC2FHttpAdxp/nAGVgHmKAI3oP+xNVqeaFxgTVxWLaX5qq2i2 s4fZ0fMyJA75kcDnr0BcK0wsYM0Wo1+qAhf+IUdZRiekZtuF4aNLWeYXtCkX6558D5zz JM277E1lAVxd18QzgsQWuMVaguhrMr/uEtNLZrdi+/GpoEN+M2oY6NLV1kLth/9b5RgV FHqamkb7mznbC6OJodAtXRm4hWyKhTG37I7DIPO8ypyxbNBvwbUXLEKBMR3btE9div+I b+ODNsGgAcOMEipUGagctil8+IKG3IYih6iplm2tNIqWkcnL+bIKHZNBw++N5P0Mnpbd ZsjA== X-Gm-Message-State: AOAM533KGQ2ioieuSYQMDKJ24H45bf+z9Na7QAQu4AhShbTMaJroicKK VRK1+fOdH1WSBf78+G8QZZEr8RZoYNNILY88 X-Google-Smtp-Source: ABdhPJxiza9ZevcQXGljZXk3yP3Ktt+UdrvX0uMmoeQhznQOy3Q/3ykxz870UM5EsRFgvW/1j8DN3A== X-Received: by 2002:a17:906:dbd0:: with SMTP id yc16mr5787292ejb.71.1616518408601; Tue, 23 Mar 2021 09:53:28 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/22] tests/tcg: add HeapInfo checking to semihosting test Date: Tue, 23 Mar 2021 16:52:55 +0000 Message-Id: <20210323165308.15244-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Query the SYS_HEAPINFO semicall and do some basic verification of the information via libc calls. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210320133706.21475-10-alex.bennee@linaro.org> Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- v2 - expand test as suggested by Richard --- .../multiarch/arm-compat-semi/semihosting.c | 55 ++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/tests/tcg/multiarch/arm-compat-semi/semihosting.c b/tests/tcg/= multiarch/arm-compat-semi/semihosting.c index b3fd16cd12..8627eee3cf 100644 --- a/tests/tcg/multiarch/arm-compat-semi/semihosting.c +++ b/tests/tcg/multiarch/arm-compat-semi/semihosting.c @@ -8,9 +8,13 @@ */ =20 #define SYS_WRITE0 0x04 +#define SYS_HEAPINFO 0x16 #define SYS_REPORTEXC 0x18 =20 #include +#include +#include +#include #include "semicall.h" =20 int main(int argc, char *argv[argc]) @@ -21,8 +25,57 @@ int main(int argc, char *argv[argc]) uintptr_t exit_block[2] =3D {0x20026, 0}; uintptr_t exit_code =3D (uintptr_t) &exit_block; #endif + struct { + void *heap_base; + void *heap_limit; + void *stack_base; + void *stack_limit; + } info; + void *ptr_to_info =3D (void *) &info; =20 - __semi_call(SYS_WRITE0, (uintptr_t) "Hello World"); + __semi_call(SYS_WRITE0, (uintptr_t) "Checking HeapInfo\n"); + + memset(&info, 0, sizeof(info)); + __semi_call(SYS_HEAPINFO, (uintptr_t) &ptr_to_info); + + if (info.heap_base =3D=3D NULL || info.heap_limit =3D=3D NULL) { + printf("null heap: %p -> %p\n", info.heap_base, info.heap_limit); + exit(1); + } + + /* Error if heap base is above limit */ + if ((uintptr_t) info.heap_base >=3D (uintptr_t) info.heap_limit) { + printf("heap base %p >=3D heap_limit %p\n", + info.heap_base, info.heap_limit); + exit(2); + } + + if (info.stack_base =3D=3D NULL || info.stack_limit) { + printf("null stack: %p -> %p\n", info.stack_base, info.stack_limit= ); + exit(3); + } + + /* check our local variables are indeed inside the reported stack */ + if (ptr_to_info > info.stack_base) { + printf("info appears to be above stack: %p > %p\n", ptr_to_info, + info.stack_base); + exit(4); + } else if (ptr_to_info < info.stack_limit) { + printf("info appears to be outside stack: %p < %p\n", ptr_to_info, + info.stack_limit); + exit(5); + } + + if (ptr_to_info > info.heap_base && ptr_to_info < info.heap_limit) { + printf("info appears to be inside the heap: %p in %p:%p\n", + ptr_to_info, info.heap_base, info.heap_limit); + exit(6); + } + + printf("heap: %p -> %p\n", info.heap_base, info.heap_limit); + printf("stack: %p -> %p\n", info.stack_base, info.stack_limit); + + __semi_call(SYS_WRITE0, (uintptr_t) "Passed HeapInfo checks"); __semi_call(SYS_REPORTEXC, exit_code); /* if we get here we failed */ return -1; --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616521970; cv=none; d=zohomail.com; s=zohoarc; b=ZyAPtxdRIC7Kz0OJnoXYrRYzWe3amyWjZ/t1QpVz65+MvtjMAuYUuZK33tACjKe6jeJvghVjV9oDl7qh27faNaf48BaetYZDadeFxwiGNf6ViFTLJ2npSzY06zhgZu+CVslwAfql9QmffwgrbiDR5R0gXQmxUwEwZsChHw6gRZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616521970; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1R5dBzICN7UKyVr4RtsD3A7GJeQOBuWX0KqOefj2HYI=; b=nS/oQ4TX0VQBvfAuNvOdchy8ze+aNsn3MA3YB283vK1gP7NVo95+VQSmMPhJ7f/hP05mzb0EbXhwGI5VsJ1uUM2Y9r0q7K2jC/XGdr3J36XbmGIiTAC8/E8ManjFaJ9ztgimCO/M14KQt9Id+wKQVTfiIMIg+ZKaSalW5tN1Ip8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616521970355292.07812801670354; Tue, 23 Mar 2021 10:52:50 -0700 (PDT) Received: from localhost ([::1]:45272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOlCz-0006sS-Aj for importer@patchew.org; Tue, 23 Mar 2021 13:52:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHg-0007HT-Cj for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:36 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:44643) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHY-0002vQ-FV for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:34 -0400 Received: by mail-ej1-x634.google.com with SMTP id e14so10028661ejz.11 for ; Tue, 23 Mar 2021 09:53:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k9sm13320651edn.68.2021.03.23.09.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 710791FF7E; Tue, 23 Mar 2021 16:53:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1R5dBzICN7UKyVr4RtsD3A7GJeQOBuWX0KqOefj2HYI=; b=Npt/0ihztyIgQ/YYKncErYm+GRxbseFYjc/t1xqHvGCKrJP5/j2fwZZA/nKMRTOEWR W7NnbJ46XsRuwZ9dh/gsnGRGEG8Evkbx8eMVTy9DNzw32NC6ggfDnA5GgIJ6b3r7rgJ5 CViz5y9klJfzUtzKY2TqWtC+guPiGP4QG+CHdJ9qcmCsdgJEr6gkfvnUjAAu8tQXvaYL 56eCv67NUShy2hagumng/fagelUn1C9irO36CoY4uLjWXTGIQQAc8nbEsggJfgPFMaTk 1mKN8FoxhFERi0B9SxN0SVosIbbkCVQFxQeBPyig1Qle2vsPi42XvxoODOSv4+6XvSFo EZBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1R5dBzICN7UKyVr4RtsD3A7GJeQOBuWX0KqOefj2HYI=; b=oww4SYpGa8tvAPiHzESI/EvqrnYCOKNJWfHKgUY57pmeRtF0MCg9Mvs4lFS4W6exkY W6eNSUVrFNR35qGEba1roP8KyB1Jda1Phz2hiFIDPY26a+e1fXWf4xvmqdB/W+oQ0jWe 1Pcz+5+8OOVSgR9tf0o4o9MCklxeP33tEGlZUdIscuxKuYqq0t36EqP9+/fNl+z7MBtS ihvVUET7N3PzIfkUec9Bcby1R7hJRMnOS6sQZ9mzqlCrucQQvwR7AHevwnWTp95BnxpW 0FPyziGev/uVXZbYqOpfgS/ZmhYhKqOEFdslHqcOjavg6Yo2T6S5CvQw6gbu3PXouBzB 1GkA== X-Gm-Message-State: AOAM533r7fK2Xuzm+R2C0f7zc5wvfjdpuhBU60AQ/IBtlGy2HOb/fkCj L3IDObTYcj1f51eWA14Yh0onLw== X-Google-Smtp-Source: ABdhPJyYUW4WNt+FpedUBfMvQePYZlcAxt/GZUEc+/xgMASR9MFxsqFGFPKI1rERKjLERzJeoqeu6A== X-Received: by 2002:a17:907:7799:: with SMTP id ky25mr5776427ejc.217.1616518406030; Tue, 23 Mar 2021 09:53:26 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/22] gitlab-ci.yml: Merge the trace-backend testing into other jobs Date: Tue, 23 Mar 2021 16:52:56 +0000 Message-Id: <20210323165308.15244-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Willian Rampazzo , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth Our gitlab-ci got quite slow in the past weeks, due to the immense amount of jobs that we have, so we should try to reduce the number of jobs. There is no real good reason for having separate jobs just to test the trace backends, we can do this just fine in other jobs, too. Signed-off-by: Thomas Huth Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Message-Id: <20210319095726.45965-1-thuth@redhat.com> Message-Id: <20210320133706.21475-11-alex.bennee@linaro.org> --- .gitlab-ci.yml | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f65cb11c4d..f746d5fbea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,7 @@ build-system-alpine: TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu moxie-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build - CONFIGURE_ARGS: --enable-docs + CONFIGURE_ARGS: --enable-docs --enable-trace-backends=3Dlog,simple,sys= log artifacts: expire_in: 2 days paths: @@ -605,7 +605,7 @@ tsan-build: variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 --dis= able-docs - --enable-fdt=3Dsystem --enable-slirp=3Dsystem + --enable-trace-backends=3Dust --enable-fdt=3Dsystem --enable-sli= rp=3Dsystem TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user MAKE_CHECK_ARGS: bench V=3D1 =20 @@ -702,6 +702,7 @@ build-coroutine-sigaltstack: variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --with-coroutine=3Dsigaltstack --disable-tcg + --enable-trace-backends=3Dftrace MAKE_CHECK_ARGS: check-unit =20 # Most jobs test latest gcrypt or nettle builds @@ -739,31 +740,6 @@ crypto-only-gnutls: MAKE_CHECK_ARGS: check =20 =20 -# We don't need to exercise every backend with every front-end -build-trace-multi-user: - <<: *native_build_job_definition - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-trace-backends=3Dlog,simple,syslog --disable-= system - -build-trace-ftrace-system: - <<: *native_build_job_definition - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-trace-backends=3Dftrace --target-list=3Dx86_6= 4-softmmu - -build-trace-ust-system: - <<: *native_build_job_definition - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-trace-backends=3Dust --target-list=3Dx86_64-s= oftmmu - # Check our reduced build configurations build-without-default-devices: <<: *native_build_job_definition --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616522989; cv=none; d=zohomail.com; s=zohoarc; b=gGPLq3bONdHZnTDoQHnLfXD+YjOfiybgF9VSpfv1e5OgiEDimsBruBd2bdzQvJqxKfWt/XqM7u0AEdhGV9taucE4BtFJXpNlxKpB/l/LmqbAFmT92H3NDtc90HmUzjWRU3vfgfoHM4k0xn59cHE4LtfVRXwqadvFalXINMsV5Dw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616522989; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1GjfIvo+L5/jOqEjoeTYoPhrLcD7SZkBt0Kv7d3/t/I=; b=mijeVQqVpB39fhWsjURpBGU9jiGIu2G4wOQj+1mi8H8BwYIX6AlzJ+HdnWUxbyzwWFwsSSPbxedyq3nLOqbU8TouqTkZQ0+pN7ioe/dISBGRcaWstC20EFyCzVmih8VRdF4+kelzgJTJVaWqZdjjNwgoPy3+n7GPqlNuWrE2jNI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161652298992740.57582781826068; Tue, 23 Mar 2021 11:09:49 -0700 (PDT) Received: from localhost ([::1]:51314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOlTQ-0006Eb-Fh for importer@patchew.org; Tue, 23 Mar 2021 14:09:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHY-0007AP-Oo for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:28 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:37636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHV-0002v9-Cp for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:28 -0400 Received: by mail-ed1-x534.google.com with SMTP id x21so24251237eds.4 for ; Tue, 23 Mar 2021 09:53:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s6sm11404319ejx.83.2021.03.23.09.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A95791FF99; Tue, 23 Mar 2021 16:53:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1GjfIvo+L5/jOqEjoeTYoPhrLcD7SZkBt0Kv7d3/t/I=; b=ZFBwY6DO3yH8wA//cHdtcT3QIMpXhEutt0lxnIAvnE+A6XNZZLU36NSyDVCbfi+X4M IQ7AwIaxKBbLkYCo4Vz03aB7ps2iQ0RA5Dqs6taWfycvYrNG5X7bprc2qhv8EZk6PD8O vRXgmPKu8rTKd+Gm7s+DECxkVawnKT/7w2db6vRreHW8+DUkvGEPWkE8hAZejo24lYQh BkDkYcPJvF3Wyq5XLHO7j2Ov31NbCTMmpcfwqOsD5RX0XWamMmTd6DwsWyYc2bei98jb Z6hP6iB/2hBi62n0AEleLtX89EXqL5Z4GIW9Y5E0l7PE2x34T9c+VCpIJYBxYzMD6yOV dySw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1GjfIvo+L5/jOqEjoeTYoPhrLcD7SZkBt0Kv7d3/t/I=; b=Zvfk+U/DenLgiVvgsShgcInft8xzy4eDIyIHFjqR96gVIwO+urJNMabky/v+v+GMa+ mpO4PI6vAF+ZiMoJf7IzIhszxYdSVn5UbzeCloBTgyj4nh+YkBn273gTEOfKJOm1brYC ZMfwXj3SwYrFrszGUQE3OdfYwGRhBnYn3CsNSk3cYrK2LhExn1z1T0iHcqA0lUeP1oQ7 wHPjqPtM/h+vsvkNw5TdgbdIX222ltiugwtgV3UxYWRpYlgKCPQXcI2NLKT+STaL/2Xd ywAJXfDcJt0P+7OE6SGx5wxzQXqOS0celloJ7quBbOaYQMqVkxQ5Rw9yIjcHKaK0ECdd +5Lw== X-Gm-Message-State: AOAM5339y9eQAmdpEQzoY5Knro9GXZQcg88WmCyrUx1IsQX1RLeNSsTA EvS7mWTYq1gV8DPfSMKYiZlMkQ== X-Google-Smtp-Source: ABdhPJwWhljpjTwv+zRkQrmYrE3cysv194I2Zxs4/q2VFutk4PPUGJzb9lREcWtDzomME15dXYtBIw== X-Received: by 2002:a05:6402:350f:: with SMTP id b15mr5488542edd.6.1616518403528; Tue, 23 Mar 2021 09:53:23 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/22] configure: Don't use the __atomic_*_16 functions for testing 128-bit support Date: Tue, 23 Mar 2021 16:52:57 +0000 Message-Id: <20210323165308.15244-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth The test for 128-bit atomics is causing trouble with FreeBSD 12.2 and --enable-werror: cc -Werror -fPIE -DPIE -std=3Dgnu99 -Wall -m64 -mcx16 -D_GNU_SOURCE -D_FIL= E_OFFSET_BITS=3D64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decl= s -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-co= mmon -fwrapv -Wold-style-definition -Wtype-limits -Wformat-security -Wforma= t-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendi= f-labels -Wexpansion-to-defined -Wno-initializer-overrides -Wno-missing-inc= lude-dirs -Wno-shift-negative-value -Wno-string-plus-int -Wno-typedef-redef= inition -Wno-tautological-type-limit-compare -fstack-protector-strong -o co= nfig-temp/qemu-conf.exe config-temp/qemu-conf.c -pie -Wl,-z,relro -Wl,-z,no= w -m64 -fstack-protector-strong config-temp/qemu-conf.c:4:7: error: implicit declaration of function '__at= omic_load_16' is invalid in C99 [-Werror,-Wimplicit-function-declaration] y =3D __atomic_load_16(&x, 0); ^ config-temp/qemu-conf.c:5:3: error: implicit declaration of function '__at= omic_store_16' is invalid in C99 [-Werror,-Wimplicit-function-declaration] __atomic_store_16(&x, y, 0); ^ config-temp/qemu-conf.c:5:3: note: did you mean '__atomic_load_16'? config-temp/qemu-conf.c:4:7: note: '__atomic_load_16' declared here y =3D __atomic_load_16(&x, 0); ^ config-temp/qemu-conf.c:6:3: error: implicit declaration of function '__at= omic_compare_exchange_16' is invalid in C99 [-Werror,-Wimplicit-function-de= claration] __atomic_compare_exchange_16(&x, &y, x, 0, 0, 0); ^ 3 errors generated. Looking for they way we are using atomic functions in QEMU, we are not using these functions with the _16 suffix anyway. Switch to the same functions that we use in the include/qemu/atomic.h header. Signed-off-by: Thomas Huth Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210317110512.583747-2-thuth@redhat.com> Message-Id: <20210320133706.21475-12-alex.bennee@linaro.org> --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 61872096a8..69f9f05673 100755 --- a/configure +++ b/configure @@ -4779,9 +4779,9 @@ if test "$int128" =3D "yes"; then int main(void) { unsigned __int128 x =3D 0, y =3D 0; - y =3D __atomic_load_16(&x, 0); - __atomic_store_16(&x, y, 0); - __atomic_compare_exchange_16(&x, &y, x, 0, 0, 0); + y =3D __atomic_load(&x, 0); + __atomic_store(&x, y, 0); + __atomic_compare_exchange(&x, &y, x, 0, 0, 0); return 0; } EOF --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616521748; cv=none; d=zohomail.com; s=zohoarc; b=Ygey/RavjcujakR15/1GCGpupPUddmmYAM4t2TY7pgqN0O68yswyjJ91+FPem5jLvRyqJ7ZkTYQyzBKTyP/d4Xhin09Y8FzqUyUcRvtK7AXHOQP5/aS72Cfn9lsfnSimd05tnm5hQSZwaCLVK1Uk6hQOq1QxQNt8Ql4DLXeC2eo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616521748; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lkjS4b2AHoEMW5vF18Zs+QdO57LRsD31yQd7ZNao5mM=; b=miWZznk+0UyAoIPX8pkM8TmYmZagcdY3vbsKJPVMReBKa/QGwfteSCr0M8170cHj/nIj9oy0m74KF9HM9x0IgPLmyNk3flXgJfUi0kYfZixd+bZjL8XnngC+TbcRYGwSOG2XYjyvKt9DZ9ehUte0qb/2H6pUbTCi8b1gjIzlx3Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616521748270763.9027977563044; Tue, 23 Mar 2021 10:49:08 -0700 (PDT) Received: from localhost ([::1]:36870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOl9P-0001NV-3C for importer@patchew.org; Tue, 23 Mar 2021 13:49:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHa-0007BR-Ix for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:32 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:34459) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHY-0002w2-FZ for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:30 -0400 Received: by mail-ej1-x62b.google.com with SMTP id b7so28255374ejv.1 for ; Tue, 23 Mar 2021 09:53:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x4sm12741992edd.58.2021.03.23.09.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD2B61FF9A; Tue, 23 Mar 2021 16:53:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lkjS4b2AHoEMW5vF18Zs+QdO57LRsD31yQd7ZNao5mM=; b=mxdFpdYZA0DKdO32yDDviIyqfoVz69uYr/jpG/bSG+aDGUQU5qyIxIisunBxnzi334 S0oqh3WDPevxojSWo0ts1PBR6PLJCerktKBb9vXus870iW+XMw2YKdlm18aHPY1dDIEd 1vqjXBBTHaPsuM2puMLf79R0xJYhBP1iwusOW+T7+VwoiTtG4rFgqAucAVn5IY0B6Nwn QHUfd1evLll7AREGfcmsikug375rjTSLxH9PQqvDSzaUp3Mgu8mA+oup1snvjYbA9nnV C4LU+2SfLzy5uKAmzPeLB1WtTFr4hd74VadUcViMhhDXhUPsrs+t+Pw8kfWpQ/SxjHDn GSJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lkjS4b2AHoEMW5vF18Zs+QdO57LRsD31yQd7ZNao5mM=; b=Zd4jOHw6p2z7smtt5nCcJ9jYYdawRWxE9/8p0mDVHay9D+qSUjuUDdp+h8C5G/7ArT GPQhj4ZSwiuIykQN00+aZN7smmokfkRkp4hgSX0rd+cp3OdaluoEFPEwBRazbMQwh+Ob TA1dsrGj8qgHzuCNbQ8QYVdr1B4ugs2JxCnrNrN0pIsx173WYNJnthN/6cpokjJmPkWW IJT7TCAbc40sJYDWmLhGs4bEgX29+biuw2fmTlmXRgYfnTlBWuISgh5/TRLHh9y/Czap 8JVB0xNUZfpcljVEq1yOe1+YJWu2BfLlhEZG3Qnn7kIpwU+3CFIiJSuQBEY342ZHm3zZ rQlA== X-Gm-Message-State: AOAM532UQ3niJe/6Jbv9P/rEzQuojwzAbs5k6wj8u2lUdRIXgFgCMObE fMvGWAx0tcj+Bu1xzHu6RVBkCw== X-Google-Smtp-Source: ABdhPJz7e/fI+hSGKnUbHUNY132dPeuVx3gw1J+hr2yM7tOcNs1pgYjJMWyZNH+rgYF7mIgRircvxg== X-Received: by 2002:a17:906:7194:: with SMTP id h20mr5816048ejk.154.1616518406624; Tue, 23 Mar 2021 09:53:26 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 12/22] cirrus.yml: Update the FreeBSD task to version 12.2 Date: Tue, 23 Mar 2021 16:52:58 +0000 Message-Id: <20210323165308.15244-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ed Maste , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Yonggang Luo , Li-Wen Hsu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth FreeBSD version 12.1 is out of service now, and the task in the Cirrus-CI is failing. Update to 12.2 to get it working again. Unfortunately, there is a bug in libtasn1 that triggers with the new version of Clang that is used there (see this thread for details: https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg00739.html ), so we have to disable gnutls for now to make it work again. We can enable it later again once libtasn1 has been fixed in FreeBSD. Signed-off-by: Thomas Huth Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210319101402.48871-1-thuth@redhat.com> Message-Id: <20210320133706.21475-13-alex.bennee@linaro.org> --- .cirrus.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index bc40a0550d..f53c519447 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,7 +3,7 @@ env: =20 freebsd_12_task: freebsd_instance: - image_family: freebsd-12-1 + image_family: freebsd-12-2 cpu: 8 memory: 8G install_script: @@ -13,7 +13,10 @@ freebsd_12_task: script: - mkdir build - cd build - - ../configure --enable-werror || { cat config.log meson-logs/meson-lo= g.txt; exit 1; } + # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed + # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71 + - ../configure --enable-werror --disable-gnutls + || { cat config.log meson-logs/meson-log.txt; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - gmake -j$(sysctl -n hw.ncpu) check V=3D1 =20 --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616521891; cv=none; d=zohomail.com; s=zohoarc; b=ceGOmOyEuIIkiDoENXfIrSFTu+rgvTPuH2adN/XOQggGjnYzlnbF5+UZYP9sDFPOIA0ZEJ/FkaEaCm9zCL9bEeWq6ih0mUPP/NvA5Vw6n+7aoXHx5/e5BmK0gHVzGlE8FKbNWItazy+Xl6cT+BmVnSVL2BV8VhUv5SjE5JuCE1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616521891; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W0p5nkACG61LTtPlyGUhH4WotUQTXCAEeyFEH/xrxQ4=; b=B4Agi+an69rQAlkCtlStf5e+jxfn7m/tZmXbNVLyzwLXEw0oRm0rnibyR7cJuDXJ/h0xL5CulG5EQuVDB9nEtgwUyzG2k4x3oc62+hgQk3tRQlKylDWoTkjiSKnJsofvhwpqoDEgisgh5cdySfOvcGyDXfZwKTGKaYxrYvWpE1g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616521891680884.8199519807132; Tue, 23 Mar 2021 10:51:31 -0700 (PDT) Received: from localhost ([::1]:42300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOlBi-0004jt-8c for importer@patchew.org; Tue, 23 Mar 2021 13:51:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkHc-0007D0-IO for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:32 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]:44752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkHW-0002vD-Dp for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:53:31 -0400 Received: by mail-ed1-x52f.google.com with SMTP id j3so24212713edp.11 for ; Tue, 23 Mar 2021 09:53:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q10sm13089163eds.67.2021.03.23.09.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:53:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1BD611FF87; Tue, 23 Mar 2021 16:53:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W0p5nkACG61LTtPlyGUhH4WotUQTXCAEeyFEH/xrxQ4=; b=ChsdA/96J88NZ4gmpUIHMMDFkjp1FDfrLEuIyvJXUu28euLsUq19P83jLLSFHBDj/4 9l5hLb5FbPN5A/5KtBAvU1xIrKgVlYc38UPPjwDySX9oF2iP+7lad9rqXkHoV9wlIiCN 2x0wJLRhZ0N94kr82Hpq6zD+82n+JB5XvyI1mhOaIC3XFAolBQpmCOJWWTlNlxpb9s4p vJkVD6+4UOJy3sFyhiDmRNiyasvmrgdfmrrXy5FklsqKvne6NQdPk2eImEyrA+qCpk0c bAzXTQmY5ZZfLGLNHPmUdiG7c0iJ1F/3m5yIkYaYr8kmeWoMhUByXPegq301AoTS6V+A U3kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W0p5nkACG61LTtPlyGUhH4WotUQTXCAEeyFEH/xrxQ4=; b=dzxEaTs6eL51J/W2jQ7amH8qE1jpyNRoSjq+DuGq2ApmlqW2CVg3BBXX/KXkF4aTo1 IHJjfawU4Ri9LxbTYjevyxJHXYDWsQW8Qka2xcfMVT9SuxUVwdBwlef6SFvsmfDuHx/6 gxKs32vP2gQ4nSWPKuKszlomXjETAmiQgWM2XpBU4ln/k75b9DpoAJaAYsN4Nq6SKQYy wYmIuDFPJYOA06Y3GPlnsTpAehaAIqaaO+j73tFvwW9s6mrTMYlgxGcqIvmVjgQIYGVa ZI6lRYumPcvDqmdy14FQxbjLUJA0KcySPcB3kD6niVebaLRliDSMN7qlAAyI0niAm/Kd RFUw== X-Gm-Message-State: AOAM530L8OPxc77fkvRt9J1fCuHB1zODGwc/jU97bYi+3ng9c7OkLs4B G6nhqu+dxO6KUBISuxr7VE8A2Q== X-Google-Smtp-Source: ABdhPJzUixR4cXprtcL0kdU8V48DMPXH5yB++Z9bKLAA7gtqyZJj1cJ93Jyt655mZ/m+hL374ligjA== X-Received: by 2002:aa7:d287:: with SMTP id w7mr5456796edq.23.1616518404285; Tue, 23 Mar 2021 09:53:24 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 13/22] utils: Tighter tests for qemu_strtosz Date: Tue, 23 Mar 2021 16:52:59 +0000 Message-Id: <20210323165308.15244-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Eric Blake Our tests were not validating the return value in all cases, nor was it guaranteeing our documented claim that 'res' is unchanged on error. For that matter, it wasn't as thorough as the existing tests for qemu_strtoi() and friends for proving that endptr and res are sanely set. Enhancing the test found one case where we violated our documentation: namely, when failing with EINVAL when endptr is NULL, we shouldn't modify res. Signed-off-by: Eric Blake Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Message-Id: <20210317143325.2165821-2-eblake@redhat.com> Message-Id: <20210320133706.21475-14-alex.bennee@linaro.org> --- tests/unit/test-cutils.c | 117 +++++++++++++++++++++++++++++++++++++-- util/cutils.c | 4 +- 2 files changed, 114 insertions(+), 7 deletions(-) diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index e025b54c05..5908de4fd0 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -1952,9 +1952,11 @@ static void test_qemu_strtosz_simple(void) const char *str; const char *endptr; int err; - uint64_t res =3D 0xbaadf00d; + uint64_t res; =20 str =3D "0"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0); @@ -1962,6 +1964,8 @@ static void test_qemu_strtosz_simple(void) =20 /* Leading 0 gives decimal results, not octal */ str =3D "08"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 8); @@ -1969,46 +1973,61 @@ static void test_qemu_strtosz_simple(void) =20 /* Leading space is ignored */ str =3D " 12345"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 12345); g_assert(endptr =3D=3D str + 6); =20 + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, NULL, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 12345); =20 str =3D "9007199254740991"; /* 2^53-1 */ + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0x1fffffffffffff); g_assert(endptr =3D=3D str + 16); =20 str =3D "9007199254740992"; /* 2^53 */ + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0x20000000000000); g_assert(endptr =3D=3D str + 16); =20 str =3D "9007199254740993"; /* 2^53+1 */ + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0x20000000000001); g_assert(endptr =3D=3D str + 16); =20 str =3D "18446744073709549568"; /* 0xfffffffffffff800 (53 msbs set) */ + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0xfffffffffffff800); g_assert(endptr =3D=3D str + 20); =20 str =3D "18446744073709550591"; /* 0xfffffffffffffbff */ + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0xfffffffffffffbff); g_assert(endptr =3D=3D str + 20); =20 str =3D "18446744073709551615"; /* 0xffffffffffffffff */ + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0xffffffffffffffff); @@ -2020,21 +2039,27 @@ static void test_qemu_strtosz_hex(void) const char *str; const char *endptr; int err; - uint64_t res =3D 0xbaadf00d; + uint64_t res; =20 str =3D "0x0"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0); g_assert(endptr =3D=3D str + 3); =20 str =3D "0xab"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 171); g_assert(endptr =3D=3D str + 4); =20 str =3D "0xae"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 174); @@ -2053,44 +2078,60 @@ static void test_qemu_strtosz_units(void) const char *e =3D "1E"; int err; const char *endptr; - uint64_t res =3D 0xbaadf00d; + uint64_t res; =20 /* default is M */ + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz_MiB(none, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, MiB); g_assert(endptr =3D=3D none + 1); =20 + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(b, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 1); g_assert(endptr =3D=3D b + 2); =20 + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(k, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, KiB); g_assert(endptr =3D=3D k + 2); =20 + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(m, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, MiB); g_assert(endptr =3D=3D m + 2); =20 + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(g, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, GiB); g_assert(endptr =3D=3D g + 2); =20 + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(t, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, TiB); g_assert(endptr =3D=3D t + 2); =20 + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(p, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, PiB); g_assert(endptr =3D=3D p + 2); =20 + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(e, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, EiB); @@ -2102,9 +2143,11 @@ static void test_qemu_strtosz_float(void) const char *str; int err; const char *endptr; - uint64_t res =3D 0xbaadf00d; + uint64_t res; =20 str =3D "0.5E"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, EiB / 2); @@ -2112,6 +2155,8 @@ static void test_qemu_strtosz_float(void) =20 /* For convenience, a fraction of 0 is tolerated even on bytes */ str =3D "1.0B"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 1); @@ -2119,6 +2164,8 @@ static void test_qemu_strtosz_float(void) =20 /* An empty fraction is tolerated */ str =3D "1.k"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 1024); @@ -2126,6 +2173,8 @@ static void test_qemu_strtosz_float(void) =20 /* For convenience, we permit values that are not byte-exact */ str =3D "12.345M"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, (uint64_t) (12.345 * MiB + 0.5)); @@ -2140,67 +2189,91 @@ static void test_qemu_strtosz_invalid(void) uint64_t res =3D 0xbaadf00d; =20 str =3D ""; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 str =3D " \t "; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 str =3D "crap"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 str =3D "inf"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 str =3D "NaN"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 /* Fractional values require scale larger than bytes */ str =3D "1.1B"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 str =3D "1.1"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 /* No floating point exponents */ str =3D "1.5e1k"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 str =3D "1.5E+0k"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 /* No hex fractions */ str =3D "0x1.8k"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 /* No negative values */ str =3D "-0"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); =20 str =3D "-1"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str); } =20 @@ -2209,48 +2282,72 @@ static void test_qemu_strtosz_trailing(void) const char *str; const char *endptr; int err; - uint64_t res =3D 0xbaadf00d; + uint64_t res; =20 str =3D "123xxx"; + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz_MiB(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 123 * MiB); g_assert(endptr =3D=3D str + 3); =20 + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, NULL, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); =20 str =3D "1kiB"; + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 1024); g_assert(endptr =3D=3D str + 2); =20 + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, NULL, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); =20 str =3D "0x"; + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0); g_assert(endptr =3D=3D str + 1); =20 + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, NULL, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); =20 str =3D "0.NaN"; + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 0); g_assert(endptr =3D=3D str + 2); =20 + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, NULL, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); =20 str =3D "123-45"; + endptr =3D NULL; + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 123); g_assert(endptr =3D=3D str + 3); =20 + res =3D 0xbaadf00d; err =3D qemu_strtosz(str, NULL, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); } =20 static void test_qemu_strtosz_erange(void) @@ -2261,13 +2358,17 @@ static void test_qemu_strtosz_erange(void) uint64_t res =3D 0xbaadf00d; =20 str =3D "18446744073709551616"; /* 2^64; see strtosz_simple for 2^64-1= */ + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -ERANGE); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str + 20); =20 str =3D "20E"; + endptr =3D NULL; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -ERANGE); + g_assert_cmpint(res, =3D=3D, 0xbaadf00d); g_assert(endptr =3D=3D str + 3); } =20 @@ -2276,15 +2377,19 @@ static void test_qemu_strtosz_metric(void) const char *str; int err; const char *endptr; - uint64_t res =3D 0xbaadf00d; + uint64_t res; =20 str =3D "12345k"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz_metric(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 12345000); g_assert(endptr =3D=3D str + 6); =20 str =3D "12.345M"; + endptr =3D str; + res =3D 0xbaadf00d; err =3D qemu_strtosz_metric(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 12345000); diff --git a/util/cutils.c b/util/cutils.c index c442882b88..b425ed6570 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -362,7 +362,6 @@ static int do_strtosz(const char *nptr, const char **en= d, } } =20 - *result =3D val; retval =3D 0; =20 out: @@ -371,6 +370,9 @@ out: } else if (*endptr) { retval =3D -EINVAL; } + if (retval =3D=3D 0) { + *result =3D val; + } =20 return retval; } --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616522288; cv=none; d=zohomail.com; s=zohoarc; b=FLf0PX5iannRq0OyOPVRLNwNjiGR3jsz0J906p9sYyyMNT82DHB87T6Cb+g29Ac7pgfglgkLzFsOCcO0s4lRw9YJeo+7kmmShC0jsiXF08LT+FooVlvDj2HeU5zoIjZamAmZnHxVviEHXDI73W6E1mwC4W7SbhgQ2Wu4yEceoTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616522288; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uLf1HKC40KrDyqu/nCAq35T+MmnrzCN581j6+laXy18=; b=jrY0sMviO7u2D6CzehlFysN4Qm9ALXQwWNMMzNOIUMc0LegojXT4oFUoN1GBvs6LYYtTvEn/zAH68H4a1n1CADNz6ITrty8x+wHByGB+Ow880000k4lq0/vLxbEhlAtLeFGfp03qDuZhLaPy+A5fTSfLHx8bUpkgZIzK4POWcpI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616522288919631.024607478936; Tue, 23 Mar 2021 10:58:08 -0700 (PDT) Received: from localhost ([::1]:33660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOlI7-0001DA-Oy for importer@patchew.org; Tue, 23 Mar 2021 13:58:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkMq-0006xr-F7 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:58:56 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:35338) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkMn-0005va-2p for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:58:56 -0400 Received: by mail-ed1-x530.google.com with SMTP id dm8so24301953edb.2 for ; Tue, 23 Mar 2021 09:58:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h22sm11385550eji.80.2021.03.23.09.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:58:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5006D1FF9B; Tue, 23 Mar 2021 16:53:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uLf1HKC40KrDyqu/nCAq35T+MmnrzCN581j6+laXy18=; b=BGhP+DutCaD0278iYZmykIlLI07f0mSFplNlupUn2IFMB6mOV1UO02tvMYzxono3Ck gDaLKYJmvdJBOuGBrNyLZia5XFezf8Oe9fFrnjkNTfinLR2v70pfrXDuLC14PYFT7Xp9 XNMkwrPqRnGogmhr5T3scohBjBuwbtDaZlfZEtOZ5REOmASztC896lEL4zHQs8Arjndy ZfkjNpyPba4V8pHW14kNYWOhwkyG7I2SB3IQyHsktywcpv5cziY+0iPBlry4fclV3y9/ OWIoOOgP9kd3ScwDdScINxsaubSNF+43BpXQjysFCGin4tKuQaHS1uxOdaIWRGjk6ACt slQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uLf1HKC40KrDyqu/nCAq35T+MmnrzCN581j6+laXy18=; b=XLjvFAXUaziPj147050N8yNkTHEtoSUWWXSoXL1RTEcHbvcfVNpn/5DZ6DQGrdRuH5 pLK4YpKOUe/vhJQA6nqtN2cCyFq9KyoEy3jvF0uhqPsEddZiVjBvCFQYYeD4iMd9A/Ws qwO+vhvzcHHj0BlejCqeli9EAiu4/CjM8+N0SEl2Xapc7q3SfWWpvtGBPLe4SHCWb/RZ F3wbg2mJCwxerIkzEtDMR2LrZp6tip09jBJD/PISm6+2FsvTNMelByiIm8rcO+umG2Gn gw6JQrgUA2ClZJdoX3doHpr14RTkIQV1L6Vq8m5/gfKLUHdyu74wiNmtTnjhoKvJtMNo Olqw== X-Gm-Message-State: AOAM530RAYWTRmqxQ9aVMqG2co8r6N7q7sq5weSVfwhiypPEAEr/APOf OdYTOrFjT25fcc1LPggXjA9LIA== X-Google-Smtp-Source: ABdhPJx5oeJ4+zhRMra4H/4SnXyuGWylQg5pDK+GhyQyE6jUDQEdgMkueTPb8MqcXViPsQxwmS6Bbg== X-Received: by 2002:aa7:da97:: with SMTP id q23mr5460234eds.180.1616518730952; Tue, 23 Mar 2021 09:58:50 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 14/22] utils: Work around mingw strto*l bug with 0x Date: Tue, 23 Mar 2021 16:53:00 +0000 Message-Id: <20210323165308.15244-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Eric Blake Mingw recognizes that "0x" has value 0 without setting errno, but fails to advance endptr to the trailing garbage 'x'. This in turn showed up in our recent testsuite additions for qemu_strtosz (commit 1657ba44b4 utils: Enhance testsuite for do_strtosz()); adjust our remaining tests to show that we now work around this windows bug. This patch intentionally fails check-syntax for use of strtol. Signed-off-by: Eric Blake Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Message-Id: <20210317143325.2165821-3-eblake@redhat.com> Message-Id: <20210320133706.21475-15-alex.bennee@linaro.org> --- tests/unit/test-cutils.c | 54 ++++++++++++++++++++++++++++++++++++++++ util/cutils.c | 29 +++++++++++++++------ 2 files changed, 75 insertions(+), 8 deletions(-) diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index 5908de4fd0..98671f1ac3 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -378,6 +378,15 @@ static void test_qemu_strtoi_hex(void) g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0x123); g_assert(endptr =3D=3D str + strlen(str)); + + str =3D "0x"; + res =3D 999; + endptr =3D &f; + err =3D qemu_strtoi(str, &endptr, 16, &res); + + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 0); + g_assert(endptr =3D=3D str + 1); } =20 static void test_qemu_strtoi_max(void) @@ -669,6 +678,15 @@ static void test_qemu_strtoui_hex(void) g_assert_cmpint(err, =3D=3D, 0); g_assert_cmphex(res, =3D=3D, 0x123); g_assert(endptr =3D=3D str + strlen(str)); + + str =3D "0x"; + res =3D 999; + endptr =3D &f; + err =3D qemu_strtoui(str, &endptr, 16, &res); + + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmphex(res, =3D=3D, 0); + g_assert(endptr =3D=3D str + 1); } =20 static void test_qemu_strtoui_max(void) @@ -955,6 +973,15 @@ static void test_qemu_strtol_hex(void) g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0x123); g_assert(endptr =3D=3D str + strlen(str)); + + str =3D "0x"; + res =3D 999; + endptr =3D &f; + err =3D qemu_strtol(str, &endptr, 16, &res); + + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 0); + g_assert(endptr =3D=3D str + 1); } =20 static void test_qemu_strtol_max(void) @@ -1244,6 +1271,15 @@ static void test_qemu_strtoul_hex(void) g_assert_cmpint(err, =3D=3D, 0); g_assert_cmphex(res, =3D=3D, 0x123); g_assert(endptr =3D=3D str + strlen(str)); + + str =3D "0x"; + res =3D 999; + endptr =3D &f; + err =3D qemu_strtoul(str, &endptr, 16, &res); + + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmphex(res, =3D=3D, 0); + g_assert(endptr =3D=3D str + 1); } =20 static void test_qemu_strtoul_max(void) @@ -1528,6 +1564,15 @@ static void test_qemu_strtoi64_hex(void) g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0x123); g_assert(endptr =3D=3D str + strlen(str)); + + str =3D "0x"; + endptr =3D &f; + res =3D 999; + err =3D qemu_strtoi64(str, &endptr, 16, &res); + + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 0); + g_assert(endptr =3D=3D str + 1); } =20 static void test_qemu_strtoi64_max(void) @@ -1815,6 +1860,15 @@ static void test_qemu_strtou64_hex(void) g_assert_cmpint(err, =3D=3D, 0); g_assert_cmphex(res, =3D=3D, 0x123); g_assert(endptr =3D=3D str + strlen(str)); + + str =3D "0x"; + endptr =3D &f; + res =3D 999; + err =3D qemu_strtou64(str, &endptr, 16, &res); + + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmphex(res, =3D=3D, 0); + g_assert(endptr =3D=3D str + 1); } =20 static void test_qemu_strtou64_max(void) diff --git a/util/cutils.c b/util/cutils.c index b425ed6570..ee908486da 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -396,9 +396,22 @@ int qemu_strtosz_metric(const char *nptr, const char *= *end, uint64_t *result) * Helper function for error checking after strtol() and the like */ static int check_strtox_error(const char *nptr, char *ep, - const char **endptr, int libc_errno) + const char **endptr, bool check_zero, + int libc_errno) { assert(ep >=3D nptr); + + /* Windows has a bug in that it fails to parse 0 from "0x" in base 16 = */ + if (check_zero && ep =3D=3D nptr && libc_errno =3D=3D 0) { + char *tmp; + + errno =3D 0; + if (strtol(nptr, &tmp, 10) =3D=3D 0 && errno =3D=3D 0 && + (*tmp =3D=3D 'x' || *tmp =3D=3D 'X')) { + ep =3D tmp; + } + } + if (endptr) { *endptr =3D ep; } @@ -465,7 +478,7 @@ int qemu_strtoi(const char *nptr, const char **endptr, = int base, } else { *result =3D lresult; } - return check_strtox_error(nptr, ep, endptr, errno); + return check_strtox_error(nptr, ep, endptr, lresult =3D=3D 0, errno); } =20 /** @@ -524,7 +537,7 @@ int qemu_strtoui(const char *nptr, const char **endptr,= int base, *result =3D lresult; } } - return check_strtox_error(nptr, ep, endptr, errno); + return check_strtox_error(nptr, ep, endptr, lresult =3D=3D 0, errno); } =20 /** @@ -566,7 +579,7 @@ int qemu_strtol(const char *nptr, const char **endptr, = int base, =20 errno =3D 0; *result =3D strtol(nptr, &ep, base); - return check_strtox_error(nptr, ep, endptr, errno); + return check_strtox_error(nptr, ep, endptr, *result =3D=3D 0, errno); } =20 /** @@ -613,7 +626,7 @@ int qemu_strtoul(const char *nptr, const char **endptr,= int base, if (errno =3D=3D ERANGE) { *result =3D -1; } - return check_strtox_error(nptr, ep, endptr, errno); + return check_strtox_error(nptr, ep, endptr, *result =3D=3D 0, errno); } =20 /** @@ -639,7 +652,7 @@ int qemu_strtoi64(const char *nptr, const char **endptr= , int base, QEMU_BUILD_BUG_ON(sizeof(int64_t) !=3D sizeof(long long)); errno =3D 0; *result =3D strtoll(nptr, &ep, base); - return check_strtox_error(nptr, ep, endptr, errno); + return check_strtox_error(nptr, ep, endptr, *result =3D=3D 0, errno); } =20 /** @@ -668,7 +681,7 @@ int qemu_strtou64(const char *nptr, const char **endptr= , int base, if (errno =3D=3D ERANGE) { *result =3D -1; } - return check_strtox_error(nptr, ep, endptr, errno); + return check_strtox_error(nptr, ep, endptr, *result =3D=3D 0, errno); } =20 /** @@ -708,7 +721,7 @@ int qemu_strtod(const char *nptr, const char **endptr, = double *result) =20 errno =3D 0; *result =3D strtod(nptr, &ep); - return check_strtox_error(nptr, ep, endptr, errno); + return check_strtox_error(nptr, ep, endptr, false, errno); } =20 /** --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616522328; cv=none; d=zohomail.com; s=zohoarc; b=Y7uVcZyQIsI6xGAuXwn/WCycGMGSWBpoBeFe+lpEWpgQ2HcVHOF+NyVYvXlLBXTQAiyecBFnl5kpGa6qEG1lSsLGgMPYchVgcaHDl3tggwzoH53/yeS2O1nu+vSKd8j3D3A148LFD38tho/czagNPCWmUafeEkzIb/8c04bAt/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616522328; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4xrQH7esbMfiiZ+dFgNuGnNZQNjghRSg7ZJWrQGy1Gw=; b=BuP3jrOi3Hof4DMb1e2KOlB2FAry+lKm9UWagAJiETiwzAYXRB/hh+WWF+1WOJJRg9pZW1bEIXRN3S6upum/8EJMFRHyjk0IAxowK6WYmPcBXwkqidGAivqFCIiiTY3u5g2itV1RlP3wN4NPcK/X7VcOA/YWOhG0797sUf2BQTQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616522328525360.2139642632774; Tue, 23 Mar 2021 10:58:48 -0700 (PDT) Received: from localhost ([::1]:35622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOlIk-0002SU-8j for importer@patchew.org; Tue, 23 Mar 2021 13:58:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkN4-0007Lt-0i for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:10 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:46795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkMw-00060P-92 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:09 -0400 Received: by mail-ed1-x52a.google.com with SMTP id h10so24235096edt.13 for ; Tue, 23 Mar 2021 09:59:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g26sm11272138ejz.70.2021.03.23.09.58.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:58:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7A5B61FF9C; Tue, 23 Mar 2021 16:53:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4xrQH7esbMfiiZ+dFgNuGnNZQNjghRSg7ZJWrQGy1Gw=; b=ia7argiWDwmLuhtfUn1+kUi2qWewm9NXbpM6i9PBemhoo3UpkrV2Aa1SbbhIfgXE2d jS+JqpN/z/CzEIFfqvANthleW/uje+w0V6DjVFKZO0MyTWz1aGWDGx6I2KaSqwVWO5mw GcCZppJ/28eICcPsffLac3Z8e2zceQmcNDw752c7mILd8HHTcmuj76B57kTBasFuyC2H AFAyVySMk0HP5IZEIT12Xxy9ybBINfwp9OS7LLlP0qm40yTuYZqWU668yezpG8G+ipGh LdUq6au2tqJebQsGaNdyQzasNMM6Iju0v5KzISbcrJdRvvWUJ+XPpRvSVkcoZGJlGdkp unrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4xrQH7esbMfiiZ+dFgNuGnNZQNjghRSg7ZJWrQGy1Gw=; b=L6DzXwEKhkIDiQebWif4yyz2tRsnpXijsVzI6WjQZZg3GKb72JBSPk/AZ5tOzB7dxm HJd7xHoxCARM6zuRQMZOkpFsbUJlAkZDud/x92cmfR8baqrsythzYIkJjmdDyVTKyGfe 3swCF8NLHzgvljtpCWlHhE3QEWUUPtx5oF2DwaBLH+tsrBy/SPROkYvrt/WS3yg64XLF vftHZ6ukRfdM5L1RVORe24z2hT2UwVgDf+ngRb0Fj72oKiw4pP6g/rUw9XwUnzJhli7z Ihp5/QjbSsOhfJFVQsvjwAsfisFzmiAd3A0YByhZnXF2LSsfY6BB0jy/TQsDqvzZE5A9 lmcg== X-Gm-Message-State: AOAM531AXiHiR6yzNGydC/3AyvVRujKh8K+GCBp9bDAwFIG/6Em2Ykpm P+K51r8ckb8pkYNudqhMR+WDJA== X-Google-Smtp-Source: ABdhPJyXzYi6Hpgq9cjzcP3aeE4GxZSWo/fUwNK2NevHrWbZ3X/DC3tuGMfDaMwK42AC6uy/muLuqg== X-Received: by 2002:a05:6402:34d5:: with SMTP id w21mr5533172edc.14.1616518739590; Tue, 23 Mar 2021 09:58:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 15/22] gitlab: extend timeouts for CFI builds Date: Tue, 23 Mar 2021 16:53:01 +0000 Message-Id: <20210323165308.15244-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Willian Rampazzo , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) These builds are running very close to the default build limit and as they are already pared down the only other option is to extend the timeout a little to give some breathing room. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210322142110.4766-1-alex.bennee@linaro.org> --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f746d5fbea..9ffbaa7ffb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -502,6 +502,7 @@ build-cfi-aarch64: --enable-safe-stack --enable-slirp=3Dgit TARGETS: aarch64-softmmu MAKE_CHECK_ARGS: check-build + timeout: 70m artifacts: expire_in: 2 days paths: @@ -538,6 +539,7 @@ build-cfi-ppc64-s390x: --enable-safe-stack --enable-slirp=3Dgit TARGETS: ppc64-softmmu s390x-softmmu MAKE_CHECK_ARGS: check-build + timeout: 70m artifacts: expire_in: 2 days paths: @@ -574,6 +576,7 @@ build-cfi-x86_64: --enable-safe-stack --enable-slirp=3Dgit TARGETS: x86_64-softmmu MAKE_CHECK_ARGS: check-build + timeout: 70m artifacts: expire_in: 2 days paths: --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616523405; cv=none; d=zohomail.com; s=zohoarc; b=Tui2cui9+/gYuaUuazH4G0nelIStzP0ZAMuj3JvI3irI93p3ak/CzFCY9fSv9lBz7eh7c4BpyW4LgEdGw4mLU2eZOJRGTcde5BqSIda/dWowTN7CzTUektU/oi1r7b36JtJk9HgZ61moZmEW+zsdMBJgJDqBpjWSHnebvLuLgBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616523405; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4qL/PVo/1XqiC3Jn7ch8pkFIeXOsa45U8xbPHc3nqf8=; b=BuYzUrG3FUvjwgWrLsdehU5cNT7rL2aP0dDDx+NDtIft/NTAVR0hFNdON3ZA9K7bM0W5+lcOaX9WhpBjQwrdLlrF795dhUd9FqrfGSXsJlvMGhYemZP10br1yGX5LWkQExbmIrF7/z2xP/Tc3f7GN5x0bEA2oAVDVN4tjWL/Nhc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616523405475264.2758251074165; Tue, 23 Mar 2021 11:16:45 -0700 (PDT) Received: from localhost ([::1]:60718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOla8-0004Xt-Is for importer@patchew.org; Tue, 23 Mar 2021 14:16:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkN5-0007Qr-W7 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:12 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]:39921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkMw-00060V-8z for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:11 -0400 Received: by mail-ed1-x52f.google.com with SMTP id bf3so24302650edb.6 for ; Tue, 23 Mar 2021 09:59:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id ho19sm11084079ejc.57.2021.03.23.09.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:58:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AC2061FF9D; Tue, 23 Mar 2021 16:53:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4qL/PVo/1XqiC3Jn7ch8pkFIeXOsa45U8xbPHc3nqf8=; b=LHJ0eH4siR0z/KeAlTfCsnskaWktLo+zMmiroAYxxQSHKZwyCyjOGj3LeJ7uNutuWw 7M2bh6DwxAizMnkPwTXTH0U4rj0vEVUCJiykpq3VOwDrW/gyb0dElktJfSn+tUaux6TA Tu2Lmaw7cuW+Be5NKcZVaUI37753ptrdd2FsruhC21fW8qKgSI38Ty7NbYhW0EUEObmf P8vXQNaBsejhjTTw+tySL00nA9wB2gFcA6NWH/yrx+3SiWs5paWeVX8ylDlMnGodIZF7 7W23Ni06HlPoLG+YTuHXmtulz1dDiZpjkQH8iuSjYHdTeNVv97ZXOIPrZgQMILbHq975 UC/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4qL/PVo/1XqiC3Jn7ch8pkFIeXOsa45U8xbPHc3nqf8=; b=XMV/ACJE96/TseemEosd9BAqoJoJeg/+C5W13i0fGsiCvzTpB/HViPKAAOO0Go1RcX pOPKb8Ll4j0eh7yFUTiEvgOxLMrkJFbzOJqU9WZjP4j/YZJZQHDcnZIdZUdw+m11J0yD UdyoI4P656z9g9EzKQTezaT48sIinwJmBgV9mvHED78E7m6qfLKaLAA3zoqtkVuyvlZq dZedb1TyT/tIYQ0x5ul+dLiBZ7VsRzfVeHyJ+3F9ycpvF1WBWmbp3BsWQtwlyg3mfsow eFnYvqi5Qq3/HdNvt/9o6b5W39qM+td8ach5G3SoiWInwHFHLnZvwdcpZlirnSbsdJ9M a7sg== X-Gm-Message-State: AOAM533ocvj22E1G55M3JRPKsKhG0Ik/l28mGyrBBHVSX7Ktza+qWA43 FoihJNR2WTdEN7mgTjXTNJR6XHkNuT++k4I0 X-Google-Smtp-Source: ABdhPJwUfa3D585U4GmAtAPdYxqW8pD2FdsGyGWIRzzCs+bQlsGnSHMHnIt0C8klbQUOZss/dsS2nA== X-Received: by 2002:a05:6402:4309:: with SMTP id m9mr5724560edc.25.1616518740446; Tue, 23 Mar 2021 09:59:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 16/22] qdev: define list of archs with virtio-pci or virtio-ccw Date: Tue, 23 Mar 2021 16:53:02 +0000 Message-Id: <20210323165308.15244-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Cornelia Huck , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Laurent Vivier This is used to define virtio-*-pci and virtio-*-ccw aliases rather than substracting the CCW architecture from all the others. Signed-off-by: Laurent Vivier Reviewed-by: Cornelia Huck Message-Id: <20210319202335.2397060-2-laurent@vivier.eu> Signed-off-by: Alex Benn=C3=A9e --- include/sysemu/arch_init.h | 8 ++++++ softmmu/qdev-monitor.c | 53 ++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 54f069d491..0c90706516 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -35,4 +35,12 @@ extern const uint32_t arch_type; int kvm_available(void); int xen_available(void); =20 +/* default virtio transport per architecture */ +#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \ + QEMU_ARCH_HPPA | QEMU_ARCH_I386 | \ + QEMU_ARCH_MIPS | QEMU_ARCH_PPC | \ + QEMU_ARCH_RISCV | QEMU_ARCH_SH4 | \ + QEMU_ARCH_SPARC | QEMU_ARCH_XTENSA) +#define QEMU_ARCH_VIRTIO_CCW (QEMU_ARCH_S390X) + #endif diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 8dc656becc..0b40c97c6e 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -60,34 +60,31 @@ static const QDevAlias qdev_alias_table[] =3D { { "ES1370", "es1370" }, /* -soundhw name */ { "ich9-ahci", "ahci" }, { "lsi53c895a", "lsi" }, - { "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_S390X }, - { "virtio-9p-pci", "virtio-9p", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-balloon-ccw", "virtio-balloon", QEMU_ARCH_S390X }, - { "virtio-balloon-pci", "virtio-balloon", - QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X }, - { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-gpu-ccw", "virtio-gpu", QEMU_ARCH_S390X }, - { "virtio-gpu-pci", "virtio-gpu", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-input-host-ccw", "virtio-input-host", QEMU_ARCH_S390X }, - { "virtio-input-host-pci", "virtio-input-host", - QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-iommu-pci", "virtio-iommu", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X= }, - { "virtio-keyboard-ccw", "virtio-keyboard", QEMU_ARCH_S390X }, - { "virtio-keyboard-pci", "virtio-keyboard", - QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-mouse-ccw", "virtio-mouse", QEMU_ARCH_S390X }, - { "virtio-mouse-pci", "virtio-mouse", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X= }, - { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X }, - { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-rng-ccw", "virtio-rng", QEMU_ARCH_S390X }, - { "virtio-rng-pci", "virtio-rng", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-scsi-ccw", "virtio-scsi", QEMU_ARCH_S390X }, - { "virtio-scsi-pci", "virtio-scsi", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X }, - { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S39= 0X }, - { "virtio-tablet-ccw", "virtio-tablet", QEMU_ARCH_S390X }, - { "virtio-tablet-pci", "virtio-tablet", QEMU_ARCH_ALL & ~QEMU_ARCH_S39= 0X }, + { "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-9p-pci", "virtio-9p", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-balloon-ccw", "virtio-balloon", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-balloon-pci", "virtio-balloon", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-gpu-ccw", "virtio-gpu", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-gpu-pci", "virtio-gpu", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-input-host-ccw", "virtio-input-host", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-input-host-pci", "virtio-input-host", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-iommu-pci", "virtio-iommu", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-keyboard-ccw", "virtio-keyboard", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-keyboard-pci", "virtio-keyboard", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-mouse-ccw", "virtio-mouse", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-mouse-pci", "virtio-mouse", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-net-ccw", "virtio-net", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-net-pci", "virtio-net", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-rng-ccw", "virtio-rng", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-rng-pci", "virtio-rng", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-scsi-ccw", "virtio-scsi", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-scsi-pci", "virtio-scsi", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_VIRTIO_PCI}, + { "virtio-tablet-ccw", "virtio-tablet", QEMU_ARCH_VIRTIO_CCW }, + { "virtio-tablet-pci", "virtio-tablet", QEMU_ARCH_VIRTIO_PCI }, { } }; =20 --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616522549; cv=none; d=zohomail.com; s=zohoarc; b=bOqtkhEm/ofMxTgrf1DxFPscfhTfI25O943R1d0MgDotGuuRsO3q4v/VEV+1zrNJlcUNzLcX0jDrDkyHOT1Gw6KUM9gPzJheEmO/EgK6jXAdUYbWBuzmNDfLUhHA3kaO4tvvpZ5CSN/lWbKP09HfnnQxHkHkemUdpt1QKsTvUVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616522549; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Fc/Dd/qTuhlyfrWCSVhIMmkOAWAkiW0BiozfHOUPBs0=; b=Ulpb/TM2l1JO9wpo3AgwKB7ua3hI/Wwlgn/dBi9OCjqpFUY4Y9enkbilpMak2iREbxO+rLex1cmjY4oXnik7x+j19LaGBu0dYNATux+0G0KnR4S5FwKw9eTPtadMbmBMmvwweGu+PILT/FsPH/S67gGZvjY1cMFkFZfhE8kZAZY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616522549192466.83482539891213; Tue, 23 Mar 2021 11:02:29 -0700 (PDT) Received: from localhost ([::1]:40966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOlMJ-0006L8-SK for importer@patchew.org; Tue, 23 Mar 2021 14:02:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkMv-00074j-2v for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:01 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:39449) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkMq-0005xf-82 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:00 -0400 Received: by mail-ej1-x635.google.com with SMTP id ce10so28266712ejb.6 for ; Tue, 23 Mar 2021 09:58:55 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w6sm11398859eje.107.2021.03.23.09.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:58:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DF12E1FF9E; Tue, 23 Mar 2021 16:53:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fc/Dd/qTuhlyfrWCSVhIMmkOAWAkiW0BiozfHOUPBs0=; b=TADFzYNVvxKQ63J8lLexDeReqSidkhcyrenrEaRcKzL/JTdSRYEKD5mwcI+1FIDiuP VZ7vSzBDQoUGLm2E3s1VjitFxKJE/QLlU+gmJRx2hXHD/FY4aoHrp8R4TLQT7Ov5jplr 6+7a/V9oQlGBZmay74953zP3oTqnZL3NWqNaXWbfa+jRV5TSt/TpFHZFXCsM5hyui7bA adQZJI8oGDyXQALjjiu/nFBsPSFNwP+0VbnBROtRj3zYs8i6Q8EOASVmZNkyOdDcWbKh +Omm2liXbkPndV0WmHcGD4Ooc30S1on+fN0hGBBrqvr/k4L/y1XIXefQxGk7AULYUgns xi4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fc/Dd/qTuhlyfrWCSVhIMmkOAWAkiW0BiozfHOUPBs0=; b=CUrQpHRCbQPBreSd7Qw5PGqBlhyWcgaR5QU6FMBsu4XWnFrUjBgpHdYzYKD+tb8fgZ s5SekI1Rsyl25HoMU2yp7UVIQp2ZVN6D8YHvnY/gsbhn1e323QP/kKPfrtF7VBzDWjuj iiDb077m0Ytrurml0Feu9nZhmKcTWRsy46RAoVe58OkarFzGgsUvQViCSYS4I/AGffSm VbMpCqHuXEXLReabjW/x21ppUyC2KEl+1VCzYD7t1lQdcuqWkPrfSos9Q2DoJKMT9eJX 1nqXgtV8rbEreFKnmA9A/SD4zk5OCrufLpTCzQy1WwfTqG/TOAjb4LfznU4PTCQoYjJJ +D7w== X-Gm-Message-State: AOAM5323Eto+LOOfcP/1RTa1XXbYQUHinDnTfeuI1NqC/u5mAJYTyYOD XlhPxP2MHbfZ+at7uChtx+nlhg== X-Google-Smtp-Source: ABdhPJzyzbKk/vu82OH5BlbpGrfM+UHMjkwaPD4mgAoynGjESmV9xh3QEI0OE0+cR/GEopC+p2jOlQ== X-Received: by 2002:a17:906:1985:: with SMTP id g5mr5743050ejd.285.1616518733921; Tue, 23 Mar 2021 09:58:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 17/22] m68k: add the virtio devices aliases Date: Tue, 23 Mar 2021 16:53:03 +0000 Message-Id: <20210323165308.15244-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Cornelia Huck , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Laurent Vivier Similarly to 5f629d943cb0 ("s390x: fix s390 virtio aliases"), define the virtio aliases. This allows to start machines with virtio devices without knowledge of the implementation type. For instance, we can use "-device virtio-scsi" on m68k, s390x or PC, and the device will be respectively "virtio-scsi-device", "virtio-scsi-ccw" or "virtio-scsi-pci". This already exists for s390x and -ccw interfaces, add them for m68k and MMIO (-device) interfaces. Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Cornelia Huck Message-Id: <20210319202335.2397060-3-laurent@vivier.eu> Signed-off-by: Alex Benn=C3=A9e --- include/sysemu/arch_init.h | 1 + softmmu/qdev-monitor.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 0c90706516..16da279696 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -42,5 +42,6 @@ int xen_available(void); QEMU_ARCH_RISCV | QEMU_ARCH_SH4 | \ QEMU_ARCH_SPARC | QEMU_ARCH_XTENSA) #define QEMU_ARCH_VIRTIO_CCW (QEMU_ARCH_S390X) +#define QEMU_ARCH_VIRTIO_MMIO (QEMU_ARCH_M68K) =20 #endif diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 0b40c97c6e..a9955b97a0 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -60,29 +60,41 @@ static const QDevAlias qdev_alias_table[] =3D { { "ES1370", "es1370" }, /* -soundhw name */ { "ich9-ahci", "ahci" }, { "lsi53c895a", "lsi" }, + { "virtio-9p-device", "virtio-9p", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_VIRTIO_CCW }, { "virtio-9p-pci", "virtio-9p", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-balloon-device", "virtio-balloon", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-balloon-ccw", "virtio-balloon", QEMU_ARCH_VIRTIO_CCW }, { "virtio-balloon-pci", "virtio-balloon", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-blk-device", "virtio-blk", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_VIRTIO_CCW }, { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-gpu-device", "virtio-gpu", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-gpu-ccw", "virtio-gpu", QEMU_ARCH_VIRTIO_CCW }, { "virtio-gpu-pci", "virtio-gpu", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-input-host-device", "virtio-input-host", QEMU_ARCH_VIRTIO_MM= IO }, { "virtio-input-host-ccw", "virtio-input-host", QEMU_ARCH_VIRTIO_CCW }, { "virtio-input-host-pci", "virtio-input-host", QEMU_ARCH_VIRTIO_PCI }, { "virtio-iommu-pci", "virtio-iommu", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-keyboard-device", "virtio-keyboard", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-keyboard-ccw", "virtio-keyboard", QEMU_ARCH_VIRTIO_CCW }, { "virtio-keyboard-pci", "virtio-keyboard", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-mouse-device", "virtio-mouse", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-mouse-ccw", "virtio-mouse", QEMU_ARCH_VIRTIO_CCW }, { "virtio-mouse-pci", "virtio-mouse", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-net-device", "virtio-net", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-net-ccw", "virtio-net", QEMU_ARCH_VIRTIO_CCW }, { "virtio-net-pci", "virtio-net", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-rng-device", "virtio-rng", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-rng-ccw", "virtio-rng", QEMU_ARCH_VIRTIO_CCW }, { "virtio-rng-pci", "virtio-rng", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-scsi-device", "virtio-scsi", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-scsi-ccw", "virtio-scsi", QEMU_ARCH_VIRTIO_CCW }, { "virtio-scsi-pci", "virtio-scsi", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-serial-device", "virtio-serial", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_VIRTIO_CCW }, { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_VIRTIO_PCI}, + { "virtio-tablet-device", "virtio-tablet", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-tablet-ccw", "virtio-tablet", QEMU_ARCH_VIRTIO_CCW }, { "virtio-tablet-pci", "virtio-tablet", QEMU_ARCH_VIRTIO_PCI }, { } --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616520141; cv=none; d=zohomail.com; s=zohoarc; b=eySFh357GbkTQgfY3IrI8OykUSnIIjXw0bku1ahtfpPzbOUzZuY7YSOLvvH3+H/M1/Z2p/i0cUbM8svhKD7VpOK2DTLdsCz95bp9g306S40t89kDrdq2xzTpilOmtPpmyWsqiTH3/X1/Vt5+6aIpwMrWC1TDP5YUgV3B4JgwkRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616520141; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T09JXAieuC5lCz4KQSw0Px8wxRw9/FqpVz/R+u05gxY=; b=CyII3bXsROEv8c/QPcDNKQVZ/h+7mpSsmwGEZX6zrZTlpjUsVoVx8y1u8krwL+IGcOS1XJaBW0He4+YCAs3almfR9i5OQ5KGjMjiDzH3EZJD8l8Hlwvf4b+Sf0S5z8c1vGG7DkxM/bPCNsIEHcIy5semjlT1/n0L6Qu7DKnoeTc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616520141419936.2283974819063; Tue, 23 Mar 2021 10:22:21 -0700 (PDT) Received: from localhost ([::1]:38922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkjS-0004P4-UM for importer@patchew.org; Tue, 23 Mar 2021 13:22:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkMu-00074Q-Ve for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:00 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:46796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkMq-0005xj-8J for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:58:59 -0400 Received: by mail-ed1-x52c.google.com with SMTP id h10so24234787edt.13 for ; Tue, 23 Mar 2021 09:58:55 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u15sm13340888eds.6.2021.03.23.09.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:58:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1A0BC1FF9F; Tue, 23 Mar 2021 16:53:12 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T09JXAieuC5lCz4KQSw0Px8wxRw9/FqpVz/R+u05gxY=; b=z1MpINiRSk4AwL/JUncs8zimG1TLpfINyPnFiuKvEoZzVAY5DvR60wn2pQ9Qdp99Z5 3Km3C9JLVChul/6dmC7dVRPpf5fogzeYG+OBVLeJrHo+DAgsypuBb7k6nE57iwvVS5La 96FfoDnRZ2ZNf3WBJId+SBZud1I0KS2vKoAu9/UuNz+VS0izL56mNMVNza2FH1hWFTmb p3IE7OaSfiomh4P4zbKO/g/TW5wvaB+MiPRJs1LSOweLMUUK1giufVI/Cd37v0XIo7HX 2tLKrFWKS5vxRQ8F6pEtkiHs+wqYgOB+srrwBuh8zM62gUvEos+aZbFs5CqSSEbRGrlB IsPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T09JXAieuC5lCz4KQSw0Px8wxRw9/FqpVz/R+u05gxY=; b=AoavR/6aa95bE/tmfGch21E6Fy6wJ1FA3tnDJMVQYLWiY0vJi53mKyWzckrM8/CFZD OI6M7nJOxg5mcPH3EfPkr5XRqklXIueU+AbVIbu6mDkx3PmAIpplPbBl0TH1v9V3yGRw enuHfYrPtE43sBaSjqScC0vNqDBBx0pEEZBy7osFeyG+4ok5OixIRXm9EE4KP5ZPAWUS atb5UuwguZp0KR63CuyYRdOnGDUwxQWMiNPmkqhhfkrUjTmjGsO2tM4tex3h7BfMRWev hozGLH/y5T77WEOxn1W2VFDOFwaA/eEi0hnhY/cQZu7mimo3rANe6PtotGoHd/fJ9LVJ nl6A== X-Gm-Message-State: AOAM533OrTWg+Ud5OyezkDP2s7Ye0wnFSfrM+haasa68JeIvKFgJgTEd OYWqrWEcvV5Th4qXrJwrcHPlqw== X-Google-Smtp-Source: ABdhPJx30o/ooB5BJXgBH6aaJjsS3E03zG2a74gIMCZertpcMTsjNBY9TEG3MkElY5uDAQNZ97V05Q== X-Received: by 2002:aa7:c550:: with SMTP id s16mr5550235edr.98.1616518734541; Tue, 23 Mar 2021 09:58:54 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 18/22] blockdev: with -drive if=virtio, use generic virtio-blk Date: Tue, 23 Mar 2021 16:53:04 +0000 Message-Id: <20210323165308.15244-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "open list:Block layer core" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Max Reitz , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Laurent Vivier Rather than checking if the machine is an s390x to use virtio-blk-ccw instead of virtio-blk-pci, use the alias virtio-blk that is set to the expected target. This also enables the use of virtio-blk-device for targets without PCI or CCW. Signed-off-by: Laurent Vivier Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Markus Armbruster Message-Id: <20210319202335.2397060-4-laurent@vivier.eu> Signed-off-by: Alex Benn=C3=A9e --- blockdev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/blockdev.c b/blockdev.c index cf70bb4e43..413aacf604 100644 --- a/blockdev.c +++ b/blockdev.c @@ -962,11 +962,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfac= eType block_default_type, QemuOpts *devopts; devopts =3D qemu_opts_create(qemu_find_opts("device"), NULL, 0, &error_abort); - if (arch_type =3D=3D QEMU_ARCH_S390X) { - qemu_opt_set(devopts, "driver", "virtio-blk-ccw", &error_abort= ); - } else { - qemu_opt_set(devopts, "driver", "virtio-blk-pci", &error_abort= ); - } + qemu_opt_set(devopts, "driver", "virtio-blk", &error_abort); qemu_opt_set(devopts, "drive", qdict_get_str(bs_opts, "id"), &error_abort); } --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616522602; cv=none; d=zohomail.com; s=zohoarc; b=GUUNXCMBkZt0n8xU0JPcmJAifiacLH+W99DhqqUmnb3Yj94z+1ykCYglU9+cb7SpwqrIXVsZ513FOJAfaH4+utCST/PCIJnUFJEtZqWOhHhIpp1WGT7D3QNE36JdBujzW5bEm+1em5+IUbWEgFRxmzncapTKYNNOSJAoiR0Q+DU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616522602; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T1DAl2vypqOHD8RnZUBDzTLiJbvhZJDTU+msyGDc9D4=; b=ne99TQkmMbWTM6LyV/Un/po6qaZ3wp7zkRSWKCis7QbS7r5uewCumckiAw0sxlrc1LLibNCPeQhvH6KBh86AVp6sEUefzMVfkc7nwPBgChtxHuB5WiCpx7rKLUvAAfYlgJQeQmNPEUisJw4ExyoBDXStPlTzjRwvZe3VK4UK2DY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616522601584540.319520806853; Tue, 23 Mar 2021 11:03:21 -0700 (PDT) Received: from localhost ([::1]:43026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOlN9-0008Dh-0a for importer@patchew.org; Tue, 23 Mar 2021 14:03:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkN5-0007PC-A6 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:11 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:40561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkN0-00061r-CY for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:11 -0400 Received: by mail-ej1-x62e.google.com with SMTP id u9so28274360ejj.7 for ; Tue, 23 Mar 2021 09:59:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id rs24sm11420442ejb.75.2021.03.23.09.58.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:58:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8F2841FFA5; Tue, 23 Mar 2021 16:53:12 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T1DAl2vypqOHD8RnZUBDzTLiJbvhZJDTU+msyGDc9D4=; b=lQnzoPeAvy2XROeD/oIORy9Oa3ywyD6nbMqjnySgFcuWTC5LMhMKgNkmJ0fKZ7IOL3 8uQ61gFTcop30hOnrROVpsfRw1R26N8wPjZciQlD+/vhZq0OldYNamnuErXItJXT2cMW rQ/MaMvaITJuNPyHDbGur2VYi+eyHLM1GPtDZmY7HrYZ0ixlpEFnSHLJNqwx/N6hQ7Zi 12RaeeniUrMYLzQI7Qk9S0p2sb1KD/4aavosPP41akjF1TU1e60UADMjyAX6BKD6XF98 Ek+PdW1pF3KMh0aci3IxUnstVXlPq4+nkiwj4ZKwyXwJGBxExsUnc7d1SYA6X2SS3RiA tP4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T1DAl2vypqOHD8RnZUBDzTLiJbvhZJDTU+msyGDc9D4=; b=MoXoHwGbc5xarGTiOwWitnLKlhCTYQzN1VwEiddSzIP3UDA3ezp5+13TcAfCr9m4hD 0wxQhv0OXbu894IH6Vwixgf6u4lx/ordEhJGPGS/A1UV/VXNtU8dls27/m8dJtDzO4rf jKqNLxQnfShcQcUG+D1BZuMwClg3eBmSAdkf5pwsYjcz2snvZCBJU4h/pUnrFYlnKMFZ D1eMrh6uF9Y8JGoOQHq+ZbDi5kCJVmC6PB2O8yLNQ1B8nAVHDce7ih11uBvbEk1iz5fn CpLcNRXcXG9IjPh0T0Yj9QO+JrDbPM94mD6qLNSQJqTHTHCtveXxELKZjAPhB/KytO12 AlQA== X-Gm-Message-State: AOAM532Es6AM05QmYFlEU/pQar/1bE1ixgUjbhSvQZ8EnnzkFEg6feuI 558GAes5Ij9aLywAAnxLl1hxyQ== X-Google-Smtp-Source: ABdhPJxnmZJdGEAeSUu3dlNTH5e1U8Y+PwTeQ5WWcLk7i1Ltax7wd+d4HGOw2b4uFktnw1wQUnEbvg== X-Received: by 2002:a17:907:2642:: with SMTP id ar2mr5849875ejc.145.1616518742623; Tue, 23 Mar 2021 09:59:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 19/22] iotests: Revert "iotests: use -ccw on s390x for 040, 139, and 182" Date: Tue, 23 Mar 2021 16:53:05 +0000 Message-Id: <20210323165308.15244-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , "open list:Block layer core" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , Laurent Vivier , Max Reitz , "open list:S390 general arch..." , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Laurent Vivier Commit f1d5516ab583 introduces a test in some iotests to check if the machine is a s390-ccw-virtio and to select virtio-*-ccw rather than virtio-*-pci. We don't need that because QEMU already provides aliases to use the correct virtio interface according to the machine type. This patch removes all virtio-*-pci and virtio-*-ccw to use virtio-* instead and remove get_virtio_scsi_device(). This also enables virtio-mmio devices (virtio-*-device) Signed-off-by: Laurent Vivier Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Cornelia Huck Message-Id: <20210319202335.2397060-5-laurent@vivier.eu> Signed-off-by: Alex Benn=C3=A9e --- tests/qemu-iotests/040 | 2 +- tests/qemu-iotests/051 | 12 +----------- tests/qemu-iotests/051.out | 2 +- tests/qemu-iotests/051.pc.out | 2 +- tests/qemu-iotests/068 | 4 +--- tests/qemu-iotests/093 | 3 +-- tests/qemu-iotests/139 | 9 ++------- tests/qemu-iotests/182 | 13 ++----------- tests/qemu-iotests/238 | 4 +--- tests/qemu-iotests/240 | 10 +++++----- tests/qemu-iotests/257 | 4 ++-- tests/qemu-iotests/307 | 4 +--- tests/qemu-iotests/iotests.py | 5 ----- 13 files changed, 19 insertions(+), 55 deletions(-) diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index 336ff7c4f2..ba7cb34ce8 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -89,7 +89,7 @@ class TestSingleDrive(ImageCommitTestCase): qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img) qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288',= mid_img) self.vm =3D iotests.VM().add_drive(test_img, "node-name=3Dtop,back= ing.node-name=3Dmid,backing.backing.node-name=3Dbase", interface=3D"none") - self.vm.add_device(iotests.get_virtio_scsi_device()) + self.vm.add_device('virtio-scsi') self.vm.add_device("scsi-hd,id=3Dscsi0,drive=3Ddrive0") self.vm.launch() self.has_quit =3D False diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index f92161d8ef..333cc81818 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -119,17 +119,7 @@ echo echo =3D=3D=3D Device without drive =3D=3D=3D echo =20 -case "$QEMU_DEFAULT_MACHINE" in - s390-ccw-virtio) - virtio_scsi=3Dvirtio-scsi-ccw - ;; - *) - virtio_scsi=3Dvirtio-scsi-pci - ;; -esac - -run_qemu -device $virtio_scsi -device scsi-hd | - sed -e "s/$virtio_scsi/VIRTIO_SCSI/" +run_qemu -device virtio-scsi -device scsi-hd =20 echo echo =3D=3D=3D Overriding backing file =3D=3D=3D diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index de4771bcb3..437053c839 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -72,7 +72,7 @@ QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,node-name=3Dfoo= #12: Invalid node name =20 =3D=3D=3D Device without drive =3D=3D=3D =20 -Testing: -device VIRTIO_SCSI -device scsi-hd +Testing: -device virtio-scsi -device scsi-hd QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device scsi-hd: drive property not set =20 diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out index a28e3fc124..e95bd42b8d 100644 --- a/tests/qemu-iotests/051.pc.out +++ b/tests/qemu-iotests/051.pc.out @@ -72,7 +72,7 @@ QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,node-name=3Dfoo= #12: Invalid node-name: 'fo =20 =3D=3D=3D Device without drive =3D=3D=3D =20 -Testing: -device VIRTIO_SCSI -device scsi-hd +Testing: -device virtio-scsi -device scsi-hd QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device scsi-hd: drive property not set =20 diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index 03e03508a6..54e49c8ffa 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -49,11 +49,9 @@ IMG_SIZE=3D128K case "$QEMU_DEFAULT_MACHINE" in s390-ccw-virtio) platform_parm=3D"-no-shutdown" - hba=3Dvirtio-scsi-ccw ;; *) platform_parm=3D"" - hba=3Dvirtio-scsi-pci ;; esac =20 @@ -61,7 +59,7 @@ _qemu() { $QEMU $platform_parm -nographic -monitor stdio -serial none \ -drive if=3Dnone,id=3Ddrive0,file=3D"$TEST_IMG",format=3D"$IMGFM= T" \ - -device $hba,id=3Dhba0 \ + -device virtio-scsi,id=3Dhba0 \ -device scsi-hd,drive=3Ddrive0 \ "$@" |\ _filter_qemu | _filter_hmp diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093 index 7745cb04b6..93274dc8cb 100755 --- a/tests/qemu-iotests/093 +++ b/tests/qemu-iotests/093 @@ -371,8 +371,7 @@ class ThrottleTestGroupNames(iotests.QMPTestCase): class ThrottleTestRemovableMedia(iotests.QMPTestCase): def setUp(self): self.vm =3D iotests.VM() - self.vm.add_device("{},id=3Dvirtio-scsi".format( - iotests.get_virtio_scsi_device())) + self.vm.add_device("{},id=3Dvirtio-scsi".format('virtio-scsi')) self.vm.launch() =20 def tearDown(self): diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139 index e79b3c21fd..178b1ee230 100755 --- a/tests/qemu-iotests/139 +++ b/tests/qemu-iotests/139 @@ -26,18 +26,13 @@ import time =20 base_img =3D os.path.join(iotests.test_dir, 'base.img') new_img =3D os.path.join(iotests.test_dir, 'new.img') -if iotests.qemu_default_machine =3D=3D 's390-ccw-virtio': - default_virtio_blk =3D 'virtio-blk-ccw' -else: - default_virtio_blk =3D 'virtio-blk-pci' =20 class TestBlockdevDel(iotests.QMPTestCase): =20 def setUp(self): iotests.qemu_img('create', '-f', iotests.imgfmt, base_img, '1M') self.vm =3D iotests.VM() - self.vm.add_device("{},id=3Dvirtio-scsi".format( - iotests.get_virtio_scsi_device())) + self.vm.add_device("{},id=3Dvirtio-scsi".format('virtio-scsi')) self.vm.launch() =20 def tearDown(self): @@ -93,7 +88,7 @@ class TestBlockdevDel(iotests.QMPTestCase): self.checkBlockDriverState(node, expect_error) =20 # Add a device model - def addDeviceModel(self, device, backend, driver =3D default_virtio_bl= k): + def addDeviceModel(self, device, backend, driver =3D 'virtio-blk'): result =3D self.vm.qmp('device_add', id =3D device, driver =3D driver, drive =3D backend) self.assert_qmp(result, 'return', {}) diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index 55a0384c08..fcd1d796eb 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -46,26 +46,17 @@ _supported_proto file =20 size=3D32M =20 -case "$QEMU_DEFAULT_MACHINE" in - s390-ccw-virtio) - virtioblk=3Dvirtio-blk-ccw - ;; - *) - virtioblk=3Dvirtio-blk-pci - ;; -esac - _make_test_img $size =20 echo "Starting QEMU" _launch_qemu -drive file=3D$TEST_IMG,if=3Dnone,id=3Ddrive0,file.locking=3D= on \ - -device $virtioblk,drive=3Ddrive0 + -device virtio-blk,drive=3Ddrive0 =20 echo echo "Starting a second QEMU using the same image should fail" echo 'quit' | $QEMU -nographic -monitor stdio \ -drive file=3D$TEST_IMG,if=3Dnone,id=3Ddrive0,file.locking=3Don \ - -device $virtioblk,drive=3Ddrive0 2>&1 | _filter_testdir 2>&1 | + -device virtio-blk,drive=3Ddrive0 2>&1 | _filter_testdir 2>&1 | _filter_qemu | sed -e '/falling back to POSIX file/d' \ -e '/locks can be lost unexpectedly/d' diff --git a/tests/qemu-iotests/238 b/tests/qemu-iotests/238 index 8a10af57f1..38bd3744e6 100755 --- a/tests/qemu-iotests/238 +++ b/tests/qemu-iotests/238 @@ -26,14 +26,12 @@ from iotests import log =20 iotests.script_initialize() =20 -virtio_scsi_device =3D iotests.get_virtio_scsi_device() - vm =3D iotests.VM() vm.launch() =20 log(vm.qmp('blockdev-add', node_name=3D'hd0', driver=3D'null-co', read_zer= oes=3DTrue)) log(vm.qmp('object-add', qom_type=3D'iothread', id=3D'iothread0')) -log(vm.qmp('device_add', id=3D'scsi0', driver=3Dvirtio_scsi_device, iothre= ad=3D'iothread0')) +log(vm.qmp('device_add', id=3D'scsi0', driver=3D'virtio-scsi', iothread=3D= 'iothread0')) log(vm.qmp('device_add', id=3D'scsi-hd0', driver=3D'scsi-hd', drive=3D'hd0= ')) log(vm.qmp('block_set_io_throttle', id=3D'scsi-hd0', bps=3D0, bps_rd=3D0, = bps_wr=3D0, iops=3D1000, iops_rd=3D0, iops_wr=3D0, conv_keys=3DFalse)) diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240 index ab077f4ceb..9b281e1dc0 100755 --- a/tests/qemu-iotests/240 +++ b/tests/qemu-iotests/240 @@ -42,7 +42,7 @@ class TestCase(iotests.QMPTestCase): iotests.log('=3D=3DUnplug a SCSI disk and then plug it again=3D=3D= ') self.vm.qmp_log('blockdev-add', driver=3D'null-co', read_zeroes=3D= True, node_name=3D'hd0') self.vm.qmp_log('object-add', qom_type=3D'iothread', id=3D"iothrea= d0") - self.vm.qmp_log('device_add', id=3D'scsi0', driver=3Diotests.get_v= irtio_scsi_device(), iothread=3D'iothread0', filters=3D[iotests.filter_qmp_= virtio_scsi]) + self.vm.qmp_log('device_add', id=3D'scsi0', driver=3D'virtio-scsi'= , iothread=3D'iothread0', filters=3D[iotests.filter_qmp_virtio_scsi]) self.vm.qmp_log('device_add', id=3D'scsi-hd0', driver=3D'scsi-hd',= drive=3D'hd0') self.vm.qmp_log('device_del', id=3D'scsi-hd0') self.vm.event_wait('DEVICE_DELETED') @@ -55,7 +55,7 @@ class TestCase(iotests.QMPTestCase): iotests.log('=3D=3DAttach two SCSI disks using the same block devi= ce and the same iothread=3D=3D') self.vm.qmp_log('blockdev-add', driver=3D'null-co', read_zeroes=3D= True, node_name=3D'hd0', read_only=3DTrue) self.vm.qmp_log('object-add', qom_type=3D'iothread', id=3D"iothrea= d0") - self.vm.qmp_log('device_add', id=3D'scsi0', driver=3Diotests.get_v= irtio_scsi_device(), iothread=3D'iothread0', filters=3D[iotests.filter_qmp_= virtio_scsi]) + self.vm.qmp_log('device_add', id=3D'scsi0', driver=3D'virtio-scsi'= , iothread=3D'iothread0', filters=3D[iotests.filter_qmp_virtio_scsi]) =20 self.vm.qmp_log('device_add', id=3D'scsi-hd0', driver=3D'scsi-hd',= drive=3D'hd0') self.vm.qmp_log('device_add', id=3D'scsi-hd1', driver=3D'scsi-hd',= drive=3D'hd0') @@ -73,8 +73,8 @@ class TestCase(iotests.QMPTestCase): self.vm.qmp_log('object-add', qom_type=3D'iothread', id=3D"iothrea= d0") self.vm.qmp_log('object-add', qom_type=3D'iothread', id=3D"iothrea= d1") =20 - self.vm.qmp_log('device_add', id=3D'scsi0', driver=3Diotests.get_v= irtio_scsi_device(), iothread=3D'iothread0', filters=3D[iotests.filter_qmp_= virtio_scsi]) - self.vm.qmp_log('device_add', id=3D'scsi1', driver=3Diotests.get_v= irtio_scsi_device(), iothread=3D'iothread1', filters=3D[iotests.filter_qmp_= virtio_scsi]) + self.vm.qmp_log('device_add', id=3D'scsi0', driver=3D'virtio-scsi'= , iothread=3D'iothread0', filters=3D[iotests.filter_qmp_virtio_scsi]) + self.vm.qmp_log('device_add', id=3D'scsi1', driver=3D'virtio-scsi'= , iothread=3D'iothread1', filters=3D[iotests.filter_qmp_virtio_scsi]) =20 self.vm.qmp_log('device_add', id=3D'scsi-hd0', driver=3D'scsi-hd',= drive=3D'hd0', bus=3D"scsi0.0") self.vm.qmp_log('device_add', id=3D'scsi-hd1', driver=3D'scsi-hd',= drive=3D'hd0', bus=3D"scsi1.0") @@ -99,7 +99,7 @@ class TestCase(iotests.QMPTestCase): self.vm.qmp_log('nbd-server-add', device=3D'hd0') =20 self.vm.qmp_log('object-add', qom_type=3D'iothread', id=3D"iothrea= d0") - self.vm.qmp_log('device_add', id=3D'scsi0', driver=3Diotests.get_v= irtio_scsi_device(), iothread=3D'iothread0', filters=3D[iotests.filter_qmp_= virtio_scsi]) + self.vm.qmp_log('device_add', id=3D'scsi0', driver=3D'virtio-scsi'= , iothread=3D'iothread0', filters=3D[iotests.filter_qmp_virtio_scsi]) self.vm.qmp_log('device_add', id=3D'scsi-hd0', driver=3D'scsi-hd',= drive=3D'hd0') =20 if __name__ =3D=3D '__main__': diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257 index 7cd2520829..c72c82a171 100755 --- a/tests/qemu-iotests/257 +++ b/tests/qemu-iotests/257 @@ -292,7 +292,7 @@ def test_bitmap_sync(bsync_mode, msync_mode=3D'bitmap',= failure=3DNone): log('--- Preparing image & VM ---\n') drive0 =3D Drive(img_path, vm=3Dvm) drive0.img_create(iotests.imgfmt, SIZE) - vm.add_device("{},id=3Dscsi0".format(iotests.get_virtio_scsi_devic= e())) + vm.add_device("{},id=3Dscsi0".format('virtio-scsi')) vm.launch() =20 file_config =3D { @@ -449,7 +449,7 @@ def test_backup_api(): log('--- Preparing image & VM ---\n') drive0 =3D Drive(img_path, vm=3Dvm) drive0.img_create(iotests.imgfmt, SIZE) - vm.add_device("{},id=3Dscsi0".format(iotests.get_virtio_scsi_devic= e())) + vm.add_device("{},id=3Dscsi0".format('virtio-scsi')) vm.launch() =20 file_config =3D { diff --git a/tests/qemu-iotests/307 b/tests/qemu-iotests/307 index 9008974346..c7685347bc 100755 --- a/tests/qemu-iotests/307 +++ b/tests/qemu-iotests/307 @@ -40,13 +40,11 @@ with iotests.FilePath('image') as img, \ =20 iotests.log('=3D=3D=3D Launch VM =3D=3D=3D') =20 - virtio_scsi_device =3D iotests.get_virtio_scsi_device() - vm.add_object('iothread,id=3Diothread0') vm.add_blockdev(f'file,filename=3D{img},node-name=3Dfile') vm.add_blockdev(f'{iotests.imgfmt},file=3Dfile,node-name=3Dfmt') vm.add_blockdev('raw,file=3Dfile,node-name=3Dro,read-only=3Don') - vm.add_device(f'id=3Dscsi0,driver=3D{virtio_scsi_device},iothread=3Dio= thread0') + vm.add_device(f'id=3Dscsi0,driver=3Dvirtio-scsi,iothread=3Diothread0') vm.launch() =20 vm.qmp_log('nbd-server-start', diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 90d0b62523..1e9e6a066e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -234,11 +234,6 @@ def qemu_io_silent_check(*args): stderr=3Dsubprocess.STDOUT) return exitcode =3D=3D 0 =20 -def get_virtio_scsi_device(): - if qemu_default_machine =3D=3D 's390-ccw-virtio': - return 'virtio-scsi-ccw' - return 'virtio-scsi-pci' - class QemuIoInteractive: def __init__(self, *args): self.args =3D qemu_io_args_no_fmt + list(args) --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616520541; cv=none; d=zohomail.com; s=zohoarc; b=MTMDGBK7rPtWJU8NEvlUH5NRJpJ4M+RpZAKx80y8PwNnIo+cnOJn86mi9fyLsyxTNLX6nnKr9ZHxSomSXFx+vXBawNZ8QYK8KwV0YV6OX2ERe03euqYv0ysf12Yd97D73mCeurJB4Hel7b3ks/0taBeNc+4qbTyKJsSx6sHDyr8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616520541; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2RQ+nQcwf7xx2lvmkjpYyMsPqik3t9vcywsUhJCTzI0=; b=FhgY0pthoaJgTAwpOFUo4tJy7C3r6u74W8r8X7X8ZtVSZxpQrODUMM+LIYe2rOcRW9J6LafBwcRtf5HW0Fb0G2F1QOdFUIYExq7Sy49ijdMJTT1QWkUL7iH+k+zzXeePUAOYU8aSXTgsj82tgHR6X/mqK1azpmPMJVUupde1fas= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16165205414671017.4071251493601; Tue, 23 Mar 2021 10:29:01 -0700 (PDT) Received: from localhost ([::1]:55734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkpw-00077s-9a for importer@patchew.org; Tue, 23 Mar 2021 13:29:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkN2-0007HS-HW for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:08 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:44817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkMt-0005zY-IQ for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:08 -0400 Received: by mail-ed1-x535.google.com with SMTP id j3so24233302edp.11 for ; Tue, 23 Mar 2021 09:58:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g25sm13077682edp.95.2021.03.23.09.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:58:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AF39B1FFA6; Tue, 23 Mar 2021 16:53:12 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2RQ+nQcwf7xx2lvmkjpYyMsPqik3t9vcywsUhJCTzI0=; b=GSf3oUfr0gEm/K5/+hSYB/THlBvuuWfY2s718ZWQMO3s/FrNW+UUgL8unYufLFGwZX iV1Wq5q2hwdy+O5HkS1m1bzvLDbv14d66noa3QhEYSnln6mkQCXzyKNBc7e6haQtJnA9 T5Em6nB7hrwg9HAVgpuuMpeXOCtYJhhc3O+j0mKF3zX6UKUYCcGV78gw5k56Ez1cdBZi jeeiA+xO4y8D/XZ7I6sZyHmuviy9E11L4WcBGYk8ykfBCfpA1ZfgKczC1meBe2nyaRXa +8IKgugD1+riKWYM4YAofFFI6OnmwtrFD6t8WUs/pU6ABK+IhZcvHX3iWw3+k1sPkZwL /cBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2RQ+nQcwf7xx2lvmkjpYyMsPqik3t9vcywsUhJCTzI0=; b=PcxL1l1+KyreWviMAoQjijkFMF1NHoKXoJhBbcnurS9YWrxmNh2flR+R+0mOssNe/J iYVOidJaD4RL+5x1DXxNVTfGqS8WRcAHxSRcgHsjkaF9sAqplDNM0vkODveRaKILKxg8 k+6VbTM640gahEQ5wD+Y0wOZIxoEj/M8M4Ksf9X5WXkVIoj38N3gvSrP4Ti2fgHpOLVX KUHu3GHY/MaEgDs70DVqb6ahM8TpemFpQRTh2z42I/mp0I/DZjUt2UkRhqZJzClThu7d ANAV5c0jeAEl3oQUKG9+FGKzDXnFeijthZ1YQJ0GHIqMX/x1q/uDJCxuIr+LsBhmNKvS 6Y6A== X-Gm-Message-State: AOAM5331Y59l6uw52v3seAqrKj5dLl4bhwyMzXyFf4+vdqTnEHh88cLD tTmF6PK/XQ5xoLT+5oD5vKwfgg== X-Google-Smtp-Source: ABdhPJwEa7KNtu7TJQgB15Bg62tffIRQYO+xOu+RqbVjDYiTPa+1RAy6IDXPe1W/AY7dVcL26q7dJw== X-Received: by 2002:a05:6402:c0f:: with SMTP id co15mr5430904edb.373.1616518737687; Tue, 23 Mar 2021 09:58:57 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 20/22] iotests: test m68k with the virt machine Date: Tue, 23 Mar 2021 16:53:06 +0000 Message-Id: <20210323165308.15244-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x535.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "open list:Block layer core" , Cornelia Huck , Laurent Vivier , Max Reitz , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Laurent Vivier This allows to cover the virtio tests with a 32bit big-endian virtio-mmio machine. Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Cornelia Huck Message-Id: <20210319202335.2397060-6-laurent@vivier.eu> Signed-off-by: Alex Benn=C3=A9e --- tests/qemu-iotests/testenv.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index 1fbec854c1..6d27712617 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -208,6 +208,7 @@ def __init__(self, imgfmt: str, imgproto: str, aiomode:= str, ('arm', 'virt'), ('aarch64', 'virt'), ('avr', 'mega2560'), + ('m68k', 'virt'), ('rx', 'gdbsim-r5f562n8'), ('tricore', 'tricore_testboard') ) --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616519943; cv=none; d=zohomail.com; s=zohoarc; b=AHzSuh74lUDjMQKEfTCYE/aGmbq1TbfaXsYDAdgrp/cSnCWt48JJ6puL84Vp9HvwFbNn3q5jEp/P4uYXOGXArP8yBPx4HTQFlKeYN9O1x1/t2d3bt9wn+z4b8EDmcXlKFh3lX4IUx6xzH809HLRjqnlzijWsQXYEJlpxUlVE1rA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616519943; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HljywFt12dZyd3+HxlsIwX7M2zOm5+joKHSo35RZz6U=; b=G9LxuywekgfzWMI6qJq/LxJZuYlTfqc1Yw31pAQbCN9XaaRbQpkB/IFCS3Z4dZKnCmP2g/U7FwSK3DgKkyyPpu0dSSjYswntN0s+r9hAK/d9jAQI3PUd7rrhCTY/qnqFl5YCrfo1g5lTpX7P3vnTz+WEpm2g1HM0+rti3IwwDXQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616519943431876.2238262981266; Tue, 23 Mar 2021 10:19:03 -0700 (PDT) Received: from localhost ([::1]:58718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkgI-0008Hu-EL for importer@patchew.org; Tue, 23 Mar 2021 13:19:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkMs-00070o-6O for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:58:58 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:41947) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkMn-0005wB-3o for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:58:57 -0400 Received: by mail-ed1-x530.google.com with SMTP id z1so24315167edb.8 for ; Tue, 23 Mar 2021 09:58:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n16sm13321344edr.42.2021.03.23.09.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:58:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DACD21FFA9; Tue, 23 Mar 2021 16:53:12 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HljywFt12dZyd3+HxlsIwX7M2zOm5+joKHSo35RZz6U=; b=h5FeLUhOhP/AVy2A8sjz395WaSJRypcWbMimZBMWBgbUCPriWKnRB2XN1cNXqEY2vf XlLeNrnN/LHAJ5ccONIIYQuMNfUXieixpVP5VqHsArMByYxAeg8L6BeJWiq8BXjD1fdy Htii9sXEIlss6rAS8ygk9pfuS+HvdCldEgzzrFUy94tv1bQeJF6Xby9QL+7c9xmhAmWW gSes/+A4j5OcZgJFz/UMn11Du8Wp8X9SsGZuYRxl8+/BeC1QlVarPRSpuLDHW4rw0z1h RZaOROnKpU0zmbdWqCVtseunOYHnvK7QZGCPLeI+h30kiczDEppIPPs2YdKjCJwEYBYk SUOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HljywFt12dZyd3+HxlsIwX7M2zOm5+joKHSo35RZz6U=; b=F5gV0fPRbIJTipvkRBbLOrasM+rGXF6yRv3iVimmo4xQ4KkQESB5M0mvkpnJDubqg8 4JrdEnzBz6XFHjExjK3+3fbPNJrCpGECLSPshrCICtdcely3L2ygRoiwfhJHCBAhLqmj iFCapeajp8Foo82bxTtca2rFknGdAJvmuYbkGw5FfiwdwyBzVotiz6sQOCkAbIcm5MwK XHvUnKpg2O8xHqrOVg+LcbCYD1qa0kmD7vm5k9eaUD8Ux5obdaPMyqkaKL2kdKurfPq9 SlI6I2QPfAnVWnvB11EI6uHn6f3WMa4fEdk9Cx+6l+zfUr22OhEp7TLuO1k8IgyXodO3 j28Q== X-Gm-Message-State: AOAM531rB48BC1uXUOykPsjiQ/VDs9Wa4fRmiT/kFyFUIVEe8ESreTXo uJVN4Y5ndJOvK5MBft3Gjdov4Q== X-Google-Smtp-Source: ABdhPJz3MuKXQMiYLnqnkuJsOvmxQv4QWX62hEspvFSjUM2k7TZ5Zwt+rDJl/qAxZsoqSgO98DXarw== X-Received: by 2002:a05:6402:3495:: with SMTP id v21mr5441216edc.117.1616518731634; Tue, 23 Mar 2021 09:58:51 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 21/22] iotests: iothreads need ioeventfd Date: Tue, 23 Mar 2021 16:53:07 +0000 Message-Id: <20210323165308.15244-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , "open list:Block layer core" , Laurent Vivier , Max Reitz , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Laurent Vivier And ioeventfd are only available with virtio-scsi-pci or virtio-scsi-ccw, use the alias but add a rule to require virtio-scsi-pci or virtio-scsi-ccw for the tests that use iothreads. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth Message-Id: <20210319202335.2397060-7-laurent@vivier.eu> Signed-off-by: Alex Benn=C3=A9e --- tests/qemu-iotests/127 | 3 ++- tests/qemu-iotests/256 | 6 ++++-- tests/qemu-iotests/common.rc | 13 +++++++++++++ tests/qemu-iotests/iotests.py | 5 +++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 index 98e8e82a82..32edc3b068 100755 --- a/tests/qemu-iotests/127 +++ b/tests/qemu-iotests/127 @@ -44,7 +44,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file fuse =20 -_require_devices virtio-scsi scsi-hd +_require_devices scsi-hd +_require_one_device_of virtio-scsi-pci virtio-scsi-ccw =20 IMG_SIZE=3D64K =20 diff --git a/tests/qemu-iotests/256 b/tests/qemu-iotests/256 index 8d82a1dd86..13666813bd 100755 --- a/tests/qemu-iotests/256 +++ b/tests/qemu-iotests/256 @@ -24,6 +24,8 @@ import os import iotests from iotests import log =20 +iotests._verify_virtio_scsi_pci_or_ccw() + iotests.script_initialize(supported_fmts=3D['qcow2']) size =3D 64 * 1024 * 1024 =20 @@ -61,8 +63,8 @@ with iotests.FilePath('img0') as img0_path, \ log('--- Preparing images & VM ---\n') vm.add_object('iothread,id=3Diothread0') vm.add_object('iothread,id=3Diothread1') - vm.add_device('virtio-scsi-pci,id=3Dscsi0,iothread=3Diothread0') - vm.add_device('virtio-scsi-pci,id=3Dscsi1,iothread=3Diothread1') + vm.add_device('virtio-scsi,id=3Dscsi0,iothread=3Diothread0') + vm.add_device('virtio-scsi,id=3Dscsi1,iothread=3Diothread1') iotests.qemu_img_create('-f', iotests.imgfmt, img0_path, str(size)) iotests.qemu_img_create('-f', iotests.imgfmt, img1_path, str(size)) vm.add_drive(img0_path, interface=3D'none') diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 65cdba5723..7f49c9716d 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -977,5 +977,18 @@ _require_devices() done } =20 +_require_one_device_of() +{ + available=3D$($QEMU -M none -device help | \ + grep ^name | sed -e 's/^name "//' -e 's/".*$//') + for device + do + if echo "$available" | grep -q "$device" ; then + return + fi + done + _notrun "$* not available" +} + # make sure this script returns success true diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 1e9e6a066e..5af0182895 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -1146,6 +1146,11 @@ def _verify_virtio_blk() -> None: if 'virtio-blk' not in out: notrun('Missing virtio-blk in QEMU binary') =20 +def _verify_virtio_scsi_pci_or_ccw() -> None: + out =3D qemu_pipe('-M', 'none', '-device', 'help') + if 'virtio-scsi-pci' not in out and 'virtio-scsi-ccw' not in out: + notrun('Missing virtio-scsi-pci or virtio-scsi-ccw in QEMU binary') + =20 def supports_quorum(): return 'quorum' in qemu_img_pipe('--help') --=20 2.20.1 From nobody Sat Apr 27 18:01:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1616520381; cv=none; d=zohomail.com; s=zohoarc; b=Wms7JABcT099hXVyN0+MjzjwXLDsoy7BV0Horoq7IOchtEVbSarpUG+SssuQ7Kb22+Lo0GbF39bieweuawpvg9CAm9x0wlTdXd8A4Fl8XZSpsSjmRp4MAz5H+yRTQub25FkEMH/KvaaxAUg2cLHRyauXITu4JD0qS49TO9VwXCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616520381; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mb2USBz3/rkoafXQjYLvAfykrf4t+4S3CX6XGxj0nMM=; b=fsTMSI1KDZxD6Fhhn3VLWLhekIjQT//slg9HNs/h4oWxg9QPme5HlfyL0nC48qaT8uJ+7iBWNWNDtCeTlaTXVTDthlm6N9RdpZD6qnfL6mQhmf5g6pKXdRsZwBoTZg76VDNvuOTH4Epf1ay0OELOLrUQwiNaMaxkWuxwUYqxJRk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616520381878162.61621306156655; Tue, 23 Mar 2021 10:26:21 -0700 (PDT) Received: from localhost ([::1]:47404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOknM-0001hS-Mq for importer@patchew.org; Tue, 23 Mar 2021 13:26:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOkN0-0007Bc-Mp for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:06 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:46610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOkMs-0005yj-Fz for qemu-devel@nongnu.org; Tue, 23 Mar 2021 12:59:06 -0400 Received: by mail-ej1-x629.google.com with SMTP id u21so10301701ejo.13 for ; Tue, 23 Mar 2021 09:58:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u13sm11392727ejy.31.2021.03.23.09.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:58:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 126131FFAA; Tue, 23 Mar 2021 16:53:13 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mb2USBz3/rkoafXQjYLvAfykrf4t+4S3CX6XGxj0nMM=; b=shO2ITS6nNs2VpaXtci8r+Icv2O9OjgYf+wR0dj8vfuo7a8LltHyyruGc1s17xqrsT zauH6geBB+QonpD9ymkmUzakD9NLh2Zv+ckXgsKbX8B+aRi3jhKOlEU8502XRJkOysxs ER7G8r8P6z9iZvp1iZxY6xfqWXlgpVYEVvF8cmMrDFYQzNz9WCbmkB13+TU2wxHBQsJA WGB04wit6YGkuQCndMYFOCqSwb5OQDijOrIO3x2wMJKiCI2PRA/mcq4xLwhJ0SbgRkO8 6oaKu7UYKWSXIYSA7s72e1GmmJSVXEbqswbA7MHBcc1Jn1EhquejaXrzoFFDu2SUV2ua WleQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mb2USBz3/rkoafXQjYLvAfykrf4t+4S3CX6XGxj0nMM=; b=n7X3o+3N4llhjSqx1SO8B8/nddNMyjjnG0V6Atrfvt9RrEe9lsHBmqzYT5k32X5SlJ tY/YPkj7sQFcGJY3fBEwL7hnhqp0P0u4KYEE8pZkSa6Q5fsfUOhsCcBSed8xX+zLrvhs FCO9zog1NVT9vl0wo8MFdGizwG1imFaF707pAaBBN5U4S+O8qJSBbp4cO5Yuybuq6Wnq G6iuHfSX/e/8PinBGZPNclmp6QbqXx8wyhasLJhDWl5yThZm8bjUyQXkDdM45dCbEG/g qn19DIt64antuFY9enpI/IiAAr7WKQsPZGPG52565RPOC47fvPwSMJRh9FqspBCp40me 8A8A== X-Gm-Message-State: AOAM533rq8F1BeULsfJVCs+pP7FuApm2KusvqvejVFDWShVF51dyZUSP YdV5D0PMKO0Sx7Rpul6L2sOBwfu4fsrnkH2K X-Google-Smtp-Source: ABdhPJwCC7FZWhS5NiBDOKpvCBLHXm07xFz2+oxRUUOUDfGO5i4uXFjA2cYEv1gFhHS+HTJJS0+97w== X-Received: by 2002:a17:906:5902:: with SMTP id h2mr5835872ejq.416.1616518736672; Tue, 23 Mar 2021 09:58:56 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 22/22] gitlab: default to not building the documentation Date: Tue, 23 Mar 2021 16:53:08 +0000 Message-Id: <20210323165308.15244-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323165308.15244-1-alex.bennee@linaro.org> References: <20210323165308.15244-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Willian Rampazzo , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) In d0f26e68a0 ("gitlab: force enable docs build in Fedora, Ubuntu, Debian") we made sure we can build the documents on more than one system. However we don't want to build documents all the time as it's a waste of cycles (and energy). So lets reduce the total amount of documentation we build while still keeping coverage of at least one build on each supported target. Fixes: a8a3abe0b3 ("gitlab: move docs and tools build across from Travis") Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth --- v2 - enable for OpenSUSE LEAP and Centos8 as well - disable for all cross builds - minor re-word of the commit text v3 - revert: enable for OpenSUSE LEAP and Centos8 as well --- .gitlab-ci.d/crossbuilds.yml | 15 ++++++++------- .gitlab-ci.yml | 10 +++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index d5098c986b..2d95784ed5 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -6,10 +6,10 @@ - mkdir build - cd build - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH - ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-user - --target-list-exclude=3D"arm-softmmu cris-softmmu i386-softmmu - microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu - ppc-softmmu sh4-softmmu xtensa-softmmu" + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-user --target-list-exclude=3D"arm-softmmu cris-softmmu + i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu + mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu" - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS =20 # Job to cross-build specific accelerators. @@ -25,8 +25,8 @@ - mkdir build - cd build - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH - ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-tools - --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS - make -j$(expr $(nproc) + 1) all check-build =20 .cross_user_build_job: @@ -36,7 +36,8 @@ - mkdir build - cd build - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH - ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-system + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-system - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS =20 cross-armel-system: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ffbaa7ffb..3480d79db3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,9 +23,9 @@ include: - cd build - if test -n "$TARGETS"; then - ../configure --enable-werror $CONFIGURE_ARGS --target-list=3D"$TAR= GETS" ; + ../configure --enable-werror --disable-docs $CONFIGURE_ARGS --targ= et-list=3D"$TARGETS" ; else - ../configure --enable-werror $CONFIGURE_ARGS ; + ../configure --enable-werror --disable-docs $CONFIGURE_ARGS ; fi || { cat config.log meson-logs/meson-log.txt && exit 1; } - if test -n "$LD_JOBS"; then @@ -119,7 +119,7 @@ build-system-ubuntu: job: amd64-ubuntu2004-container variables: IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-fdt=3Dsystem --enable-slirp=3Dsystem + CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-slirp=3Ds= ystem TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu moxie-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build @@ -607,7 +607,7 @@ tsan-build: job: amd64-ubuntu2004-container variables: IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 --dis= able-docs + CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 --enable-trace-backends=3Dust --enable-fdt=3Dsystem --enable-sli= rp=3Dsystem TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user MAKE_CHECK_ARGS: bench V=3D1 @@ -619,7 +619,7 @@ build-deprecated: job: amd64-debian-user-cross-container variables: IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-docs --disable-tools + CONFIGURE_ARGS: --disable-tools MAKE_CHECK_ARGS: build-tcg TARGETS: ppc64abi32-linux-user lm32-softmmu unicore32-softmmu artifacts: --=20 2.20.1