From patchwork Wed Jul 22 06:28:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246964 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp266966ilg; Tue, 21 Jul 2020 23:29:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxO8SbGuuoxMknrbEgPi2H54Mr58NAO66BPFxa6RJTxTAhV/55yFqJR+6V5WqNykhel8fe3 X-Received: by 2002:a25:385:: with SMTP id 127mr48254749ybd.141.1595399362783; Tue, 21 Jul 2020 23:29:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399362; cv=none; d=google.com; s=arc-20160816; b=NOPD082fVlNlzC6jcksmNw7ht0yeUcw5Jjb/tlO3JlqPBSvqYhnriANDk/S/yoOyOk odeV/eidUATSJPX2LafpY0utcsnI80C0kv+sL1GFYNATcll11hYHD2Spug4eRNU4+Ss5 E1zUxpYCbvEUBL8CYkj1MNepDfByMPEhUmkPZpp3YBwTlB2zVcVn1wTJGl/Q5m0cqKUN H7fvhKwyFC8aD0nvM+CUJtuO6C6wb6DhJzeIxgS/f1sa/b3FIHHmXr0Zwel4SPX88z1w 4s8NFtl8TcgxOQNidMWbGxDKxy5vHLL/YxS0FG3KScHycFDNK94x53bgFk7mvHXKneb9 BkoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=jZAPRKLaovu2pplc7biXvq3YREw5GO4K82nPJPMV9Fw=; b=u5n9B62fJn4lNXrzbMmmQZz8LLCiogdQAn5VvG19zr0au3bTj3S8uXxDl2z1XiLZL1 LV69pA99WbsY3vnSqLKwvqXA6SuYiCc5gxbjFyJDtce1x6XV9k8txGqwpDjV+cRNV9w/ 4i0GV482j3/TfHw+U0QphJN4CuJJiMU4sdoaKDIPi5wM0EZz+ibqh+gWVvUd/qNwuRw0 FkPoDhA71Y0ikaySJUcdKcRRfgEzJutpVbkE2z+PYHZxBD6qKQSIVD5kKQbTtlKfCFPo KUZ2OUFbtQLKQBVRVfdwhxt2qB6F86LoDRKzrc7HJL4opN+ldSCLuwakAZyfO1ro8r1b mV8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Tq9lWMp3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e142si22928411ybf.31.2020.07.21.23.29.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:29:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Tq9lWMp3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8Fm-00072g-7B for patch@linaro.org; Wed, 22 Jul 2020 02:29:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fa-00070x-5j for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:10 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8FX-0006tz-Vt for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:09 -0400 Received: by mail-wm1-x342.google.com with SMTP id a6so3659778wmm.0 for ; Tue, 21 Jul 2020 23:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jZAPRKLaovu2pplc7biXvq3YREw5GO4K82nPJPMV9Fw=; b=Tq9lWMp3cYooqI2/vWfSJFNiu6URnYRr9Ss5FJFsaUsC4y0JV1G2u6DajY9BkCMh4K Z3AtKpZZNgEFkaeD9YURksApXThLTTcCoU7u0n9sNTciCXl22iC2W2W+9ZVJfJekgyvH iB+00osNWqZOP3GXhcDlC7CI9FywdEdic/eeXK03nktqxeT/LEp/eVHDU+4itnFEBI2+ UQo+P07p2RBxjUB71syDuGuIKribeWWkU8+MpnwKYPgoOVdOkh2yQtw35a7sj87hjPOg o/L5zIixS1oOOyGm38V87ba10PybTFSZ+IlmOYZLNUHMj10x+cO9/8FozDLB8rUsGuFj m+XQ== 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=jZAPRKLaovu2pplc7biXvq3YREw5GO4K82nPJPMV9Fw=; b=lc6wI+5xb9n+fum+nJ8vHHUp8jVaR1gqHm56+Omysqz5TywGBv81KvdE4ppsr5BXSj ZCo0I8lwxZlZf4SnfaZxjCbnJ4Seh2btGjyAJ2XJ4n9jKiK/eyosjxeuIiIcBFMs34Xf Oh89EzEdGw1z8Lh06xIcDeXMXUsRwsN04wZVj517ly8bPQ2PUCK69y+q7tyE9eMlGdHc M9ztDyijSqgeg56jj1vDFedvyU2gI1E24Iukcjl3b7Gr+X8LlMETSQKsSqga6Mbzl+kr ZaZsK2G2/otEoxL82G6C0p6VkgAPh9cNoufTyBANT8ALvi0+CsWKcldDBzVG7GAe1jGn FyAQ== X-Gm-Message-State: AOAM530QLYewS8IOtG9S8kR7OS5jClV2UUD7LqEYIejcIxH3Ol9fpbPe H9awP7/Otl4fm0Qbni+jq7VWvg== X-Received: by 2002:a05:600c:2209:: with SMTP id z9mr359097wml.70.1595399346594; Tue, 21 Jul 2020 23:29:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l14sm41215142wrn.18.2020.07.21.23.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 14D0C1FF87; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/12] shippable: add one more qemu to registry url Date: Wed, 22 Jul 2020 07:28:51 +0100 Message-Id: <20200722062902.24509-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The registry url is //qemu/ Perhaps we should rationalise that some day but for now. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200717105139.25293-2-alex.bennee@linaro.org> --- .shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/.shippable.yml b/.shippable.yml index f6b742432e5..89d8be4291b 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -27,7 +27,7 @@ env: TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user build: pre_ci_boot: - image_name: registry.gitlab.com/qemu-project/qemu/${IMAGE} + image_name: registry.gitlab.com/qemu-project/qemu/qemu/${IMAGE} image_tag: latest pull: true options: "-e HOME=/root" From patchwork Wed Jul 22 06:28:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246970 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp268307ilg; Tue, 21 Jul 2020 23:31:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCHmPy83Ctct25F20ZTf+MDFrRH/bS7Gf4kP5vTwMBgfqUVt9EuiwNKf6zd/3+mLoSOzn5 X-Received: by 2002:a25:ab0e:: with SMTP id u14mr49139005ybi.181.1595399506369; Tue, 21 Jul 2020 23:31:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399506; cv=none; d=google.com; s=arc-20160816; b=EoOmA7kJyp3RS6V6RQwMUhOR72WOz4vGimcDhK/tvOPSgPk2ElojbvDCo1pXiBNV9g g6/dFKAb2xJ4WM46giXs91uc+2Ltga4YcIMueZi/skPYg2OYjvE/Zk8iuOJoSdhKztw+ FNJVpzMl+9mMyghwlPjvQTxS+lg+tT4+zkD7DOwYoR3l8PpYZ2DTqDUba2U441txNRuI gzdyuAZrXYFm0FPXgMPvE/y/KfbBaGSfZa+duva86HmIRYqaMP0OvwdriuDbv4OsCvsY SXDT40ZqYRUvjXcR0ptcLsRsb3gs+y9qJyTtz6wtPnGVQsOtRBUxOMEa3CrprSHlvSYa KrWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=VATDeEmHe81iWlkc3YdJcm4+JPfu8GfZbyW4AtdCEog=; b=YDtkOPuLBKbH4H3HwGV+UGqen4r+trtT8GfHibhTAx3m10g9lr9JnplkOBzlpNeK6j sX5BIvrXEfcxcpuTvMOfBEn6GDUCFAu9aBFcuoBcpzNdFqbbdu+rCP+2kK/BoaQLLUuz wUdV5jMUA1xAysFhI9CvCHDQPVq234n9EdO3IwEiZ4RHwESe89RYRU+ZdUPLRnWnILdB GuUjAE21dmvkm+FncP5LZpTWJUfFI/LcR+7Y1W5zWTOZIQmoIrln+N9JJ/oybyHeOg9H qFZQGylyYEVWifLubbA2FkfCx8NS+pknAU30KzPWNz23vshZvfOGAw7m6Q/wc6wZKQnt dGHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YbhRwC7N; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r16si20536937ybk.393.2020.07.21.23.31.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:31:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YbhRwC7N; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8I5-000206-RC for patch@linaro.org; Wed, 22 Jul 2020 02:31:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fb-000713-DK for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:11 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:53729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8FZ-0006uE-NO for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:11 -0400 Received: by mail-wm1-x343.google.com with SMTP id j18so799447wmi.3 for ; Tue, 21 Jul 2020 23:29:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VATDeEmHe81iWlkc3YdJcm4+JPfu8GfZbyW4AtdCEog=; b=YbhRwC7NfCDVUmdjnWcYy5uHKivpP9KWc0ust5RdVP2W8qHmMZbTfHW+7q30/cn0/1 ojvB81uUmP0B4tV/PjO7egK42JMDzSDH4BE4wncZTGzIbBWsDxJpqOf9VGu6+TajC8vZ b/aLnuFRfySeujFCts9foVKhC9gCadElMzuz26nWejgoS5bmq+Aq63QvcyV3RJ4EOkfG 4grbpXNDUvdkZuG+0hVk00FcTJXBQIhihCRkJ3IR35/IBopFX/7IIl4USFmnUzVKcyCg 5MzgVgfz0pFaFG7QNCrMvyNHsVt6rfPXkXMvnc2DRUCNxtuO0IkXc3XwuhfzWnlYmc1v KWcw== 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=VATDeEmHe81iWlkc3YdJcm4+JPfu8GfZbyW4AtdCEog=; b=FirsVgZIcgzjxfdDDi1NmAwiPbAlIewL4hCbcrBgJ9Fm3joOVfZlt0U0/kT29KDKfS Wfsw03SxCr2lyfTF13a3FcekZp3XYyuDFF8T6F8zRFgMsDHtg32caC5rF21wZgrLd1VB eHSRWQNw4+5Vv/xDiUykkfs1btvD30VZJZB2DoQ6XNtmTNEc7tgJO1/6x52OipeaN0cJ LQMHj2BOXHVw1YzrDnTnEvAeG/QZGRMB5Uj3i/43Ku/8ixrWAy/ez1nwlPV/Pt/wDLuG QVIhb6w50NOQmsWZU3Ioh+jfq1gpT/Kmm2FK6dVQ778UTaZiaPC06Oe5c+CXIyHrSalE apVg== X-Gm-Message-State: AOAM530hCIHeAjXLSCUraQ2vbS3TYJLkGUhCfBoi8SppYnEFB8O5rfTU /k3czCtpXyDnjEaXkFGGwFHgcA== X-Received: by 2002:a1c:2d89:: with SMTP id t131mr7419311wmt.151.1595399348037; Tue, 21 Jul 2020 23:29:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o21sm6122615wmh.18.2020.07.21.23.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 28CE91FF8C; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/12] semihosting: defer connect_chardevs a little more to use serialx Date: Wed, 22 Jul 2020 07:28:52 +0100 Message-Id: <20200722062902.24509-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, KONRAD Frederic , cota@braap.org, Paolo Bonzini , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: KONRAD Frederic With that we can just use -semihosting-config chardev=serial0. [AJB: tweak commit message] Signed-off-by: KONRAD Frederic Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <1592215252-26742-1-git-send-email-frederic.konrad@adacore.com> Message-Id: <20200717105139.25293-3-alex.bennee@linaro.org> --- softmmu/vl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/softmmu/vl.c b/softmmu/vl.c index f476ef89edb..4fedbe60c39 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -4131,8 +4131,6 @@ void qemu_init(int argc, char **argv, char **envp) qemu_opts_foreach(qemu_find_opts("chardev"), chardev_init_func, NULL, &error_fatal); - /* now chardevs have been created we may have semihosting to connect */ - qemu_semihosting_connect_chardevs(); #ifdef CONFIG_VIRTFS qemu_opts_foreach(qemu_find_opts("fsdev"), @@ -4281,6 +4279,9 @@ void qemu_init(int argc, char **argv, char **envp) if (foreach_device_config(DEV_DEBUGCON, debugcon_parse) < 0) exit(1); + /* now chardevs have been created we may have semihosting to connect */ + qemu_semihosting_connect_chardevs(); + /* If no default VGA is requested, the default is "none". */ if (default_vga) { vga_model = get_default_vga_model(machine_class); From patchwork Wed Jul 22 06:28:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246967 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp267295ilg; Tue, 21 Jul 2020 23:30:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZ65MdY/Ueq1kXIrMjHGzWIvN0BWa7jFpE+mjJdXOflm7r2HVhetrBRm1ykTP9BaLsJIt5 X-Received: by 2002:a25:c881:: with SMTP id y123mr44372877ybf.427.1595399402933; Tue, 21 Jul 2020 23:30:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399402; cv=none; d=google.com; s=arc-20160816; b=g+bNNBvkjrN1iel0enJeJKmYxm0yeJaFLbts7TfJ/iXnjfRexBYDP2ORBBY9J3BTqd qFFWsnJdPUqfY/GDYxWqO48JbmW0YmVFyv45taHsHoQu0hArvRDyKPbE0X+b8IzeUIaE IHKYtHaZAemdaRExVRwjjp1fg0uCTiJvS+DFFNoK/ZXFgxgckDGL3/cO3uo3hFgmAYkH wPV6Vmg4mRDGfT36pNMGy/X004xOOipj/6isLl/N1Fwt5DQglUSyFuma9EImnnd0MAbJ HPpN/YHAwzwDdxQmoqDG5HOfqo9VPo8IwWCkHBPTE1xD7Ht+CJg7nUPnKJSodZcUViV9 2xmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=FXawODYQMPXkW63coV0jaCgGZ0mloHIJB4WSMUcLFTA=; b=R95VtGc//6W1CmTRttX8ejpmypsgYyu+VmjSO1dD7rgx5nzssHJxvxMVJ2NXf42g6J U2Ajsfw0vG0fOKxFMKS4n5ziITGneCySs5T76aQAswom7zMcbaVFSjIiHr+s2Zw8fhCl V0Z+ifHmR2DQ7MmCX7ssYqjHg3TRfN5EPlcXQcG3rKzB42IJiDInne8k2BVLii9SThOm t1Jl+je2KvS02lB3GsoS5yrfEzchEObr1FDcdZvC0GeAxPhZGxyth6oQfBoN4VdltVWh nz/ks26Zb6LwzInzYMSfVbfeU8n5TW1Z0saJmcPXxm3HO6TCIp0+xxLPfzCzSSHE3g41 FzoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KhwPHa9y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p202si22048004yba.240.2020.07.21.23.30.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:30:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KhwPHa9y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8GQ-0007BE-CO for patch@linaro.org; Wed, 22 Jul 2020 02:30:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fb-00071b-VH for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:11 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:33386) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fa-0006uM-Gx for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:11 -0400 Received: by mail-wm1-x344.google.com with SMTP id a6so3659828wmm.0 for ; Tue, 21 Jul 2020 23:29:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FXawODYQMPXkW63coV0jaCgGZ0mloHIJB4WSMUcLFTA=; b=KhwPHa9yjKnauoBpSsKJLnF0es/YzqGalAAoPgWCdfqgzK+Z93KpaN8CIXTgKoipid joLQcjIoNVGCZAaLep382LfuDFqvk13i8td7aDE8YF1OGfYg+EX+UmGQ9twfOYvlDnFH RojoGhlXU9xml5AJ+zQLhOUFdhdDMpKrTW+Yms8BZNw7n6xZhNFrfpUNmH6PP5iFnuQK qLMytkcii8r/tWQOD/mrYb8p0FE1v5D39SwWrz57qKu95QjOKJLNQx1DXzO7hdDWu6xG v1jxO5dJWWZCuf0Ql91r9t3tEB42Y/kGtlfiAMFnekTCPaOisGs/cqRZ4BJuP6oB5OPH N9Qg== 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=FXawODYQMPXkW63coV0jaCgGZ0mloHIJB4WSMUcLFTA=; b=GqVx1a6e1Bma1v9Xw0r3T73MKMsJgd6E2YEn41TCy5YBl8Dw8EoJohp4zLu68hqXoO Yr+WPB1Gswi/WZFJnUMDz6OL+Q1um0eeaPZinYmg/qdZPIPa36r8Mf3MvW7bIFWpg2Kj DPZq4Nb7oAUh2TRIyYv2F/J+PJNgZ/GqC2l4akhX2l1a/uQx3xK7aTim297kjJKoxsaw LERw5F0E6kpiVYswSULcs84qgh7HFlCmIqc1oDPZZbiXrtce77E/gp/M3CDEHhwHmmN2 cWC2n0L48PVbPs16NXQaZBMdMqMGI/kkc9UCV4UvuLfoGMU8ltbpsYVee0UeXiUkT4KE nSWA== X-Gm-Message-State: AOAM532kDyKhSEB0KNY0DdDuil+xRSOEgQicdIpSUZTWAykjxnePU8P7 KtaBZJc8VG7M0VYegWo5LB6Uog== X-Received: by 2002:a1c:f616:: with SMTP id w22mr6837124wmc.44.1595399349155; Tue, 21 Jul 2020 23:29:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 60sm15886664wrs.20.2020.07.21.23.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3E4761FF8F; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/12] semihosting: don't send the trailing '\0' Date: Wed, 22 Jul 2020 07:28:53 +0100 Message-Id: <20200722062902.24509-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , KONRAD Frederic , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: KONRAD Frederic Don't send the trailing 0 from the string. Signed-off-by: KONRAD Frederic Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <1592215252-26742-2-git-send-email-frederic.konrad@adacore.com> Message-Id: <20200717105139.25293-4-alex.bennee@linaro.org> --- hw/semihosting/console.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/hw/semihosting/console.c b/hw/semihosting/console.c index 22e7827824a..9b4fee92602 100644 --- a/hw/semihosting/console.c +++ b/hw/semihosting/console.c @@ -52,7 +52,9 @@ static GString *copy_user_string(CPUArchState *env, target_ulong addr) do { if (cpu_memory_rw_debug(cpu, addr++, &c, 1, 0) == 0) { - s = g_string_append_c(s, c); + if (c) { + s = g_string_append_c(s, c); + } } else { qemu_log_mask(LOG_GUEST_ERROR, "%s: passed inaccessible address " TARGET_FMT_lx, From patchwork Wed Jul 22 06:28:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246966 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp267272ilg; Tue, 21 Jul 2020 23:30:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4PXTnRZoCAzVI+Kh9ChxO6risOwBEGZijSYENP7gn58gydVe6LFsjh6NYjMfuUUI1nHXL X-Received: by 2002:a25:3cc7:: with SMTP id j190mr15631905yba.255.1595399400877; Tue, 21 Jul 2020 23:30:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399400; cv=none; d=google.com; s=arc-20160816; b=p1pO5/kpeeCMDRmpb1twaFJRQ62D75W0TmREAveGhHRPdlT75kBVqqa9oNeHbLF0jU saGJKHtzuSAE/wW7I1gXTqPTN7j8Ia3LGWJnPYP+oQoSkGqTVdAzKEKAClGkqPtPhB7U 4fuXO6D+fUVuNM+8dSJrwR/x9ox3KvsUcExWVbxKJqT5EAQtwiOZ/p5TrR/nUeoZUdw5 wJbjbPiIOKvkKZupnfSP/689fnnlzGFCuvryVXzFTGGw9bSfQRM4ajHp8pozx/WOX2WL q2c8A92JKJJA+MSG4TO/E+wH1xW21oUUo9Qjtbb7++FBOBz6aN7iDo4aUHAJsK957ist zC8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=3SEE/U35Sk7kKQ9s+FBzHg3olOo/kk7QFWLZd3Yj4zo=; b=uQiymEOxVJVIxtDmsHDvAXzrlj3hQQNxz0jy7vsy289mdjfit66ZmeKk3FpMHUQICb 53lUyoWshe4aNJD3irMwYs1WFk4fdl+gUsXbk4ukAmqRgThOrpKojREtEDvbKdaXnA/X +MoP3KW55FC6mcu06ion+Dm6x3Z/A890OpP50ny7Pli5IckVInIM307KCo/d5Cj1IjOA Ca8F2NuF0HakGed/BIqLMX6Q6Im01/56r212gcgfe++f0roqhG6GTQOJoMLveW9JIfJw C4wOA5mtgvTdCDzwV8mZoGSfJguo1pKegfp69QZUGTtasiq+c6ho5a0c0YKhZHicaU22 6F3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KIvG4tOs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e12si21492820ybr.208.2020.07.21.23.30.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:30:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KIvG4tOs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8GO-00077m-Cq for patch@linaro.org; Wed, 22 Jul 2020 02:30:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fe-00075j-7m for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:14 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:39997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fc-0006ui-Kh for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:13 -0400 Received: by mail-wr1-x441.google.com with SMTP id f2so699970wrp.7 for ; Tue, 21 Jul 2020 23:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3SEE/U35Sk7kKQ9s+FBzHg3olOo/kk7QFWLZd3Yj4zo=; b=KIvG4tOsCATGg01BVhSb0xWejAqfS4NH7ZNobtUxrmYYxlrCpOzK0tJguGk8RAshxU 0CMvO4E7jOzdTJPyjPSFfcey/xMwrHz+i2ORhcEn2QzScZI9WYlRPKeOwPWSBr+9ziQC HETUBjeXDS6Qf4OoTQRfgJZxDXCDNgYYoTjjTzW6xOvGA3aL4BEMci/Lu1aMJBl3RlOl LOw3WRQInB5snrl8vxqUUQA9Njvc1EIzwl9Ygs3sogj6tL22zDUT4iDFnxEbxQKQyDCC bghkZzgeTH4Msv4FqHq+PVx9WUUt2Q0WwUNtSCzoioDq92n/s8rZ6UpdwBlU5r77821x g5uQ== 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=3SEE/U35Sk7kKQ9s+FBzHg3olOo/kk7QFWLZd3Yj4zo=; b=Cyf+LEQ5sCrpQkARbPkroOodMN6vTrlxRPSxp2waEEf7p1nEgVIcufcUX1Wh1MCb7n olLND6aD5zR8pnEpPvCKvHRihtdLPTcDJlfoB1XUXf+FL07tWsZA68PsoBE4B6tuY1it epDoWvCRB+0/G4oOajieu6v4b3E3Q2wgpgjRME0ry4HMetKtW7BGebx5YM8GiZwGis3x DQ72JQvUOLYxhMjcYHkUnXPEQHfLcYLYXhNs2FEOAOZb+EK3m2XgSN8izaodPizrOqsG tr2sO8yHkvacTPw9ONI//mGpACY1+yoPudcNYclbEPVwpeG3ClCmxnDBkRI/JPc8sFIw jJTg== X-Gm-Message-State: AOAM531drAA0OeCjShyU7EXgK+8kI4CnUoxxfUkh1xyumhIusyvOiOWu AzX5HxAjGZ7L/hvy6dNc4gulrA== X-Received: by 2002:a5d:6646:: with SMTP id f6mr14933699wrw.155.1595399351235; Tue, 21 Jul 2020 23:29:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x18sm39876727wrq.13.2020.07.21.23.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5AE6C1FF90; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/12] util: add qemu_get_host_physmem utility function Date: Wed, 22 Jul 2020 07:28:54 +0100 Message-Id: <20200722062902.24509-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Christian Ehrhardt , cota@braap.org, Stefan Weil , Paolo Bonzini , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will be used in a future patch. For POSIX systems _SC_PHYS_PAGES isn't standardised but at least appears in the man pages for Open/FreeBSD. The result is advisory so any users of it shouldn't just fail if we can't work it out. The win32 stub currently returns 0 until someone with a Windows system can develop and test a patch. Signed-off-by: Alex Bennée Cc: BALATON Zoltan Cc: Christian Ehrhardt Message-Id: <20200717105139.25293-5-alex.bennee@linaro.org> --- v2 - fix agnostic typo - saturate to SIZE_MAX rather than overflow --- include/qemu/osdep.h | 12 ++++++++++++ util/oslib-posix.c | 15 +++++++++++++++ util/oslib-win32.c | 6 ++++++ 3 files changed, 33 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 4841b5c6b5f..e44547fb33e 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -665,4 +665,16 @@ static inline void qemu_reset_optind(void) */ char *qemu_get_host_name(Error **errp); +/** + * qemu_get_host_physmem: + * + * Operating system agnostic way of querying host memory. + * + * Returns amount of physical memory on the system. This is purely + * advisery and may return 0 if we can't work it out. At the other + * end we saturate to SIZE_MAX if you are lucky enough to have that + * much memory. + */ +size_t qemu_get_host_physmem(void); + #endif diff --git a/util/oslib-posix.c b/util/oslib-posix.c index d9236746248..ad8001a4ad8 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -841,3 +841,18 @@ char *qemu_get_host_name(Error **errp) return g_steal_pointer(&hostname); } + +size_t qemu_get_host_physmem(void) +{ +#ifdef _SC_PHYS_PAGES + long pages = sysconf(_SC_PHYS_PAGES); + if (pages > 0) { + if (pages > SIZE_MAX / qemu_real_host_page_size) { + return SIZE_MAX; + } else { + return pages * qemu_real_host_page_size; + } + } +#endif + return 0; +} diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 7eedbe5859a..31030463cc9 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -828,3 +828,9 @@ char *qemu_get_host_name(Error **errp) return g_utf16_to_utf8(tmp, size, NULL, NULL, NULL); } + +size_t qemu_get_host_physmem(void) +{ + /* currently unimplemented */ + return 0; +} From patchwork Wed Jul 22 06:28:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246972 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp269686ilg; Tue, 21 Jul 2020 23:34:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0nvDxOAr+9cFpVv1smVNyjC06qb46AdDTy4MxY04sEJKKo+QEfw1TY78kT3Zh3hv/jtfn X-Received: by 2002:a25:ec0e:: with SMTP id j14mr48171264ybh.173.1595399641675; Tue, 21 Jul 2020 23:34:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399641; cv=none; d=google.com; s=arc-20160816; b=s8ryltDOoXQpi/YnQ35aQk6xYTpyBjW/YMhuqxhcrL8+nz5oVH0B/OT3jvHkNvv/2Z ZSFZM4fJgzeA1HgRFJOw7GNt49bbVLBZLY/+cNYAul6bfBzYdFXnQCyQMY573Baa/wHh r5mm1S+2VKXJ8pUY44XmsJlCdTg5X7HyC2nEyxA6lmwYNXICHxVpYa6y43BydU1DJi96 XVcSfPRNDQBBtgZxKsDQSopknzNB8qrz+6z0wk99GKcB9gGcKqUwEmQbmQdjSDk5OWXf 0hwrcXKmPR3ZsDvoqKaWfmLrdG9UiiBP/znRmHZwb9hYodw9svre9UxNqaejwZfsbIFo kGHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=UjtgMi3yK33ZjhmVkRGlgMB3WMVIed90Ngc7ulb8I7c=; b=sOrAQnsKr9FeeFp9Dug+9xN/15H5qS69SEYYQyf1HKcn3ZBZxqN/uD/LvP1FOVW9/X fpr3Gr/u/xTIry9I+eW4qEE4uJ7hkC/5bArHI2kosHiZs/k2XOCyrXFCT8WFJYY6ftTy AyDvt77zUs1WrIBRT5Jha4vLUGEt1fLtRtAgB3ZcnJASP6HqqEW5nAbE09E2rRCNcuEU ANNmODLbdpIlLzU5A/oUTO/ZckR+MErzB3dIQnkNxLdYfr7xoB1JXqiiLghhgGqFB7Ve GPPhCdd5wWnxTy+xnz6cO5zrYbNK+MS8C3GSXNmsZ/kiDzgjby2T7IgA8Uxujmu6AFKY lLbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=F9+l6cOY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g133si9490184ybb.2.2020.07.21.23.34.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:34:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=F9+l6cOY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8KH-0005Ih-3W for patch@linaro.org; Wed, 22 Jul 2020 02:34:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fg-0007AU-DH for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:16 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:37898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fe-0006vC-Tc for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:16 -0400 Received: by mail-wm1-x342.google.com with SMTP id f18so837617wml.3 for ; Tue, 21 Jul 2020 23:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UjtgMi3yK33ZjhmVkRGlgMB3WMVIed90Ngc7ulb8I7c=; b=F9+l6cOYOB3MiOiDh5JXDMQ70OsszixR6C/OvcWj6quO1dKI6derFoOEOhHyEKfPFz Eit2iB91yDBreCmGOz8kSlIVl09cvJ5ho7vwrhW3lGlZ27BkLORTFCpqFmGiksK/qqsk FfxuREQa8EUAktPQ4+u5RlfQn3fQbEpbx0dLwp1pDnj0Dt/7P+HpoX7HKSkshl//6k1w 6J5Xo+CKkeSSwb9lb870UfGReYkdJ21h6FsJDhbOjJEvVs+5ucHD9Mxeps8JdmgiKA42 465ZwxAg7L2TmHw/240rdbK7QuG3W50rht8s5UDbaRlJZuSlM2rumzVILJKDTKJstxdP f54Q== 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=UjtgMi3yK33ZjhmVkRGlgMB3WMVIed90Ngc7ulb8I7c=; b=Mk0F+vJD+zY8LekJxvw05wdyEOu9X1T7flxUtDblMq5KELJ3iV/NGinfbSVDgs8LTC B0wW+Stl7SJks8DXMKvsv35n9+F8bYqPpV53397hHCt7cTHfzCV6wUVeyl0PA7sk3xt6 wOTzJpHmATkLXmTo4Bw8t93c4/attVtHx0jbpC3af8sQbbh1vctknUqH9APqF3Xmstqt ouyZ7+wnE87s8khNzGilSz0RA+QZ4RPi9nr92BSJuF40kWCiadImi6vrQZW7QuRfsqCf lUCLmdMkhyFct00I4j5MG36hlPRmUmSu2924i1tdGyLyL03eXY39qHbdFDl5FhqRiaxy eElQ== X-Gm-Message-State: AOAM530tPP/51DuL5N6lvYXf2hHbYNK9W2XO8jtAHfomQpEAeAJWeK62 3ox89w7E8VyO++TmfoIbmlnXlw== X-Received: by 2002:a1c:dd86:: with SMTP id u128mr7085401wmg.123.1595399353628; Tue, 21 Jul 2020 23:29:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j8sm24537574wrd.85.2020.07.21.23.29.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7172A1FF91; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/12] util/oslib-win32: add qemu_get_host_physmem implementation Date: Wed, 22 Jul 2020 07:28:55 +0100 Message-Id: <20200722062902.24509-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, Stefan Weil , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It seems GetPhysicallyInstalledSystemMemory isn't available in the MinGW headers so we have to declare it ourselves. Compile tested only. Cc: Stefan Weil Signed-off-by: Alex Bennée --- util/oslib-win32.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 31030463cc9..f0f94833197 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -43,6 +43,8 @@ /* this must come after including "trace.h" */ #include +WINBASEAPI BOOL WINAPI GetPhysicallyInstalledSystemMemory (PULONGLONG); + void *qemu_oom_check(void *ptr) { if (ptr == NULL) { @@ -831,6 +833,15 @@ char *qemu_get_host_name(Error **errp) size_t qemu_get_host_physmem(void) { - /* currently unimplemented */ - return 0; + ULONGLONG mem; + + if (GetPhysicallyInstalledSystemMemory(&mem)) { + if (mem > SIZE_MAX) { + return SIZE_MAX; + } else { + return mem; + } + } else { + return 0; + } } From patchwork Wed Jul 22 06:28:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246968 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp267984ilg; Tue, 21 Jul 2020 23:31:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbQXQelppqKZR3Chu/QI8CjfD1gY385I/5Ky8gyF68TEAYxsP0L2D853Hci+0/tEM4PrB2 X-Received: by 2002:a25:ba41:: with SMTP id z1mr52245511ybj.33.1595399471660; Tue, 21 Jul 2020 23:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399471; cv=none; d=google.com; s=arc-20160816; b=rY5ftVX+MPvXbgLP6vkDIN43hEqUQ9PBHsWjINBjz0Eb2PwdV7cRyuDZX9oterpiM7 dMxC1tlBi/d7syP1ITuL8ri95Pf7PnsTsohW+oVXCxC9oEVf55h59MgBf1S817Azvcxi Bdmz6L8OB0NFWb8x8FRaMK5rY6PJFvd5W+wpjeJIpcos77LPybkzEWyA6XGMWdYzFrln DJTU+MPxAqRg3jeQlFDCvasQGxjxS195sJW7Q56YewcKvOb6K7brbkd/9u00+JighUpI yF/gwwEY6uMDQ1qJOWJu1fEzbeK+Shy+GVZuUklHaEU4tMdKl/AwqLXQB6mgGNMxxh4S K+ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=wrFjogpJXlZ8LOQmtibpdguwXtzA6ik1VNS/5s1gAM8=; b=hv6w8EU4mEtDt/sVQ3FHi1hBRY9rc4Hd2Vl5rwrf/anHAD/H48Y1NQci6Fsvneh5m/ 2IuA64I67KkzvqQraUhYdjUgQWi1oeDxCqJkpU68yok+8X3dKu70TFiilH4vIcOOwP6O 44JhjT6oxm4bZDPZDPfSk/LHDTtnSPerobgzMCXVhTZDnnCahZb95Bdd9i3Jwj8G6EOW Kl+VVWA8ZTJCFrLTh7T4jbJ3S9/rXUdl5Tz7tTmJOwY1mZeg4joDPjYLlnVBh25GrL3E niZP/r30KJdhbZZ77EYONv71gPpPVknx71RqUsoHEKKBa/xPqLXSwxQ8xJE7Id4sV5BA IBBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hRWEUNjq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x33si24555318ybd.174.2020.07.21.23.31.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:31:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hRWEUNjq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8HX-0001wj-3B for patch@linaro.org; Wed, 22 Jul 2020 02:31:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Ff-00077Z-7k for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:15 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46836) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fd-0006v4-MF for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:14 -0400 Received: by mail-wr1-x441.google.com with SMTP id r12so676771wrj.13 for ; Tue, 21 Jul 2020 23:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wrFjogpJXlZ8LOQmtibpdguwXtzA6ik1VNS/5s1gAM8=; b=hRWEUNjqFBP8p5+ZNl8s0EYl7uuSwwoO9YMjiG7lWAPH0Tc2v1EMZr0GOmChzGkVNh lnCAw6oLFnsEJ3roFRYkzXYYh/jNwKjHg0ZNAiAJPS+Hz+WbkX5uLcbyFKS4zV44nLzi DG+6PcsPdAr4l9x4MXyuouAtj6nJ/DXOOFp7bUCm5NGuzEQ6G6xYIkxO7GJ4cLy/3BUv fThc2YHKb+u9Bs//8m2QcxwbeEomnhO5DtAA8DBiEVxLjcdasZyBXv8u3191SHFWlxeC bmFk8eMKwuSVEXXhVWa6FEXnBkPJVbQTmc++eF6yXoXesYeigr7Tp7xCeuXco9x3vRmw pTYA== 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=wrFjogpJXlZ8LOQmtibpdguwXtzA6ik1VNS/5s1gAM8=; b=daYGmU5hRCtl1FTWxA/qk0xNOwR12OVPVLycLylXowyOIFogkbvxqpLAGgaNgFV9mM Hs96yPNgLtl++rkQ+MrzkgGGHI97f5KxjaqLkd32LutcaD6fBLpwDXnj1YipXHfzEdHz R2VXkv45ndjR6U6hXuw/z0FvveS2e9GRowWxYshwspd4Ti8yLMTD9jnPlxENgsonIDy4 tEhjDqe1gdC/SELoWOFOMwzcK1zGJPGj8soxOB3iG38648bVBcw53C1W3EwPDx9Zsx6V mm9IXPqQfCkW1gK4A0uYbTxmDUeZlvM4NhdHgunVQUHwrEf7Fu/V+zch8emO7ZVjnLdQ vxmQ== X-Gm-Message-State: AOAM533Fu95WKuwJc1UhF/5ul4zYPYNO6+ITKQYHrbtvKL60qYI7TV0t r+ga6pxzoX3Y3nap6lczptfzcg== X-Received: by 2002:a5d:4649:: with SMTP id j9mr28136859wrs.270.1595399352430; Tue, 21 Jul 2020 23:29:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f17sm6701806wme.14.2020.07.21.23.29.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8882A1FF92; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/12] accel/tcg: better handle memory constrained systems Date: Wed, 22 Jul 2020 07:28:56 +0100 Message-Id: <20200722062902.24509-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Christian Ehrhardt , cota@braap.org, Paolo Bonzini , aurelien@aurel32.net, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It turns out there are some 64 bit systems that have relatively low amounts of physical memory available to them (typically CI system). Even with swapping available a 1GB translation buffer that fills up can put the machine under increased memory pressure. Detect these low memory situations and reduce tb_size appropriately. Fixes: 600e17b261 Signed-off-by: Alex Bennée Cc: BALATON Zoltan Cc: Christian Ehrhardt Message-Id: <20200717105139.25293-6-alex.bennee@linaro.org> --- v2 - /4 to /8 as suggested by Christian --- accel/tcg/translate-all.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 2afa46bd2b1..3fe40ec1710 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -976,7 +976,12 @@ static inline size_t size_code_gen_buffer(size_t tb_size) { /* Size the buffer. */ if (tb_size == 0) { - tb_size = DEFAULT_CODE_GEN_BUFFER_SIZE; + size_t phys_mem = qemu_get_host_physmem(); + if (phys_mem > 0 && phys_mem < (2 * DEFAULT_CODE_GEN_BUFFER_SIZE)) { + tb_size = phys_mem / 8; + } else { + tb_size = DEFAULT_CODE_GEN_BUFFER_SIZE; + } } if (tb_size < MIN_CODE_GEN_BUFFER_SIZE) { tb_size = MIN_CODE_GEN_BUFFER_SIZE; From patchwork Wed Jul 22 06:28:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246974 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp269872ilg; Tue, 21 Jul 2020 23:34:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFNga8zli/kbmdKSTKVEAX3xRT0PcyurksniaJ5I+1tAtAJ4r/f1B1Wn+S4d3pRzZ4GNbU X-Received: by 2002:a25:21c5:: with SMTP id h188mr49022963ybh.468.1595399659486; Tue, 21 Jul 2020 23:34:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399659; cv=none; d=google.com; s=arc-20160816; b=fXAithJFJq9zX+4Lx6fjnCWyhaOMf0QQhp0Nmk9ubQnun1I7gP5P0kAQrWwSfh0SAo ByDSyQ3osEJsJIM/1UlteVBDoKjbwZyRW40LPshtV1io09LB8VoTR3AAMbgMW5GHI/BP slWp5dWzwoM811heu279oRfdiQ4bQc41gqJCFJmfebCuBfwgTP6+VW8vVxQ2BynFLocV 6RLHQsLQBU/xaIuXyvFCxFe67xK9S99gyMLEIxDRiwVMnCeI16VSYZwUhIn7OMHXoLBT XX4UFj1OHIz/m95dkykJ5AlMqXkjeCSGaXYI5FQmH89heZ1VaNZ88VIXvEdxPqkjNMQD AxLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=hc/5WUXlyYNx0Z/MlINrBx3LfFPq8y5IJhnEoD5JoRY=; b=QLMXoM6UMaPXObs0tt4mn8N2dh2Z7tADGCNHd1Dmw/1Gr+0kdXHr37gUWpp0YaH4VC zDMhezIjokMyx7bIEBhZKEbgQ/YojX8oxX/FcnUMHrPP+0ekh/hkJ1JFgOG9/f8zsW3V 589DN7UotdzUIpshxuoUCFWHTPNbwggysMW3l2Ig4E5w0iNO5cJjA0+UHDP060xGbnbd iBnRcgkYfv+NCKg/qasuphaEy0MyNt3za/ZPf+MZpTEUHG2FW6DlhEPSuiWn0e9WJ/6B Xyn3DdQ0b8Kju+c+bgLcAfoTNz3+Qgk30mgqKmMiMhAOCpLKFN6Saij67M9pwo9wQdln iOZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Un8jCS3+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 10si23520302ybb.270.2020.07.21.23.34.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:34:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Un8jCS3+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8KY-0005aA-Rn for patch@linaro.org; Wed, 22 Jul 2020 02:34:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fk-0007Lz-J0 for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:20 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fh-0006vf-Nw for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:20 -0400 Received: by mail-wm1-x342.google.com with SMTP id g10so3660985wmc.1 for ; Tue, 21 Jul 2020 23:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hc/5WUXlyYNx0Z/MlINrBx3LfFPq8y5IJhnEoD5JoRY=; b=Un8jCS3+/WQPj0Zvjp6PJEf/A6V++DcdDT3/elW9MfJ2/LmBdx6+L/2AdFp4P1xjJW +G0CIj7yefQhh9p3YgeYJNrgZcebpaIKDERZPAhoHJvCt3E0ivztsMachJ0j9iueLOap ebgEAH8it63QEnyBAtx/H6QnFE1Ozl6+jPxr7lMKZjBwNhactcUGSztdyEuJWFCFPBIL EC/WVAYkCLKb6+GPG6JTDJX9iGqwVASggtfMxb5I0WdeJTRVTfSWEGWA6LdJJTcwXgW4 /eT9os7QtKz/SJDpOIcLBoXdnqjm5M0KUKT4pOc5GyOg91djs7glUjA1sNPdOt4Eurwf /C5w== 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=hc/5WUXlyYNx0Z/MlINrBx3LfFPq8y5IJhnEoD5JoRY=; b=Oa4MK8Vz4LlIE0rYPxo12KON0S1Zhc/Dvj8hWnTw8I4NsYLEjlXd6TQbNqlNdU9MH8 S/BkHnTXRqi2tdK9T1M5Fs6dfERiYYTydHy0KI6s9DwJkmkvz6NoMuznOSws1EVWXHu/ IeI0gUACj21z2JQxRUPqKQDLn6Uw28naoT83Y2tJ1pMi+dSHhteCoJDOBsu0qZvAJuSp /vWcFHnLssoojuy/9xyYryhbCmHR8uOcmrgFiDcxBguo5pZx2vn4c3O8CJ4LsY+kJRvE cWP2RVNUqz6r9iMTHAKpxcqQ1gJceBODBdN6/stUoEKmRuw7W6cwDMClF4sDTBRcezcJ tEiQ== X-Gm-Message-State: AOAM531izt/5YzfHz2e5TP/d3p2uxBijlg6+d+9tX72LJCErg5hETYHo 639Azm6Oc1jtOLHZ/xeE4UmUWA== X-Received: by 2002:a1c:7d54:: with SMTP id y81mr7481440wmc.110.1595399356239; Tue, 21 Jul 2020 23:29:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u20sm5846508wmc.42.2020.07.21.23.29.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A30FD1FF93; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/12] target/i386: floatx80: avoid compound literals in static initializers Date: Wed, 22 Jul 2020 07:28:57 +0100 Message-Id: <20200722062902.24509-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , berrange@redhat.com, Eduardo Habkost , Laszlo Ersek , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Alex_Benn=C3=A9e?= , cota@braap.org, Joseph Myers , Paolo Bonzini , aurelien@aurel32.net, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Laszlo Ersek Quoting ISO C99 6.7.8p4, "All the expressions in an initializer for an object that has static storage duration shall be constant expressions or string literals". The compound literal produced by the make_floatx80() macro is not such a constant expression, per 6.6p7-9. (An implementation may accept it, according to 6.6p10, but is not required to.) Therefore using "floatx80_zero" and make_floatx80() for initializing "f2xm1_table" and "fpatan_table" is not portable. And gcc-4.8 in RHEL-7.6 actually chokes on them: > target/i386/fpu_helper.c:871:5: error: initializer element is not constant > { make_floatx80(0xbfff, 0x8000000000000000ULL), > ^ We've had the make_floatx80_init() macro for this purpose since commit 3bf7e40ab914 ("softfloat: fix for C99", 2012-03-17), so let's use that macro again. Fixes: eca30647fc07 Fixes: ff57bb7b6326 Link: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg06566.html Link: https://lists.gnu.org/archive/html/qemu-devel/2020-07/msg04714.html Cc: Aurelien Jarno Cc: Eduardo Habkost Cc: Joseph Myers Cc: Paolo Bonzini Cc: Peter Maydell Cc: Richard Henderson Reviewed-by: Alex Bennée Signed-off-by: Laszlo Ersek Signed-off-by: Alex Bennée Message-Id: <20200716144251.23004-1-lersek@redhat.com> --- include/fpu/softfloat.h | 1 + target/i386/fpu_helper.c | 426 +++++++++++++++++++-------------------- 2 files changed, 214 insertions(+), 213 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index f1a19df066b..659218b5c78 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -822,6 +822,7 @@ static inline bool floatx80_invalid_encoding(floatx80 a) } #define floatx80_zero make_floatx80(0x0000, 0x0000000000000000LL) +#define floatx80_zero_init make_floatx80_init(0x0000, 0x0000000000000000LL) #define floatx80_one make_floatx80(0x3fff, 0x8000000000000000LL) #define floatx80_ln2 make_floatx80(0x3ffe, 0xb17217f7d1cf79acLL) #define floatx80_pi make_floatx80(0x4000, 0xc90fdaa22168c235LL) diff --git a/target/i386/fpu_helper.c b/target/i386/fpu_helper.c index f5e6c4b88d4..4ea73874d83 100644 --- a/target/i386/fpu_helper.c +++ b/target/i386/fpu_helper.c @@ -868,201 +868,201 @@ struct f2xm1_data { }; static const struct f2xm1_data f2xm1_table[65] = { - { make_floatx80(0xbfff, 0x8000000000000000ULL), - make_floatx80(0x3ffe, 0x8000000000000000ULL), - make_floatx80(0xbffe, 0x8000000000000000ULL) }, - { make_floatx80(0xbffe, 0xf800000000002e7eULL), - make_floatx80(0x3ffe, 0x82cd8698ac2b9160ULL), - make_floatx80(0xbffd, 0xfa64f2cea7a8dd40ULL) }, - { make_floatx80(0xbffe, 0xefffffffffffe960ULL), - make_floatx80(0x3ffe, 0x85aac367cc488345ULL), - make_floatx80(0xbffd, 0xf4aa7930676ef976ULL) }, - { make_floatx80(0xbffe, 0xe800000000006f10ULL), - make_floatx80(0x3ffe, 0x88980e8092da5c14ULL), - make_floatx80(0xbffd, 0xeecfe2feda4b47d8ULL) }, - { make_floatx80(0xbffe, 0xe000000000008a45ULL), - make_floatx80(0x3ffe, 0x8b95c1e3ea8ba2a5ULL), - make_floatx80(0xbffd, 0xe8d47c382ae8bab6ULL) }, - { make_floatx80(0xbffe, 0xd7ffffffffff8a9eULL), - make_floatx80(0x3ffe, 0x8ea4398b45cd8116ULL), - make_floatx80(0xbffd, 0xe2b78ce97464fdd4ULL) }, - { make_floatx80(0xbffe, 0xd0000000000019a0ULL), - make_floatx80(0x3ffe, 0x91c3d373ab11b919ULL), - make_floatx80(0xbffd, 0xdc785918a9dc8dceULL) }, - { make_floatx80(0xbffe, 0xc7ffffffffff14dfULL), - make_floatx80(0x3ffe, 0x94f4efa8fef76836ULL), - make_floatx80(0xbffd, 0xd61620ae02112f94ULL) }, - { make_floatx80(0xbffe, 0xc000000000006530ULL), - make_floatx80(0x3ffe, 0x9837f0518db87fbbULL), - make_floatx80(0xbffd, 0xcf901f5ce48f008aULL) }, - { make_floatx80(0xbffe, 0xb7ffffffffff1723ULL), - make_floatx80(0x3ffe, 0x9b8d39b9d54eb74cULL), - make_floatx80(0xbffd, 0xc8e58c8c55629168ULL) }, - { make_floatx80(0xbffe, 0xb00000000000b5e1ULL), - make_floatx80(0x3ffe, 0x9ef5326091a0c366ULL), - make_floatx80(0xbffd, 0xc2159b3edcbe7934ULL) }, - { make_floatx80(0xbffe, 0xa800000000006f8aULL), - make_floatx80(0x3ffe, 0xa27043030c49370aULL), - make_floatx80(0xbffd, 0xbb1f79f9e76d91ecULL) }, - { make_floatx80(0xbffe, 0x9fffffffffff816aULL), - make_floatx80(0x3ffe, 0xa5fed6a9b15171cfULL), - make_floatx80(0xbffd, 0xb40252ac9d5d1c62ULL) }, - { make_floatx80(0xbffe, 0x97ffffffffffb621ULL), - make_floatx80(0x3ffe, 0xa9a15ab4ea7c30e6ULL), - make_floatx80(0xbffd, 0xacbd4a962b079e34ULL) }, - { make_floatx80(0xbffe, 0x8fffffffffff162bULL), - make_floatx80(0x3ffe, 0xad583eea42a1b886ULL), - make_floatx80(0xbffd, 0xa54f822b7abc8ef4ULL) }, - { make_floatx80(0xbffe, 0x87ffffffffff4d34ULL), - make_floatx80(0x3ffe, 0xb123f581d2ac7b51ULL), - make_floatx80(0xbffd, 0x9db814fc5aa7095eULL) }, - { make_floatx80(0xbffe, 0x800000000000227dULL), - make_floatx80(0x3ffe, 0xb504f333f9de539dULL), - make_floatx80(0xbffd, 0x95f619980c4358c6ULL) }, - { make_floatx80(0xbffd, 0xefffffffffff3978ULL), - make_floatx80(0x3ffe, 0xb8fbaf4762fbd0a1ULL), - make_floatx80(0xbffd, 0x8e08a1713a085ebeULL) }, - { make_floatx80(0xbffd, 0xe00000000000df81ULL), - make_floatx80(0x3ffe, 0xbd08a39f580bfd8cULL), - make_floatx80(0xbffd, 0x85eeb8c14fe804e8ULL) }, - { make_floatx80(0xbffd, 0xd00000000000bccfULL), - make_floatx80(0x3ffe, 0xc12c4cca667062f6ULL), - make_floatx80(0xbffc, 0xfb4eccd6663e7428ULL) }, - { make_floatx80(0xbffd, 0xc00000000000eff0ULL), - make_floatx80(0x3ffe, 0xc5672a1155069abeULL), - make_floatx80(0xbffc, 0xea6357baabe59508ULL) }, - { make_floatx80(0xbffd, 0xb000000000000fe6ULL), - make_floatx80(0x3ffe, 0xc9b9bd866e2f234bULL), - make_floatx80(0xbffc, 0xd91909e6474372d4ULL) }, - { make_floatx80(0xbffd, 0x9fffffffffff2172ULL), - make_floatx80(0x3ffe, 0xce248c151f84bf00ULL), - make_floatx80(0xbffc, 0xc76dcfab81ed0400ULL) }, - { make_floatx80(0xbffd, 0x8fffffffffffafffULL), - make_floatx80(0x3ffe, 0xd2a81d91f12afb2bULL), - make_floatx80(0xbffc, 0xb55f89b83b541354ULL) }, - { make_floatx80(0xbffc, 0xffffffffffff81a3ULL), - make_floatx80(0x3ffe, 0xd744fccad69d7d5eULL), - make_floatx80(0xbffc, 0xa2ec0cd4a58a0a88ULL) }, - { make_floatx80(0xbffc, 0xdfffffffffff1568ULL), - make_floatx80(0x3ffe, 0xdbfbb797daf25a44ULL), - make_floatx80(0xbffc, 0x901121a0943696f0ULL) }, - { make_floatx80(0xbffc, 0xbfffffffffff68daULL), - make_floatx80(0x3ffe, 0xe0ccdeec2a94f811ULL), - make_floatx80(0xbffb, 0xf999089eab583f78ULL) }, - { make_floatx80(0xbffc, 0x9fffffffffff4690ULL), - make_floatx80(0x3ffe, 0xe5b906e77c83657eULL), - make_floatx80(0xbffb, 0xd237c8c41be4d410ULL) }, - { make_floatx80(0xbffb, 0xffffffffffff8aeeULL), - make_floatx80(0x3ffe, 0xeac0c6e7dd24427cULL), - make_floatx80(0xbffb, 0xa9f9c8c116ddec20ULL) }, - { make_floatx80(0xbffb, 0xbfffffffffff2d18ULL), - make_floatx80(0x3ffe, 0xefe4b99bdcdb06ebULL), - make_floatx80(0xbffb, 0x80da33211927c8a8ULL) }, - { make_floatx80(0xbffa, 0xffffffffffff8ccbULL), - make_floatx80(0x3ffe, 0xf5257d152486d0f4ULL), - make_floatx80(0xbffa, 0xada82eadb792f0c0ULL) }, - { make_floatx80(0xbff9, 0xffffffffffff11feULL), - make_floatx80(0x3ffe, 0xfa83b2db722a0846ULL), - make_floatx80(0xbff9, 0xaf89a491babef740ULL) }, - { floatx80_zero, - make_floatx80(0x3fff, 0x8000000000000000ULL), - floatx80_zero }, - { make_floatx80(0x3ff9, 0xffffffffffff2680ULL), - make_floatx80(0x3fff, 0x82cd8698ac2b9f6fULL), - make_floatx80(0x3ff9, 0xb361a62b0ae7dbc0ULL) }, - { make_floatx80(0x3ffb, 0x800000000000b500ULL), - make_floatx80(0x3fff, 0x85aac367cc488345ULL), - make_floatx80(0x3ffa, 0xb5586cf9891068a0ULL) }, - { make_floatx80(0x3ffb, 0xbfffffffffff4b67ULL), - make_floatx80(0x3fff, 0x88980e8092da7cceULL), - make_floatx80(0x3ffb, 0x8980e8092da7cce0ULL) }, - { make_floatx80(0x3ffb, 0xffffffffffffff57ULL), - make_floatx80(0x3fff, 0x8b95c1e3ea8bd6dfULL), - make_floatx80(0x3ffb, 0xb95c1e3ea8bd6df0ULL) }, - { make_floatx80(0x3ffc, 0x9fffffffffff811fULL), - make_floatx80(0x3fff, 0x8ea4398b45cd4780ULL), - make_floatx80(0x3ffb, 0xea4398b45cd47800ULL) }, - { make_floatx80(0x3ffc, 0xbfffffffffff9980ULL), - make_floatx80(0x3fff, 0x91c3d373ab11b919ULL), - make_floatx80(0x3ffc, 0x8e1e9b9d588dc8c8ULL) }, - { make_floatx80(0x3ffc, 0xdffffffffffff631ULL), - make_floatx80(0x3fff, 0x94f4efa8fef70864ULL), - make_floatx80(0x3ffc, 0xa7a77d47f7b84320ULL) }, - { make_floatx80(0x3ffc, 0xffffffffffff2499ULL), - make_floatx80(0x3fff, 0x9837f0518db892d4ULL), - make_floatx80(0x3ffc, 0xc1bf828c6dc496a0ULL) }, - { make_floatx80(0x3ffd, 0x8fffffffffff80fbULL), - make_floatx80(0x3fff, 0x9b8d39b9d54e3a79ULL), - make_floatx80(0x3ffc, 0xdc69cdceaa71d3c8ULL) }, - { make_floatx80(0x3ffd, 0x9fffffffffffbc23ULL), - make_floatx80(0x3fff, 0x9ef5326091a10313ULL), - make_floatx80(0x3ffc, 0xf7a993048d081898ULL) }, - { make_floatx80(0x3ffd, 0xafffffffffff20ecULL), - make_floatx80(0x3fff, 0xa27043030c49370aULL), - make_floatx80(0x3ffd, 0x89c10c0c3124dc28ULL) }, - { make_floatx80(0x3ffd, 0xc00000000000fd2cULL), - make_floatx80(0x3fff, 0xa5fed6a9b15171cfULL), - make_floatx80(0x3ffd, 0x97fb5aa6c545c73cULL) }, - { make_floatx80(0x3ffd, 0xd0000000000093beULL), - make_floatx80(0x3fff, 0xa9a15ab4ea7c30e6ULL), - make_floatx80(0x3ffd, 0xa6856ad3a9f0c398ULL) }, - { make_floatx80(0x3ffd, 0xe00000000000c2aeULL), - make_floatx80(0x3fff, 0xad583eea42a17876ULL), - make_floatx80(0x3ffd, 0xb560fba90a85e1d8ULL) }, - { make_floatx80(0x3ffd, 0xefffffffffff1e3fULL), - make_floatx80(0x3fff, 0xb123f581d2abef6cULL), - make_floatx80(0x3ffd, 0xc48fd6074aafbdb0ULL) }, - { make_floatx80(0x3ffd, 0xffffffffffff1c23ULL), - make_floatx80(0x3fff, 0xb504f333f9de2cadULL), - make_floatx80(0x3ffd, 0xd413cccfe778b2b4ULL) }, - { make_floatx80(0x3ffe, 0x8800000000006344ULL), - make_floatx80(0x3fff, 0xb8fbaf4762fbd0a1ULL), - make_floatx80(0x3ffd, 0xe3eebd1d8bef4284ULL) }, - { make_floatx80(0x3ffe, 0x9000000000005d67ULL), - make_floatx80(0x3fff, 0xbd08a39f580c668dULL), - make_floatx80(0x3ffd, 0xf4228e7d60319a34ULL) }, - { make_floatx80(0x3ffe, 0x9800000000009127ULL), - make_floatx80(0x3fff, 0xc12c4cca6670e042ULL), - make_floatx80(0x3ffe, 0x82589994cce1c084ULL) }, - { make_floatx80(0x3ffe, 0x9fffffffffff06f9ULL), - make_floatx80(0x3fff, 0xc5672a11550655c3ULL), - make_floatx80(0x3ffe, 0x8ace5422aa0cab86ULL) }, - { make_floatx80(0x3ffe, 0xa7fffffffffff80dULL), - make_floatx80(0x3fff, 0xc9b9bd866e2f234bULL), - make_floatx80(0x3ffe, 0x93737b0cdc5e4696ULL) }, - { make_floatx80(0x3ffe, 0xafffffffffff1470ULL), - make_floatx80(0x3fff, 0xce248c151f83fd69ULL), - make_floatx80(0x3ffe, 0x9c49182a3f07fad2ULL) }, - { make_floatx80(0x3ffe, 0xb800000000000e0aULL), - make_floatx80(0x3fff, 0xd2a81d91f12aec5cULL), - make_floatx80(0x3ffe, 0xa5503b23e255d8b8ULL) }, - { make_floatx80(0x3ffe, 0xc00000000000b7faULL), - make_floatx80(0x3fff, 0xd744fccad69dd630ULL), - make_floatx80(0x3ffe, 0xae89f995ad3bac60ULL) }, - { make_floatx80(0x3ffe, 0xc800000000003aa6ULL), - make_floatx80(0x3fff, 0xdbfbb797daf25a44ULL), - make_floatx80(0x3ffe, 0xb7f76f2fb5e4b488ULL) }, - { make_floatx80(0x3ffe, 0xd00000000000a6aeULL), - make_floatx80(0x3fff, 0xe0ccdeec2a954685ULL), - make_floatx80(0x3ffe, 0xc199bdd8552a8d0aULL) }, - { make_floatx80(0x3ffe, 0xd800000000004165ULL), - make_floatx80(0x3fff, 0xe5b906e77c837155ULL), - make_floatx80(0x3ffe, 0xcb720dcef906e2aaULL) }, - { make_floatx80(0x3ffe, 0xe00000000000582cULL), - make_floatx80(0x3fff, 0xeac0c6e7dd24713aULL), - make_floatx80(0x3ffe, 0xd5818dcfba48e274ULL) }, - { make_floatx80(0x3ffe, 0xe800000000001a5dULL), - make_floatx80(0x3fff, 0xefe4b99bdcdb06ebULL), - make_floatx80(0x3ffe, 0xdfc97337b9b60dd6ULL) }, - { make_floatx80(0x3ffe, 0xefffffffffffc1efULL), - make_floatx80(0x3fff, 0xf5257d152486a2faULL), - make_floatx80(0x3ffe, 0xea4afa2a490d45f4ULL) }, - { make_floatx80(0x3ffe, 0xf800000000001069ULL), - make_floatx80(0x3fff, 0xfa83b2db722a0e5cULL), - make_floatx80(0x3ffe, 0xf50765b6e4541cb8ULL) }, - { make_floatx80(0x3fff, 0x8000000000000000ULL), - make_floatx80(0x4000, 0x8000000000000000ULL), - make_floatx80(0x3fff, 0x8000000000000000ULL) }, + { make_floatx80_init(0xbfff, 0x8000000000000000ULL), + make_floatx80_init(0x3ffe, 0x8000000000000000ULL), + make_floatx80_init(0xbffe, 0x8000000000000000ULL) }, + { make_floatx80_init(0xbffe, 0xf800000000002e7eULL), + make_floatx80_init(0x3ffe, 0x82cd8698ac2b9160ULL), + make_floatx80_init(0xbffd, 0xfa64f2cea7a8dd40ULL) }, + { make_floatx80_init(0xbffe, 0xefffffffffffe960ULL), + make_floatx80_init(0x3ffe, 0x85aac367cc488345ULL), + make_floatx80_init(0xbffd, 0xf4aa7930676ef976ULL) }, + { make_floatx80_init(0xbffe, 0xe800000000006f10ULL), + make_floatx80_init(0x3ffe, 0x88980e8092da5c14ULL), + make_floatx80_init(0xbffd, 0xeecfe2feda4b47d8ULL) }, + { make_floatx80_init(0xbffe, 0xe000000000008a45ULL), + make_floatx80_init(0x3ffe, 0x8b95c1e3ea8ba2a5ULL), + make_floatx80_init(0xbffd, 0xe8d47c382ae8bab6ULL) }, + { make_floatx80_init(0xbffe, 0xd7ffffffffff8a9eULL), + make_floatx80_init(0x3ffe, 0x8ea4398b45cd8116ULL), + make_floatx80_init(0xbffd, 0xe2b78ce97464fdd4ULL) }, + { make_floatx80_init(0xbffe, 0xd0000000000019a0ULL), + make_floatx80_init(0x3ffe, 0x91c3d373ab11b919ULL), + make_floatx80_init(0xbffd, 0xdc785918a9dc8dceULL) }, + { make_floatx80_init(0xbffe, 0xc7ffffffffff14dfULL), + make_floatx80_init(0x3ffe, 0x94f4efa8fef76836ULL), + make_floatx80_init(0xbffd, 0xd61620ae02112f94ULL) }, + { make_floatx80_init(0xbffe, 0xc000000000006530ULL), + make_floatx80_init(0x3ffe, 0x9837f0518db87fbbULL), + make_floatx80_init(0xbffd, 0xcf901f5ce48f008aULL) }, + { make_floatx80_init(0xbffe, 0xb7ffffffffff1723ULL), + make_floatx80_init(0x3ffe, 0x9b8d39b9d54eb74cULL), + make_floatx80_init(0xbffd, 0xc8e58c8c55629168ULL) }, + { make_floatx80_init(0xbffe, 0xb00000000000b5e1ULL), + make_floatx80_init(0x3ffe, 0x9ef5326091a0c366ULL), + make_floatx80_init(0xbffd, 0xc2159b3edcbe7934ULL) }, + { make_floatx80_init(0xbffe, 0xa800000000006f8aULL), + make_floatx80_init(0x3ffe, 0xa27043030c49370aULL), + make_floatx80_init(0xbffd, 0xbb1f79f9e76d91ecULL) }, + { make_floatx80_init(0xbffe, 0x9fffffffffff816aULL), + make_floatx80_init(0x3ffe, 0xa5fed6a9b15171cfULL), + make_floatx80_init(0xbffd, 0xb40252ac9d5d1c62ULL) }, + { make_floatx80_init(0xbffe, 0x97ffffffffffb621ULL), + make_floatx80_init(0x3ffe, 0xa9a15ab4ea7c30e6ULL), + make_floatx80_init(0xbffd, 0xacbd4a962b079e34ULL) }, + { make_floatx80_init(0xbffe, 0x8fffffffffff162bULL), + make_floatx80_init(0x3ffe, 0xad583eea42a1b886ULL), + make_floatx80_init(0xbffd, 0xa54f822b7abc8ef4ULL) }, + { make_floatx80_init(0xbffe, 0x87ffffffffff4d34ULL), + make_floatx80_init(0x3ffe, 0xb123f581d2ac7b51ULL), + make_floatx80_init(0xbffd, 0x9db814fc5aa7095eULL) }, + { make_floatx80_init(0xbffe, 0x800000000000227dULL), + make_floatx80_init(0x3ffe, 0xb504f333f9de539dULL), + make_floatx80_init(0xbffd, 0x95f619980c4358c6ULL) }, + { make_floatx80_init(0xbffd, 0xefffffffffff3978ULL), + make_floatx80_init(0x3ffe, 0xb8fbaf4762fbd0a1ULL), + make_floatx80_init(0xbffd, 0x8e08a1713a085ebeULL) }, + { make_floatx80_init(0xbffd, 0xe00000000000df81ULL), + make_floatx80_init(0x3ffe, 0xbd08a39f580bfd8cULL), + make_floatx80_init(0xbffd, 0x85eeb8c14fe804e8ULL) }, + { make_floatx80_init(0xbffd, 0xd00000000000bccfULL), + make_floatx80_init(0x3ffe, 0xc12c4cca667062f6ULL), + make_floatx80_init(0xbffc, 0xfb4eccd6663e7428ULL) }, + { make_floatx80_init(0xbffd, 0xc00000000000eff0ULL), + make_floatx80_init(0x3ffe, 0xc5672a1155069abeULL), + make_floatx80_init(0xbffc, 0xea6357baabe59508ULL) }, + { make_floatx80_init(0xbffd, 0xb000000000000fe6ULL), + make_floatx80_init(0x3ffe, 0xc9b9bd866e2f234bULL), + make_floatx80_init(0xbffc, 0xd91909e6474372d4ULL) }, + { make_floatx80_init(0xbffd, 0x9fffffffffff2172ULL), + make_floatx80_init(0x3ffe, 0xce248c151f84bf00ULL), + make_floatx80_init(0xbffc, 0xc76dcfab81ed0400ULL) }, + { make_floatx80_init(0xbffd, 0x8fffffffffffafffULL), + make_floatx80_init(0x3ffe, 0xd2a81d91f12afb2bULL), + make_floatx80_init(0xbffc, 0xb55f89b83b541354ULL) }, + { make_floatx80_init(0xbffc, 0xffffffffffff81a3ULL), + make_floatx80_init(0x3ffe, 0xd744fccad69d7d5eULL), + make_floatx80_init(0xbffc, 0xa2ec0cd4a58a0a88ULL) }, + { make_floatx80_init(0xbffc, 0xdfffffffffff1568ULL), + make_floatx80_init(0x3ffe, 0xdbfbb797daf25a44ULL), + make_floatx80_init(0xbffc, 0x901121a0943696f0ULL) }, + { make_floatx80_init(0xbffc, 0xbfffffffffff68daULL), + make_floatx80_init(0x3ffe, 0xe0ccdeec2a94f811ULL), + make_floatx80_init(0xbffb, 0xf999089eab583f78ULL) }, + { make_floatx80_init(0xbffc, 0x9fffffffffff4690ULL), + make_floatx80_init(0x3ffe, 0xe5b906e77c83657eULL), + make_floatx80_init(0xbffb, 0xd237c8c41be4d410ULL) }, + { make_floatx80_init(0xbffb, 0xffffffffffff8aeeULL), + make_floatx80_init(0x3ffe, 0xeac0c6e7dd24427cULL), + make_floatx80_init(0xbffb, 0xa9f9c8c116ddec20ULL) }, + { make_floatx80_init(0xbffb, 0xbfffffffffff2d18ULL), + make_floatx80_init(0x3ffe, 0xefe4b99bdcdb06ebULL), + make_floatx80_init(0xbffb, 0x80da33211927c8a8ULL) }, + { make_floatx80_init(0xbffa, 0xffffffffffff8ccbULL), + make_floatx80_init(0x3ffe, 0xf5257d152486d0f4ULL), + make_floatx80_init(0xbffa, 0xada82eadb792f0c0ULL) }, + { make_floatx80_init(0xbff9, 0xffffffffffff11feULL), + make_floatx80_init(0x3ffe, 0xfa83b2db722a0846ULL), + make_floatx80_init(0xbff9, 0xaf89a491babef740ULL) }, + { floatx80_zero_init, + make_floatx80_init(0x3fff, 0x8000000000000000ULL), + floatx80_zero_init }, + { make_floatx80_init(0x3ff9, 0xffffffffffff2680ULL), + make_floatx80_init(0x3fff, 0x82cd8698ac2b9f6fULL), + make_floatx80_init(0x3ff9, 0xb361a62b0ae7dbc0ULL) }, + { make_floatx80_init(0x3ffb, 0x800000000000b500ULL), + make_floatx80_init(0x3fff, 0x85aac367cc488345ULL), + make_floatx80_init(0x3ffa, 0xb5586cf9891068a0ULL) }, + { make_floatx80_init(0x3ffb, 0xbfffffffffff4b67ULL), + make_floatx80_init(0x3fff, 0x88980e8092da7cceULL), + make_floatx80_init(0x3ffb, 0x8980e8092da7cce0ULL) }, + { make_floatx80_init(0x3ffb, 0xffffffffffffff57ULL), + make_floatx80_init(0x3fff, 0x8b95c1e3ea8bd6dfULL), + make_floatx80_init(0x3ffb, 0xb95c1e3ea8bd6df0ULL) }, + { make_floatx80_init(0x3ffc, 0x9fffffffffff811fULL), + make_floatx80_init(0x3fff, 0x8ea4398b45cd4780ULL), + make_floatx80_init(0x3ffb, 0xea4398b45cd47800ULL) }, + { make_floatx80_init(0x3ffc, 0xbfffffffffff9980ULL), + make_floatx80_init(0x3fff, 0x91c3d373ab11b919ULL), + make_floatx80_init(0x3ffc, 0x8e1e9b9d588dc8c8ULL) }, + { make_floatx80_init(0x3ffc, 0xdffffffffffff631ULL), + make_floatx80_init(0x3fff, 0x94f4efa8fef70864ULL), + make_floatx80_init(0x3ffc, 0xa7a77d47f7b84320ULL) }, + { make_floatx80_init(0x3ffc, 0xffffffffffff2499ULL), + make_floatx80_init(0x3fff, 0x9837f0518db892d4ULL), + make_floatx80_init(0x3ffc, 0xc1bf828c6dc496a0ULL) }, + { make_floatx80_init(0x3ffd, 0x8fffffffffff80fbULL), + make_floatx80_init(0x3fff, 0x9b8d39b9d54e3a79ULL), + make_floatx80_init(0x3ffc, 0xdc69cdceaa71d3c8ULL) }, + { make_floatx80_init(0x3ffd, 0x9fffffffffffbc23ULL), + make_floatx80_init(0x3fff, 0x9ef5326091a10313ULL), + make_floatx80_init(0x3ffc, 0xf7a993048d081898ULL) }, + { make_floatx80_init(0x3ffd, 0xafffffffffff20ecULL), + make_floatx80_init(0x3fff, 0xa27043030c49370aULL), + make_floatx80_init(0x3ffd, 0x89c10c0c3124dc28ULL) }, + { make_floatx80_init(0x3ffd, 0xc00000000000fd2cULL), + make_floatx80_init(0x3fff, 0xa5fed6a9b15171cfULL), + make_floatx80_init(0x3ffd, 0x97fb5aa6c545c73cULL) }, + { make_floatx80_init(0x3ffd, 0xd0000000000093beULL), + make_floatx80_init(0x3fff, 0xa9a15ab4ea7c30e6ULL), + make_floatx80_init(0x3ffd, 0xa6856ad3a9f0c398ULL) }, + { make_floatx80_init(0x3ffd, 0xe00000000000c2aeULL), + make_floatx80_init(0x3fff, 0xad583eea42a17876ULL), + make_floatx80_init(0x3ffd, 0xb560fba90a85e1d8ULL) }, + { make_floatx80_init(0x3ffd, 0xefffffffffff1e3fULL), + make_floatx80_init(0x3fff, 0xb123f581d2abef6cULL), + make_floatx80_init(0x3ffd, 0xc48fd6074aafbdb0ULL) }, + { make_floatx80_init(0x3ffd, 0xffffffffffff1c23ULL), + make_floatx80_init(0x3fff, 0xb504f333f9de2cadULL), + make_floatx80_init(0x3ffd, 0xd413cccfe778b2b4ULL) }, + { make_floatx80_init(0x3ffe, 0x8800000000006344ULL), + make_floatx80_init(0x3fff, 0xb8fbaf4762fbd0a1ULL), + make_floatx80_init(0x3ffd, 0xe3eebd1d8bef4284ULL) }, + { make_floatx80_init(0x3ffe, 0x9000000000005d67ULL), + make_floatx80_init(0x3fff, 0xbd08a39f580c668dULL), + make_floatx80_init(0x3ffd, 0xf4228e7d60319a34ULL) }, + { make_floatx80_init(0x3ffe, 0x9800000000009127ULL), + make_floatx80_init(0x3fff, 0xc12c4cca6670e042ULL), + make_floatx80_init(0x3ffe, 0x82589994cce1c084ULL) }, + { make_floatx80_init(0x3ffe, 0x9fffffffffff06f9ULL), + make_floatx80_init(0x3fff, 0xc5672a11550655c3ULL), + make_floatx80_init(0x3ffe, 0x8ace5422aa0cab86ULL) }, + { make_floatx80_init(0x3ffe, 0xa7fffffffffff80dULL), + make_floatx80_init(0x3fff, 0xc9b9bd866e2f234bULL), + make_floatx80_init(0x3ffe, 0x93737b0cdc5e4696ULL) }, + { make_floatx80_init(0x3ffe, 0xafffffffffff1470ULL), + make_floatx80_init(0x3fff, 0xce248c151f83fd69ULL), + make_floatx80_init(0x3ffe, 0x9c49182a3f07fad2ULL) }, + { make_floatx80_init(0x3ffe, 0xb800000000000e0aULL), + make_floatx80_init(0x3fff, 0xd2a81d91f12aec5cULL), + make_floatx80_init(0x3ffe, 0xa5503b23e255d8b8ULL) }, + { make_floatx80_init(0x3ffe, 0xc00000000000b7faULL), + make_floatx80_init(0x3fff, 0xd744fccad69dd630ULL), + make_floatx80_init(0x3ffe, 0xae89f995ad3bac60ULL) }, + { make_floatx80_init(0x3ffe, 0xc800000000003aa6ULL), + make_floatx80_init(0x3fff, 0xdbfbb797daf25a44ULL), + make_floatx80_init(0x3ffe, 0xb7f76f2fb5e4b488ULL) }, + { make_floatx80_init(0x3ffe, 0xd00000000000a6aeULL), + make_floatx80_init(0x3fff, 0xe0ccdeec2a954685ULL), + make_floatx80_init(0x3ffe, 0xc199bdd8552a8d0aULL) }, + { make_floatx80_init(0x3ffe, 0xd800000000004165ULL), + make_floatx80_init(0x3fff, 0xe5b906e77c837155ULL), + make_floatx80_init(0x3ffe, 0xcb720dcef906e2aaULL) }, + { make_floatx80_init(0x3ffe, 0xe00000000000582cULL), + make_floatx80_init(0x3fff, 0xeac0c6e7dd24713aULL), + make_floatx80_init(0x3ffe, 0xd5818dcfba48e274ULL) }, + { make_floatx80_init(0x3ffe, 0xe800000000001a5dULL), + make_floatx80_init(0x3fff, 0xefe4b99bdcdb06ebULL), + make_floatx80_init(0x3ffe, 0xdfc97337b9b60dd6ULL) }, + { make_floatx80_init(0x3ffe, 0xefffffffffffc1efULL), + make_floatx80_init(0x3fff, 0xf5257d152486a2faULL), + make_floatx80_init(0x3ffe, 0xea4afa2a490d45f4ULL) }, + { make_floatx80_init(0x3ffe, 0xf800000000001069ULL), + make_floatx80_init(0x3fff, 0xfa83b2db722a0e5cULL), + make_floatx80_init(0x3ffe, 0xf50765b6e4541cb8ULL) }, + { make_floatx80_init(0x3fff, 0x8000000000000000ULL), + make_floatx80_init(0x4000, 0x8000000000000000ULL), + make_floatx80_init(0x3fff, 0x8000000000000000ULL) }, }; void helper_f2xm1(CPUX86State *env) @@ -1275,24 +1275,24 @@ struct fpatan_data { }; static const struct fpatan_data fpatan_table[9] = { - { floatx80_zero, - floatx80_zero }, - { make_floatx80(0x3ffb, 0xfeadd4d5617b6e33ULL), - make_floatx80(0xbfb9, 0xdda19d8305ddc420ULL) }, - { make_floatx80(0x3ffc, 0xfadbafc96406eb15ULL), - make_floatx80(0x3fbb, 0xdb8f3debef442fccULL) }, - { make_floatx80(0x3ffd, 0xb7b0ca0f26f78474ULL), - make_floatx80(0xbfbc, 0xeab9bdba460376faULL) }, - { make_floatx80(0x3ffd, 0xed63382b0dda7b45ULL), - make_floatx80(0x3fbc, 0xdfc88bd978751a06ULL) }, - { make_floatx80(0x3ffe, 0x8f005d5ef7f59f9bULL), - make_floatx80(0x3fbd, 0xb906bc2ccb886e90ULL) }, - { make_floatx80(0x3ffe, 0xa4bc7d1934f70924ULL), - make_floatx80(0x3fbb, 0xcd43f9522bed64f8ULL) }, - { make_floatx80(0x3ffe, 0xb8053e2bc2319e74ULL), - make_floatx80(0xbfbc, 0xd3496ab7bd6eef0cULL) }, - { make_floatx80(0x3ffe, 0xc90fdaa22168c235ULL), - make_floatx80(0xbfbc, 0xece675d1fc8f8cbcULL) }, + { floatx80_zero_init, + floatx80_zero_init }, + { make_floatx80_init(0x3ffb, 0xfeadd4d5617b6e33ULL), + make_floatx80_init(0xbfb9, 0xdda19d8305ddc420ULL) }, + { make_floatx80_init(0x3ffc, 0xfadbafc96406eb15ULL), + make_floatx80_init(0x3fbb, 0xdb8f3debef442fccULL) }, + { make_floatx80_init(0x3ffd, 0xb7b0ca0f26f78474ULL), + make_floatx80_init(0xbfbc, 0xeab9bdba460376faULL) }, + { make_floatx80_init(0x3ffd, 0xed63382b0dda7b45ULL), + make_floatx80_init(0x3fbc, 0xdfc88bd978751a06ULL) }, + { make_floatx80_init(0x3ffe, 0x8f005d5ef7f59f9bULL), + make_floatx80_init(0x3fbd, 0xb906bc2ccb886e90ULL) }, + { make_floatx80_init(0x3ffe, 0xa4bc7d1934f70924ULL), + make_floatx80_init(0x3fbb, 0xcd43f9522bed64f8ULL) }, + { make_floatx80_init(0x3ffe, 0xb8053e2bc2319e74ULL), + make_floatx80_init(0xbfbc, 0xd3496ab7bd6eef0cULL) }, + { make_floatx80_init(0x3ffe, 0xc90fdaa22168c235ULL), + make_floatx80_init(0xbfbc, 0xece675d1fc8f8cbcULL) }, }; void helper_fpatan(CPUX86State *env) From patchwork Wed Jul 22 06:28:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246971 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp268358ilg; Tue, 21 Jul 2020 23:31:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPo4KEA0B5xK1YkUr+IQr8C+iGdyDVAG3mMm+H4fP8sonRS3ytIf0fWr9iwdg4snFlNyHR X-Received: by 2002:a25:aa08:: with SMTP id s8mr51005596ybi.282.1595399510660; Tue, 21 Jul 2020 23:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399510; cv=none; d=google.com; s=arc-20160816; b=wZ3pTZ6vnhHEHHaW2Nu3vpKaVOSzhW2HYsQRw/Ec5Bkkoow6SnGMZfzpDJuQee8yuO d8FjdS9nw+pRmew3p33/GgFjrUtuIEdJFkaxUslrQWoJ4d28XwdqlnNc50xPG31aZni+ yETOGY9XCFx2+5i99wnnlIYBdjLUx/6EXoQxpS8auxCYxx2LClHyPCpp+GfVhiL/g5Qh 8M8ZXoduRoHDPtSrCoTai3On2FWE8DjDjf0Ctfw0/gu5x6jHkr1vLan9P0Lzlmqj4ZQw fX8EkoRABlZcTFaHMPyh30PrMNvlal5d9/nEDN+v1P9gvk/cKpGhNx8NpXCXNrZpZ6pp XvTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=YyRiXDgTkbk33Yj3Xqp8uu/l6zlWxTYX8kOGxgasWGE=; b=y2pCKSHbitsvY6t8TuWeTTjXkLKWeDop1wZCLXSVur8wsCkNu5suhMVZSrP312Ze8c VhOWXR4XLf+H+3wLNA7PmK+DOtV0nIDJAL/kaYFd9CvQbKOIodUZF5hgM7UDCswjsMWy qhcW4AKrRXJ5KnW4AJn779bqudgV9xyhdZzI0kHNUVE+zREGe8Pd8AAxokgqRjC+0oZw N7mrutgtQqueFDQ8ee7auYIMrymq2Qz22g/MEsuwUlG8XnXh/B49vfS9hs3e+cjhAmuH ZeT9UA6Dn6jw3Vl/7S4Et9G87lK3UtUHcypXF9EBAleZWeGLWQbmaEUmZD8s6pLtodGz Kf+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jHGaLKEy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r132si23089991ybr.479.2020.07.21.23.31.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:31:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jHGaLKEy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8IA-0002BS-2T for patch@linaro.org; Wed, 22 Jul 2020 02:31:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fh-0007En-UE for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:17 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:36725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fg-0006vP-9V for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:17 -0400 Received: by mail-wr1-x444.google.com with SMTP id 88so715718wrh.3 for ; Tue, 21 Jul 2020 23:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YyRiXDgTkbk33Yj3Xqp8uu/l6zlWxTYX8kOGxgasWGE=; b=jHGaLKEyDYe70D+qWIBzD+FLQaBI6I2AZlS522As0ycmm35vNXAu4YP3OrrC0/OSnO jL9AHuw9OWDgz35ej7VDgJWrYRzZOu494xI5SLTR2dLamPSVoPy2MraCRC1eO4KtakoO 0+gEFSpADy2LsZRgGduuI2XexBmhi/VrJwcnZFj9uTB5dRGFc6caZoCvHnUWMoTvyVCJ oExAibYGuXM5iWllE/SLkyu3ovU+6umVeIFz+iYR+tWiTLm6rAY0tozhH0gnSVcvkn6k 5Z+mHCdLkObzAB5JSc4Z1fjcsNsj5Nel9KsWmGC8tP5No9kKth2U38QxqCMmzb1tWqh5 za+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YyRiXDgTkbk33Yj3Xqp8uu/l6zlWxTYX8kOGxgasWGE=; b=Mw9/YQEbfLcPwai0B9hbqZgSINfGhOt2hDUlTeM6n0SoDKz/BnIFO0jA2QHp3W0w/h KXXCwwAB3dXqbQK3djTrJUuqXrkuSd7yM+1UcsHQfxgG46RqhWuSr1PC4s3/WAUIr58v YywNl19SlB8edn1MXvYv1GWDc5zfZBeC4jZODSSrYYPqsm0PrZVwhS42FVY9oADgDj5I Bkktpm6MgcvsUlFXzsf/TV1tAQx9gkTzzfsUEyNRe/fr/KDvrZRk6GxnUWJnTET/UYUK pU8jUMJyEJMNzaMIHjwvT6iOoqWuOwsyqTFEEGW95usz/tYtWobBcwy7pjJR56fBo4Ok ppPA== X-Gm-Message-State: AOAM533LfMBl+3hYQOE1SUl4uVntXl5xIqZSUoDA9pWXkojQOYrqUpL8 UDMN7WGycKw5e3oS3v6Iwva0xA== X-Received: by 2002:a5d:608f:: with SMTP id w15mr28140898wrt.136.1595399354945; Tue, 21 Jul 2020 23:29:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j6sm40145422wro.25.2020.07.21.23.29.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BA8101FF96; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/12] linux-user: don't use MAP_FIXED in pgd_find_hole_fallback Date: Wed, 22 Jul 2020 07:28:58 +0100 Message-Id: <20200722062902.24509-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Laurent Vivier , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Plain MAP_FIXED has the undesirable behaviour of splatting exiting maps so we don't actually achieve what we want when looking for gaps. We should be using MAP_FIXED_NOREPLACE. As this isn't always available we need to potentially check the returned address to see if the kernel gave us what we asked for. Fixes: ad592e3 Signed-off-by: Alex Bennée --- include/qemu/osdep.h | 3 +++ linux-user/elfload.c | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index e44547fb33e..4f8b95619ef 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -173,6 +173,9 @@ extern int daemon(int, int); #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif +#ifndef MAP_FIXED_NOREPLACE +#define MAP_FIXED_NOREPLACE 0 +#endif #ifndef ENOMEDIUM #define ENOMEDIUM ENODEV #endif diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 7e7f642332d..fe9dfe795dd 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2134,12 +2134,15 @@ static uintptr_t pgd_find_hole_fallback(uintptr_t guest_size, uintptr_t brk, /* we have run out of space */ return -1; } else { - int flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE | MAP_FIXED; + int flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE | + MAP_FIXED_NOREPLACE; void * mmap_start = mmap((void *) align_start, guest_size, PROT_NONE, flags, -1, 0); if (mmap_start != MAP_FAILED) { munmap((void *) align_start, guest_size); - return (uintptr_t) mmap_start + offset; + if (MAP_FIXED_NOREPLACE || mmap_start == (void *) align_start) { + return (uintptr_t) mmap_start + offset; + } } base += qemu_host_page_size; } @@ -2307,9 +2310,8 @@ static void pgb_reserved_va(const char *image_name, abi_ulong guest_loaddr, /* Widen the "image" to the entire reserved address space. */ pgb_static(image_name, 0, reserved_va, align); -#ifdef MAP_FIXED_NOREPLACE + /* osdep.h defines this as 0 if it's missing */ flags |= MAP_FIXED_NOREPLACE; -#endif /* Reserve the memory on the host. */ assert(guest_base != 0); From patchwork Wed Jul 22 06:28:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246973 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp269704ilg; Tue, 21 Jul 2020 23:34:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrvWWAb+28pGzbcH5IAH1msIoHOy0zKOpIGXH5dBkuCm2tpPCquG8vFYYIbcZKbpkWVyUq X-Received: by 2002:a25:df8e:: with SMTP id w136mr47587327ybg.140.1595399643653; Tue, 21 Jul 2020 23:34:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399643; cv=none; d=google.com; s=arc-20160816; b=W0FNfbfXLXQuGBw9/75aFB3ozwdTHB1tIFx/fMxtTIV6zAMw14pOtVOjSSqM09bJrv vv8nGUhmzhgYDraYNukB8ZR1WuoWyVeW8gqSpTGV6kdu755LUax4r49UeSNS42PUq4c8 +yEu48rFg4Hztys3m3ZNCD15aUNg1CORG3nfw7o1FAMpYfsZ9kfyFfCt6nVdtVsphy2z rSOwZ4NgqJiwLkLUGDtVSt7BTefG+8xvFUe8GJege0VNP9bZuJ0vGcEjPxNDmJvZ0CxM UhzQuz9uzv/En8wJbDbSAffWaIjqsoQLjyx1/dkyES3+rowwHoSqjVBWLAnPbmWuHnc9 am9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=8L2vbKsuiM4fLbSGCq4fCZieZ/wNbRKZPh+JXVwckiw=; b=caUD+G+LhTTTzQNp/RF4n3co4hQhy/e2II5ZFYKAsiQzmLfKzoF4o3UNmeQi80LTt7 qAwXITy1gSbFrfjRlw/DPHO9dib5moMenpNCJsyndKXskTHyqrcWnC/V0JtqfhO5PLz1 DLMXQnQ5r/5s5FXJHxugnLQak1t4fVJjPSvCx+0vFr1h8sepUuJ56L02nvfwEdfJZF5y S0KH2zqi2wDSqllrtNfuv3sHo4H8BTlcGFduJW33gGczcatz2oqMg6mvr6KdKS4tsl3V 3zig8aFn1a6Rwub7BUko1kgS3MDR8rbHZpKs5otL6FQsn1SxjpbQoNEBXEF4JiZpHjQj HAZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=elfPb4nn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f90si5099063ybi.165.2020.07.21.23.34.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:34:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=elfPb4nn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8KJ-0005Nh-0y for patch@linaro.org; Wed, 22 Jul 2020 02:34:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fl-0007Nh-5P for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:21 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:46839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fj-0006vn-0Z for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:20 -0400 Received: by mail-wr1-x443.google.com with SMTP id r12so676969wrj.13 for ; Tue, 21 Jul 2020 23:29:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8L2vbKsuiM4fLbSGCq4fCZieZ/wNbRKZPh+JXVwckiw=; b=elfPb4nnrSUwiW/bV0pZBaHIpKnqzEM61rBwtZcLcn5JFU9z+74X8DiuvkjtrNxRz8 TJAJZcA7VH+B6ctLfzXk3LjR7ns8yNGlX7ly5hfRwJtVlccrm+ewd5p00GGSje5wZTq0 Zxd5mm6GwffgX7dTXJ42+NA8PVeL2cZLu8bXEaoq4AVwOkTdw8+TPmyAlc3TW4adO1q1 SyaloCWXZZ53SKMjWSZg8KlrIbdzvyS1CTuSSevg7/CmlBvudQIUq9eOZtLj2DQ6arKJ 1VRdL9VeodH5TG84ci7+dBbBLdnjyv0smj8m91mElhqQLw3PhVYREY6BpdsBR1/yFfGe twWg== 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=8L2vbKsuiM4fLbSGCq4fCZieZ/wNbRKZPh+JXVwckiw=; b=XuIOgIg+iRyan2QdMUWXgW9qYm5w1pCQi8nZWooFZdnn3BiRwTwUcbT10S3Ybo93hd lUixo5ik6Wi3g5dQxlVRHk6dSeHLh5mYiabrgwscYYNBw1VRfcRTwkepVRt9od20gfrx H76g1h/CB/t4P12SrM6Q1SXdJRU5I/fQDZS0FgScL1IAsh14kOqykrYZUEU7Xr8lHtX8 IXkpd0hMf+w9/mkb37FRerJbtCPQLQ4VhT+SIYSvSZipeEH1T0WaOl1SRPekxJgPgbi4 LhQ0IyN6aqrE+1Ehsr/N776wJAW513R3kyJRiB+HY9NtcqvHsDWEq4tRQbQjcIgZOotW gTgg== X-Gm-Message-State: AOAM531cpuDtJ2B/0FJgU/czX/XjoLaqOTm/fpdo8UAVrYIh/XXQAErj g5I7WSgDVIK2HDA29IF+EdNK8lHf3Hw= X-Received: by 2002:a5d:4687:: with SMTP id u7mr31382443wrq.357.1595399357669; Tue, 21 Jul 2020 23:29:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r11sm5854388wmh.1.2020.07.21.23.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D04591FF98; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/12] tests/docker: fix update command due to python3 str/bytes distinction Date: Wed, 22 Jul 2020 07:28:59 +0100 Message-Id: <20200722062902.24509-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Does this seem convoluted to you? It feels a little complicated to me. Signed-off-by: Alex Bennée --- tests/docker/docker.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index c9f20d8d093..356d7618f1a 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -24,7 +24,7 @@ import tempfile import re import signal from tarfile import TarFile, TarInfo -from io import StringIO +from io import StringIO, BytesIO from shutil import copy, rmtree from pwd import getpwuid from datetime import datetime, timedelta @@ -541,13 +541,14 @@ class UpdateCommand(SubCommand): # Create a Docker buildfile df = StringIO() - df.write("FROM %s\n" % args.tag) - df.write("ADD . /\n") - df.seek(0) + df.write(u"FROM %s\n" % args.tag) + df.write(u"ADD . /\n") + + df_bytes = BytesIO(bytes(df.getvalue(), "UTF-8")) df_tar = TarInfo(name="Dockerfile") - df_tar.size = len(df.buf) - tmp_tar.addfile(df_tar, fileobj=df) + df_tar.size = df_bytes.getbuffer().nbytes + tmp_tar.addfile(df_tar, fileobj=df_bytes) tmp_tar.close() From patchwork Wed Jul 22 06:29:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246975 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp270580ilg; Tue, 21 Jul 2020 23:35:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaE9yOD6RD9pvzvlV9VrHEhmg90tpMXhyiQVDLu+swL3W2Ohzsd2uq0JuV3BZgOgH+YOA5 X-Received: by 2002:a05:6902:6a9:: with SMTP id j9mr44328391ybt.52.1595399734251; Tue, 21 Jul 2020 23:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399734; cv=none; d=google.com; s=arc-20160816; b=XN52Vzc2BbvihF9UX/6sKPGJbQq6LCm+3K5mWWFfO9rNDtYzJn6E0XfmK32cOwM2+r ixHIUrDQJFf0cCrxNpJBsz4qq6GtIltq9ZqqQEnKIftaEFtDdy6AF+S/abCEKrMmHscu iMJ08hTzDvsSWMogb2R5Wh/jHjkKWfs1/hwKjS5oYoC/Y8dnhDznMUGOr8c5sCTq+fQM hyAGr7W1VP2vXOqKaqadsEXUC0XO93rZ7LR6G89KKPV475EMtKuUT6edlDJfx6Vpvt7D I6NJ1ruYxvb/OLIQUYw56gchx4mC+IqefrLfduKjuYRqoQR/QtWf9XHIIxrNMQ+upjE2 vKzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ltWiVwdUknugsiDwNPNQ/zuHjy+8DNFqI6hfoHm84KU=; b=QAptdmHwqonngJZSyPNMlYlRCXi2+x7yvh7RN0JfwlVJ2BHDuA9j8aZS97Vx0vxKXX tD2ZmLcKckBgYsJ+sSKWAAjEEjunOM1bbxluZNisYJ1iwUTrXRfk8J2A7SZHkVQ83WXY c6lh9c5dC4bbElzsQ/MoJBrrwqyeNm2w8fMy9PSW66lvdO31NJw/0MQA1Ti8GjXxwe93 /PNQ14E0bvyEegg7xlLBktcAdHs+1C2pztoEaBKV8bOC8g59zjJNiWN9/xeY+lLd5FW2 im4q8UcUXT+xHIvCqGtu4Qkzgm5Few6ChmdRwMH9nfMRnT6IGOlA9weiON9KDB/wAFd3 wMuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GHvLLkox; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j190si21629616ybj.64.2020.07.21.23.35.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:35:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GHvLLkox; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8Ll-0000KT-PU for patch@linaro.org; Wed, 22 Jul 2020 02:35:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fl-0007PI-Ph for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:21 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fk-0006vr-7t for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:21 -0400 Received: by mail-wr1-x442.google.com with SMTP id q5so705436wru.6 for ; Tue, 21 Jul 2020 23:29:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ltWiVwdUknugsiDwNPNQ/zuHjy+8DNFqI6hfoHm84KU=; b=GHvLLkoxkpao1nPfCrN0SbryTXyG9S4FyTHb6vOW0CnHx+giro9PQ4S8MLrrUJSbOK rDfMnMDzcmqEc/5igOMO1WgKsotlj3/pe2rGKG7FIAliCqf+ov9donIDGHyTft4tyOpc HbOnHW+18cZxnxW4xRS7/0MxWLGtLyi2Gd6tBCarjrfbV7udqPSKjZ/puX+Bi1bBuqx+ v1Hl1EJGu52P4zT1Os1piGjxdqRCd5dDuLV3nXE5Rp27N0NY+kiGzSocy4rbJyWH/syA Jo8VG/nJYh8vJFenvQB3kB7YWESLFPwtajfKUkTFkEB17cl/v2K6GMizUFSMGTc/mPk0 IwTw== 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=ltWiVwdUknugsiDwNPNQ/zuHjy+8DNFqI6hfoHm84KU=; b=lvFKGX0vlbzDlywkZvlUDS5knssVh0cTEtbTs+H7rtDFNUel1YZ/MBMQcTGeILfjN4 eHTXdWiU9gC7grnauQdDPJUIlLikWry2TNRumplSNFc4w57MjwKIvqwO+Je9OnxZrLq7 rjNpelDPWLPOlibjN/POqtiWYJJSPCz/KnSiK2kT0ZVq7wziTgICM/Cr4iO0ynQj1h1H gpLtfeOcL6kB1dYpyzhbS2k4HMLQpeRtTNJFcOtDIfrZ2v+HRg7mUVfBRyGaRZoqCS/k HZXDiPY98eSuhqLPnl7uD4sI6HB0Duuu23vQBxBIanpkk9OA6qMtaPQOMUlG32f9Ydcp r55w== X-Gm-Message-State: AOAM5316uSeg9YLuPC3Vca5p3tW5YC8D0/Z9IY9W0y/n60ervyC/kXrp 5QJ6EwchCJe0+K/F0IQVRWkYP2W30Mo= X-Received: by 2002:a05:6000:12c5:: with SMTP id l5mr32281935wrx.219.1595399358737; Tue, 21 Jul 2020 23:29:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 60sm15886959wrs.20.2020.07.21.23.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E5D661FF99; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/12] tests/docker: fix binfmt_misc image building Date: Wed, 22 Jul 2020 07:29:00 +0100 Message-Id: <20200722062902.24509-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When we updated the arguments for docker.py we missed a bit. Fixes: dfae6284 Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a104e9df281..9119dff97de 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -78,7 +78,7 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker DEB_ARCH=$(DEB_ARCH) \ DEB_TYPE=$(DEB_TYPE) \ $(if $(DEB_URL),DEB_URL=$(DEB_URL),) \ - $(DOCKER_SCRIPT) build qemu/debian-$* $< \ + $(DOCKER_SCRIPT) build -t qemu/debian-$* -f $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ From patchwork Wed Jul 22 06:29:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246969 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp268060ilg; Tue, 21 Jul 2020 23:31:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6/EpEqAtOfXNZkgLclqIo2FhXLQLQ/gqAz1AeN84GdnAF/abMS9yxWRGXULjcuRKWiDxc X-Received: by 2002:a25:4dc4:: with SMTP id a187mr43037292ybb.422.1595399479854; Tue, 21 Jul 2020 23:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399479; cv=none; d=google.com; s=arc-20160816; b=OcsSS6M+fmDkb2vf2SMgFmr+mDt3FuyZ0AHnpsj624o0+dBu1Iei3/MmOQiMrwRf/9 aMBbujJfWousCSxG94Li1Hjgc2i2h2mLLG+6utQphqyfi1e/FThoKKFSMqAK02ftTPid HE2Owwp/MNVrAudAGgWU720oMwEJvRN8aiiT6sqfZC1I5kVcWXlJqRRDdoBa084LSlqd MXMB3AIFP8hhgViATwpGOd4c4JO+5AQk8iV6xtDByZM8Na1H6xh0iRQrF0pY54KaUyog ktLqKwWbaEcDhgfqqfk9zWhbX61ON6A90nYKKk4bw29RXSuch8sGagY7YumvkHbiOKM4 txhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=pVMfracDJydLXMCggpl4mxu1W+C4dGbG4uOzhxzcx8s=; b=0aCkJFv1e6DM41Emc6WjNO5cIekEHRh+gWDRGLE9mWoVIttsCN3qFpTTdfnedSXnYW XXzB37YaVM+5qqILqK9xIz1Lbh/rBzUisak6atmCKRLRA2nbUA1n4DpScMd+74QzLPPG vpca7e40jtZt5sMHLDZmuFuysEVgGSa4XZ1KQ1gqYYoOlnM41Wn0rBORgCBA+wvOoXFC c3JqYFuUwqG9GraZAE7JOBBDZ72A9pbc4PN1aTKbrzuxvaaXdRNlyJu27Aea+7rPLv67 SNZH7m33hmoaXw0MnSFO5QxUuvS+8xfMYEgX41MoXzEg5clRW6d3sivDx3OPwd2T+oj+ NiiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NeVAkK0u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v84si23133850ybv.78.2020.07.21.23.31.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:31:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NeVAkK0u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8Hf-0002Gg-9s for patch@linaro.org; Wed, 22 Jul 2020 02:31:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fo-0007YD-Lm for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:24 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fm-0006wN-RO for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:24 -0400 Received: by mail-wr1-x443.google.com with SMTP id z15so694871wrl.8 for ; Tue, 21 Jul 2020 23:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pVMfracDJydLXMCggpl4mxu1W+C4dGbG4uOzhxzcx8s=; b=NeVAkK0uW4Q2i3+1m53uFSfZLXpe56PAklR7eMtlbnLxeKjp8X9Y443eZQBaPlHGLD bF0WNOh6z6WBgqcDBX9M0qG3eMN3gMnjyShsgtML7zvRk4qWklIXjKEnFlL2cNnr6DeA KUtwzx3bWQHOMUsZtHvh0/THlpV3gdZualf6qD/h+HXHTYlTsKXb8ezuKAM+SnLz2MaL 527dtgBbaOSsk9bwmQiR4bviDzl8M0sgrvO4+nWfxOJ3fSTYPoZTh4bWPfhQH00l6+J7 U6N8MoPqeUwgt174UbmKrOqlAm4cT3vt59vPoOEt1/5IGMWo+mRp1ErJ907vlGHSJRcW n19w== 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=pVMfracDJydLXMCggpl4mxu1W+C4dGbG4uOzhxzcx8s=; b=qGTc1aYFmYys4pVS09//h0bw3LA6ASHxKx1uiABYK9osqoY4Tdl2BExzrnB8Syh1pl 09mdo5r72S5mWlQmGP0jrvmllIAVJ0pzBDD3jRvSbggrlRy+171SfDSpdJLfaL4TI+r6 hOEm40qamIxwnJ89f6f07V2P8l7RXhxwUZONX0fYH8zFQFIszrFYbcseuB9497orotDY Qkb2oA3w5AZg4gBgH87hoLiybFN1AmSfLS4uBUqO7K0mv6N1OCclEDBvqnwkn9EZe86B PUuvN4dXoYggbsJh3czNrZj6AN7Y1iJ5DgpuSGiS9mwcHkLya6K0KVeILqz6kLdASz8n DDkw== X-Gm-Message-State: AOAM531s3+1qkHxjXXelVURyF6J+DWe3rgeuOIH6qr+kKOXyIDyaDlpV hSekTP8A/B5uxjGtKLj9NVCtew== X-Received: by 2002:a5d:40cb:: with SMTP id b11mr30208239wrq.263.1595399361583; Tue, 21 Jul 2020 23:29:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g14sm43358632wrw.83.2020.07.21.23.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0A84F1FF9A; Wed, 22 Jul 2020 07:29:04 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/12] tests/docker: add support for DEB_KEYRING Date: Wed, 22 Jul 2020 07:29:01 +0100 Message-Id: <20200722062902.24509-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For installing stuff from sid or ports you may need to manually specify the location of the keyring. You can even import keys into your personal keyring and point it there, e.g.: gpg --keyserver keyring.debian.org --recv-keys 84C573CD4E1AFD6C make docker-binfmt-image-debian-sid-hppa DEB_TYPE=sid DEB_ARCH=hppa \ DEB_URL=http://ftp.ports.debian.org/debian-ports/ \ EXECUTABLE=./hppa-linux-user/qemu-hppa V=1 \ DEB_KEYRING=${HOME}/.gnupg/pubring.kbx Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-bootstrap.pre | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index c164778c302..35c85f7db8a 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -79,6 +79,13 @@ else fi fi +# +# Add optional args +# +if [ -n "${DEB_KEYRING}" ]; then + DEBOOTSTRAP="${DEBOOTSTRAP} --keyring=${DEB_KEYRING}" +fi + # # Finally check to see if any qemu's are installed # From patchwork Wed Jul 22 06:29:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 246976 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp270743ilg; Tue, 21 Jul 2020 23:35:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3Sp7+flPy030AD6pmSCyJuiQvqR3PpjfD4OCSyj00NSJQ20ErGKW4Ix+iTT/K15Jlkx+z X-Received: by 2002:a25:41d3:: with SMTP id o202mr50470765yba.236.1595399753411; Tue, 21 Jul 2020 23:35:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399753; cv=none; d=google.com; s=arc-20160816; b=P5qjy3H8ITV+6iN5+8urP8BP7vkiXx/YbqxHqDbkNiSPOX1BIUiTwQCfnEUCVGA7DZ 7oQsz91t7iTFtovc4vpfP7u6jxJ78wl0phTCO/jzmt3o4Cqsv+olXdRkMHctLxweH0ah oVAqoPpFUe+mokaFsF+U0d4+Zqt7g5Nn0ujV08aMMzMZqR2jO+6r88bb++wMFRiL+B6H Htc8Zks5wCPFCbkwJRVAbGuIdyM9Wb3YyzR9bzHUviglikXfeE8wqnn9zJ6V4WlSeNLP o0GGjWLUM8+t57oVUhrC8x53DYXNqv0Uon/yxn+b3ul6QPSEuoXSZgXlplPlFTM86jib Cv5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=R6W72fqt6nZhVleVWEEALghgISIRTfZPOqJF2eNqmeg=; b=pWUsJqAAX5qRq21hLe9KiH4SsbzsOGZK1/e90vSS8a4I3rOhPXZ0MnCtGthtS+N4vB wbZOU6Sm0lGcXEnkJiBntwc9wZIkauTFOwO03N9MrtfNd86B20+5rJ3blupqQGQwuj7W JZ3D9RZuPyek5LNLwBCkp5EFLAX7msfvuCcxkrZKcUndRG+ncNYh6lKjSZzIkxBOLoop M+OMsJNJoVLRzKrrYJdFdyNIz8Giy7eh4p3HXLBGKNwIaPNV5G2FalC/lKhJkeEAZ4YK uls9nz8We6t9h1EiO4l/PKGeGcjFF78V/tLb+Duf1R/LFHAkOWlcvJYGpO3GitpVa5qq sbkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=djW38PXf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r14si10741699ybl.1.2020.07.21.23.35.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:35:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=djW38PXf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8M4-0000oE-U8 for patch@linaro.org; Wed, 22 Jul 2020 02:35:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fn-0007Vm-Qt for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:23 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41131) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fm-0006wB-3n for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:23 -0400 Received: by mail-wr1-x442.google.com with SMTP id z15so694852wrl.8 for ; Tue, 21 Jul 2020 23:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R6W72fqt6nZhVleVWEEALghgISIRTfZPOqJF2eNqmeg=; b=djW38PXfbv4y5Pi/E/iIqcdlGNZBd61zyjKfvdfLkjS6oWNidlQjl+KNL0Y7GJjIgJ a1AVzJHUyv6MwBgLWgmOITMVPGk62xNuVjNEckZ06cxI9x/RzU+HDOAI+mmxCIGEzW69 jSDON5w2S3fSg0pfwmxYBjOQbg/DQuwIdakTUAyhutRxkQB8PCpPo7YsoqG94XPtpJ4K 02WeKyVzOa7tzHpx0aF2UQ1L4J2QICUkVxjniNfnWKiBVqZTOZ5Ckco0sd+nfMK8onaA IIQ7SInSIxEj2RWumB0m4VPSFH9g7XhmNb74P8Osf0WMVf89JmYbSch/uW2Hnhock60j NEXw== 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=R6W72fqt6nZhVleVWEEALghgISIRTfZPOqJF2eNqmeg=; b=X0kGfDqPUhQkoOyLjWxFxC2mzx87fJGVGinyg/rzf47qGDP7JZ1oU6eOSj/WK0bqmr ap2UP0kZILCHbpN/+ZfDWzPoPXln5Bd+BWYiyaGWvow+DEYd497yfYOuy3Y7Y+r+q/ht g+CvlonXqSqmS3ZFxv98/QYq4eCAiBLL52O1q+uqg7uiEShl3aU21+rbvna69Ps5MGEM cfIQQ3MBw7EoF7gjm7w0sntNk4PgKEm/SXOQ9Extrjb+i81B9U93dQ3qTiBVQuI7mgKb XGpqdOSz5YTQTJKIwDBsFKqnGUjVc+WupbBq2PpM9+u9s21+mlcZVX0b/8Z5fJLIwqay Pt5w== X-Gm-Message-State: AOAM530zVQ8+iFVYvsnAnIu/XATahlpY9xROWtl1elKxcJoz5eZyhja1 0kemPPev5Hm5p7CURHQNH82jAhz2gG0= X-Received: by 2002:adf:f0ce:: with SMTP id x14mr28337613wro.137.1595399360719; Tue, 21 Jul 2020 23:29:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h14sm39361088wrt.36.2020.07.21.23.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 215F01FF9B; Wed, 22 Jul 2020 07:29:04 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 12/12] linux-user: fix clock_nanosleep() Date: Wed, 22 Jul 2020 07:29:02 +0100 Message-Id: <20200722062902.24509-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, richard.henderson@linaro.org, f4bug@amsat.org, Laurent Vivier , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Laurent Vivier If clock_nanosleep() encounters an error, it returns one of the positive error number. If the call is interrupted by a signal handler, it fails with error EINTR and if "remain" is not NULL and "flags" is not TIMER_ABSTIME, it returns the remaining unslept time in "remain". Update linux-user to not overwrite the "remain" structure if there is no error. Found with "make check-tcg", linux-test fails on nanosleep test: TEST linux-test on x86_64 .../tests/tcg/multiarch/linux-test.c:242: nanosleep make[2]: *** [../Makefile.target:153: run-linux-test] Error 1 make[1]: *** [.../tests/tcg/Makefile.qemu:76: run-guest-tests] Error 2 make: *** [.../tests/Makefile.include:857: run-tcg-tests-x86_64-linux-user] Error 2 Reported-by: Philippe Mathieu-Daudé Signed-off-by: Laurent Vivier Message-Id: <20200721201754.2731479-1-laurent@vivier.eu> --- linux-user/syscall.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) -- 2.20.1 Tested-by: Philippe Mathieu-Daudé diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1211e759c26..caa7cd3cab9 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -11829,10 +11829,19 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, { struct timespec ts; target_to_host_timespec(&ts, arg3); - ret = get_errno(safe_clock_nanosleep(arg1, arg2, - &ts, arg4 ? &ts : NULL)); - if (arg4) + /* + * clock_nanosleep() returns 0 or one of the *positive* error number. + */ + ret = host_to_target_errno(safe_clock_nanosleep(arg1, arg2, &ts, + arg4 ? &ts : NULL)); + /* + * if the call is interrupted by a signal handler, it fails + * with error TARGET_EINTR and if arg4 is not NULL and arg2 is not + * TIMER_ABSTIME, it returns the remaining unslept time in arg4. + */ + if (ret == TARGET_EINTR && arg4 && arg2 != TIMER_ABSTIME) { host_to_target_timespec(arg4, &ts); + } #if defined(TARGET_PPC) /* clock_nanosleep is odd in that it returns positive errno values.