From patchwork Fri Jul 17 10:51:35 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: 235687 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1582610ilg; Fri, 17 Jul 2020 03:52:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXFmlSVl3P+Tyjme2+cLc7AlP0aB0D1fg1PF78OlsG8/k1wdfChZeuWJL0R8jO6Yme7ggU X-Received: by 2002:a25:a502:: with SMTP id h2mr7418004ybi.503.1594983166551; Fri, 17 Jul 2020 03:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594983166; cv=none; d=google.com; s=arc-20160816; b=UHJkDTZJSGxAyRWuSmTxZ01zsw8lhsA4X9kjto1O1dlqfBe0uTqVXR8aYjgezzUP8U 8Dq+McETxTDeIBqolxEp56TrWTLZ0zIS9fpJfmMsfdlLa3R26GgYwSzECSq5PpwjV4k3 +7C3r+EKbntlgVV1IE/R9jqR90+QOgoGQGWOjSoCd+9whqMg8AZS/P6xx8A8wabuxAUW Y3hLiiXK9GWNAGMx3THTNmZ/1WrevmrHH6jUacXun3SofyJZFB4k43hb2jVsAqkKWq9f kN56Tyo9fxa/BgbV8AfnA5iwtQNMc4q2l+94aHgxWtoriOBDxsyDr1Vhea7ith9hYQzA nV/A== 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=UTNNPLj2+kMWz6js2JQCoZUUX1PoT8XdOIXnTvMqmsw=; b=b0unX0dIZh0qe4d4ZKPKISD5qVWPCoZzZWeYRXjNjwSStChsxTpndrQxlP9I9542Rb G1oPsdBcO7WYLEmNDAFH8VLudtvIGNdLZVOPk6Su+jptcKxV+/+KEHcpVyHbIrKjIXZA XF7xYzDTd3tlwOy8xNlqdXaBpDY8D5AXQsu/qwwE+zYcQpu8gXcYb0f+gXWW0nqZIXhk t9Ilzm0BSbdk+uP2T8uN9BN86rCE1vrNlhAuWkiwN86JaPTQlPpsQm/4NapO/jTBeHYt o7K2xZ23vgQ1hrWGP5B4A8kKaxNX0BC0hvz1guR/Gwbl2Yb0hURJRkKerVhqK6mjDA09 SmVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NIXZ17l6; 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 g81si8290668ybb.330.2020.07.17.03.52.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Jul 2020 03:52: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=NIXZ17l6; 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]:36366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwNyw-0004dU-09 for patch@linaro.org; Fri, 17 Jul 2020 06:52:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwNy5-0004c2-Lq for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:51:53 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jwNxy-0003qo-NK for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:51:52 -0400 Received: by mail-wr1-x444.google.com with SMTP id s10so10444634wrw.12 for ; Fri, 17 Jul 2020 03:51:43 -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=UTNNPLj2+kMWz6js2JQCoZUUX1PoT8XdOIXnTvMqmsw=; b=NIXZ17l6w7bFZH1D8zBLzMJzrl7b3jZYQqstvAHrqyCxRJ2cYeBXYAc30Kc2j+P7Ky I0azmjLxTv6ZfNUTmCKEahVToM1J1IsxKMC+QWODp2iaeHFg80l9esf2iwg9gvPNM81X lrZRRK9sWmtZ3n3tdC2UchMjzwEox+ACAUNmrWQtKB11dGDtvCmi7Uy0nG6lFUFtcTrT 56Tr3Ho4lQwEsmMqh3Y0m7AirWYrPXIaap8rWGJ4IiR8Svd3qz5uts24Ycfagdofncda jZI01uFq1aLEXu7VIzQf2ubHwmbY3bf3YEMz8oksbKzup6pAQic8IcNRRAjqTsxO3RlK TwkA== 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=UTNNPLj2+kMWz6js2JQCoZUUX1PoT8XdOIXnTvMqmsw=; b=k4Q1NVGtU61nkFR37+jR3lKwiDR+Wh+PkWWTd+v+lTW5fzkfWbhyjbJPQ/ESwtVEwM EmK41oHOssr9PWtF4NbZrhWcUIwY+Xj5xQ7R+HpKzDO4AEQ2PxALGo6f0IpI48OjCJ+X MhC/VulT5SsB7eQvDj5djV4+lASx5XJTeuv6BneNI55V2Y/fhDEWdBTZf3SNjU7zJNOF hvvEGHXe8HJ3hN29Ato2c+uHOzjLx6BU4xHT92HQDqIGj3uyurVodagROoufuCEtngDc z9CA08cSdWddFElqnyFWrO8B5ru+0mn9pYpQVPSdVWVoVJpE7YEVPaFpQ9Kny73jBcC4 my9Q== X-Gm-Message-State: AOAM530L+3F7y1/lC2UlP2OKigVD2EP08PxaVP98/+obKrlRc1bbWOmR e+PSCHmi92/8BS4oytr3akEB4w== X-Received: by 2002:adf:e684:: with SMTP id r4mr9657478wrm.68.1594983102355; Fri, 17 Jul 2020 03:51:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f14sm14343778wro.90.2020.07.17.03.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 03:51:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A77241FF87; Fri, 17 Jul 2020 11:51:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/5] shippable: add one more qemu to registry url Date: Fri, 17 Jul 2020 11:51:35 +0100 Message-Id: <20200717105139.25293-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200717105139.25293-1-alex.bennee@linaro.org> References: <20200717105139.25293-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, =?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 --- .shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé 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 Fri Jul 17 10:51:36 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: 235686 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1582223ilg; Fri, 17 Jul 2020 03:52:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaf4mdmyZz3C6HQsV3T5imVdAiAHRFFjJ4sdZe7M2noGp9PoFT92WKdbbQBSFefGaulbM6 X-Received: by 2002:a25:bb0b:: with SMTP id z11mr12652595ybg.235.1594983130334; Fri, 17 Jul 2020 03:52:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594983130; cv=none; d=google.com; s=arc-20160816; b=ww+67OmbhLUcW8BgH0k5CrD2clJAUtgFkD21H3JVUeJsy/8xmSO9uNPgP9TJ308ugr gNL0F7gOX3DwUr5aWYCnHQ1MtKnyM64hbK0NSDt39m0KUX6zoDIrf5C+8jeN267WsXgo zVxIJqK4Ba78sW8d2VYdGizmVMrnMtgB/8smiacM2CC0rbRIEpJj4nHPFW7JdOXjL4Vp 7ZYjy+1j+RFK6Wj0gfGlllWhEoWhHkDbwRd13pS4WKWlQOWUWMwz1RQXOJcUP+UndlbD SfR/3IHvuEVz6/lnUx3KKdVAtaHfDK0y4w4NODhHeG2qgs+8HjDkDJbYDzK4U9wnDqQM QQDA== 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=9slN1O2papsPKJQx1hZlMQQQGQ7xlVdARzuD4a81gdY=; b=KQJT1Wv7LRUsbUOEj2Or6bOyJx3K/A9nANxqMyRu03OYvCRRhoufeFSdWJEX8Dtd2S UheUTv4LNHzDdnJVGf58cXzVUVRL+N/PTRyl6d/P9PHktBgEvqijzLOdD79k7NgJJ7tQ UoWtVusTMWS3e9cJD3FLr9+cvTKg68lGvHMPMQCByAp12u3k6jLUFa6bL4cor7RK87sz lWQC0jrZeSsFfvz/3OmqgmrUrnNWUJvepSpUs6wK5MrYHoG1eX2JRx9lBn+ZLJ8+XsrO EeZEXxuwvRaG1oL0r/Cc5KgE3dyEpKDvvfspU9weFuMmdxo2kJBOFzlnJGCey22xDzvl 32MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D71HrpPV; 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 g29si8860565ybj.11.2020.07.17.03.52.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Jul 2020 03:52:10 -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=D71HrpPV; 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]:36358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwNyL-0004dH-QX for patch@linaro.org; Fri, 17 Jul 2020 06:52:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwNy5-0004c3-Nr for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:51:53 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:37584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jwNy0-0003rL-Pu for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:51:53 -0400 Received: by mail-wr1-x441.google.com with SMTP id a6so10518589wrm.4 for ; Fri, 17 Jul 2020 03:51:44 -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=9slN1O2papsPKJQx1hZlMQQQGQ7xlVdARzuD4a81gdY=; b=D71HrpPVovQLHADlFAVOR8oAkxnw+Xbap74WtFNwb3jxuPIHQ+r82MpSMPVmdCLQTe ExQEFIjSN6xf+LeSXEk9yhDSiZo8WfkVIieJyIh9+/NZBz/NHYkQR6YS/N1U9lCt5x8f a3V1XkRRwZalyPTG69QVfuEtHNfkwpZBxvkycPLIMHp2Aqkl70c/FHO07ePSBKbRwjbg TcECQEs0Iy7nJqLf0f6kEDQIJjSRmBBm3CNfoIeRwjNHkKB7DUbEk6LHJnkN2i5ayXrg 1nkHiznWWLIL/uMNTU36izMGqBKGN8reKC1efN4vDsx8ZclT9KAQR3MHFJNn6aSy+zLG b+1A== 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=9slN1O2papsPKJQx1hZlMQQQGQ7xlVdARzuD4a81gdY=; b=IsMdSwie0j/lgJpEIaDdkrLXbwOnBBzJfNlfzsL3Qju9Yl+uRN9cuGvjg9Kmuhno1E zz180//mize/RDpWU4NcENelBVcy0nWQznfrZLTA3TSEJqqcYF5eqJ5bdZgO6uwWjNVO eBhIDiIKvQZh5Xe5HKEjfAYxSlF7Pbg2MHhx0hkcVbC4nGAotaAAn7nX56nYCqTYGw2c O+qKRh3GzXiEWbM1pKSTA/vfHm7h1FUAYvjrnbc5r0CeEAxX0X3c0/JD00AWAuo0+0tt 82JlT8ISZ+2KJbeUjdQ0BpQh8ImZvNddzMQv3PtbYu8zFrTqdnzmV24Zv+HmEXfvR6QO hpJg== X-Gm-Message-State: AOAM532E2HR9tgw4fZuYEWs65vbnfDca7EJPJizUZDdY8yAewev12f+x NfKumyeu/DxLnYm+ulcMiI8yzw== X-Received: by 2002:a5d:6ac7:: with SMTP id u7mr10371245wrw.25.1594983103877; Fri, 17 Jul 2020 03:51:43 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 59sm14542265wrj.37.2020.07.17.03.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 03:51:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BE0E51FF8C; Fri, 17 Jul 2020 11:51:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/5] semihosting: defer connect_chardevs a little more to use serialx Date: Fri, 17 Jul 2020 11:51:36 +0100 Message-Id: <20200717105139.25293-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200717105139.25293-1-alex.bennee@linaro.org> References: <20200717105139.25293-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, 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. Signed-off-by: KONRAD Frederic Message-Id: <1592215252-26742-1-git-send-email-frederic.konrad@adacore.com> [AJB: tweak commit message] Signed-off-by: Alex Bennée --- softmmu/vl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson 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 Fri Jul 17 10:51:37 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: 235691 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1584474ilg; Fri, 17 Jul 2020 03:56:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWKYUKSUeJ3bvIWWzN0aJW76Z7rTe5Fo7XKaexuIdJyDD77lC1pzLNIMu9xmF8XVnIA/aU X-Received: by 2002:a25:ab0e:: with SMTP id u14mr13716596ybi.181.1594983363892; Fri, 17 Jul 2020 03:56:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594983363; cv=none; d=google.com; s=arc-20160816; b=LzcdcwPJ16YyJ+p9PdWPigeik5zyHAEF7gRn/5cZ+ETZ+KSDIXSwAc2eoJbMScnWKn khcXCU7w6qYCISatwyukKztgXAPrZmbho0lPqdyrHCom8aLrCY40yaTcoADCoUGIkzT9 BBTvpRmsnZsaBhdE1ufhJbtXiS2WbfsUJ8k+bcEBfv41CugVuX3TI0r91e4lWOgk+hZi Pg3aqIP3Q0aMwAR1lYuh9vkxhxMAwhDvlaTu7WEN1OAiDG3U1IGU3yozBwgMsS9sAsy1 c8XccgsbU3wjYbvSW/lMpX2Bkv7UlomXjAr/Y6JgcbKjYuClic0wF/erqA/JWTZG9lzb Qgog== 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=x6Qu/8ZzxFPQUproM48qagEF+BvBJ1cNZWgjUdSHRNw=; b=k4Qx270gs8RpYgu9XCizTjBkZHiCF0U4kO8KcjMLPL+whN8czpiSu7F63lyrfrMVXb +TVw+VNenLHE2uX8LIVIPDugiMhd9DqK/JhPJMWH/c5WbRM+zmiU+hbxbaJ3uoyiWLnY GUPvTv2oZI0/JOAxjzS1XnP5WhpYeUHWE9GJhJxU/5YASuU/vWhL+0MtBxbeoiM+qWpv 33x671wjvxqRLCSAxztBQLYqwHn5al2+Y5q93qdmD4kJLlk4A8SxyrwVgt2+oL6T7T0V 2JywkAq+OPXckXRF/1RszHmfideNHhcbQysGdIrquf3YWCzWdAN/2P1kinhjyiwVzGaD IbLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bys4P6c6; 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 z9si8130434ybk.153.2020.07.17.03.56.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Jul 2020 03:56: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=bys4P6c6; 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]:51656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwO27-0002bh-AG for patch@linaro.org; Fri, 17 Jul 2020 06:56:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwNy7-0004dF-0Z for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:51:55 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:35631) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jwNy4-0003s1-B0 for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:51:54 -0400 Received: by mail-wr1-x42a.google.com with SMTP id z2so10539504wrp.2 for ; Fri, 17 Jul 2020 03:51:47 -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=x6Qu/8ZzxFPQUproM48qagEF+BvBJ1cNZWgjUdSHRNw=; b=bys4P6c6EdCnXc8njtPUgz7H36Mcb+WZk0Y855tSXOjCTjQN0O41mWGtFzuFg0Oo3b LcCXfZLH5YGhXEtkphRRmiJVF+8I/6+2xfVAf5QVPM6sMQg4TMUx5wkglk7KPvsMGJer 7kCAoVWKJPRyr+Hw5g24Bd/24trj/f+N9g9rfkEKdvuXHxsj90Jy8SQ5eg6o5njMwzHT ygnpJ2ko7e3PWKLOtFygaQUETGdlNOQXN1r1vgkn6trOL9AuCrRM7nLc0VUUjrSW2Nsa RMh7AXpRJjTa7neHyqx290TUn1zUX6jot6oK5fmzmJO/8RFPPmRpeg76apLXF1372bKy Pumw== 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=x6Qu/8ZzxFPQUproM48qagEF+BvBJ1cNZWgjUdSHRNw=; b=XCgdOfd/MZPkf6MyBYAq8E6dxIz/UqHz8rJP0jPBwE53EIfcwONIacOpm9leN9vGm5 z9ZwUHUUMydaLggYg38nKdBvL6u4xZeCD45oiaXWkvN3OYbvgKduqMLelN5tl/lrYOvh 8O4mgUVSEOugkc8G1E6NebOpMDOTS+tIwncXVJsqeGBw/Lh4UVuCiIv/uTKyyTPO0BpQ cumGcZSf+/D3wEtxLF8dKODXo/IjKt2p+0EmL1X55vTCSu5SwtIAdc9Ky98NJ1fuRkEA psWZoaFN53mKXWxdnfBIkP+b4pepvlh75U+jNr8Rgm8F3prh5+qoR2ZiuZYrQY+awZFy gicQ== X-Gm-Message-State: AOAM531+sJdzKgXVjcPy3y6XyhdBvKsXAptcNejlteBUbuq+Z6bm2uEC aTs4Dk00BlDXfv2leX2Rb+iQug== X-Received: by 2002:adf:efcc:: with SMTP id i12mr9520799wrp.349.1594983106576; Fri, 17 Jul 2020 03:51:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g3sm15570518wrb.59.2020.07.17.03.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 03:51:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D4FE91FF8F; Fri, 17 Jul 2020 11:51:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 3/5] semihosting: don't send the trailing '\0' Date: Fri, 17 Jul 2020 11:51:37 +0100 Message-Id: <20200717105139.25293-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200717105139.25293-1-alex.bennee@linaro.org> References: <20200717105139.25293-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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é Message-Id: <1592215252-26742-2-git-send-email-frederic.konrad@adacore.com> --- hw/semihosting/console.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Richard Henderson 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 Fri Jul 17 10:51:38 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: 235690 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1583383ilg; Fri, 17 Jul 2020 03:54:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSvR2klq08kNW8cwEwOHr+mg34nNvO59Scc8vysc2XBeeL7M+lEn4X+3tmBxA+5rMczdbF X-Received: by 2002:a25:7e84:: with SMTP id z126mr12724001ybc.73.1594983252945; Fri, 17 Jul 2020 03:54:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594983252; cv=none; d=google.com; s=arc-20160816; b=b2AAWgMXtDD8dXFFjeXZLYmiQJQJ0hYO+rxvTSuH49poFC6x4eLwwtMVkkZ0B1cgHJ 72KupOn7hnRYxkGxiixjRUVE4QssLysRCmt+VIlRP2J5kKF/Nw7FIfY3mXIPsKFCwxrV Q2SfpiJ6+/xirl4SYB8lE3vsuplqxP5i/4XjeoggXxSgxe5X5QdbtLhgbO0hLgwB/VG9 tvUcAQirPOy39c7/mSJgsdz5k5Hn4dsEIGWSGMRO7rL3B5RwC5tNYIuOAAzpN5bhC6MT rMpfitdEuieOjAlwbOxeEude9S/0GxIaLHb4DQctb6LgJabVojxFM6fAsxWlxtTm5xb7 n7Fw== 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=n7oJYPppjNHv+Hb+2CTlnOn4o/FtAViKxPV8Et6uZ+E=; b=IAPu+eOfdebi766PSbvC4syHd+zPr7E01jJFsRJZaWvpPVvjYgZ1JjB/QeRfLG6PYu ihpi/MOVMaA5Kx8Ji6xrPum9n2ewigKQ0RavKdNPOEW1fza/zzQCD9O855PQyy1FOYwD vbJLQW9LzgdX2Jj3HURFINE19hvFUEhBKDfyOEsjhacqhQNNYJbeHQ0iNRTrtfzzDFc0 TzEk6SEGtR9ArzCjklpxXsYvMPthbkrVtxqKaky+YVxUeAtUps2OZ5B7eXofIohNzutO zjlInTPLu21yrdQu4ImqwT2q1FSit8qPCnYtJX9mdJ8YU+/UBfn1PJwPN4Jm3fBkHQDM fZOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=T48STVcB; 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 a13si8394393ybg.418.2020.07.17.03.54.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Jul 2020 03:54:12 -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=T48STVcB; 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]:42596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwO0K-0007Da-EL for patch@linaro.org; Fri, 17 Jul 2020 06:54:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwNy6-0004cU-7h for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:51:54 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:53429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jwNy4-0003ry-5o for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:51:53 -0400 Received: by mail-wm1-x343.google.com with SMTP id j18so14175404wmi.3 for ; Fri, 17 Jul 2020 03:51:48 -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=n7oJYPppjNHv+Hb+2CTlnOn4o/FtAViKxPV8Et6uZ+E=; b=T48STVcBAfjMmpoC0BBaizTYrf6BozevIBtRpuzIDspw/dQOPxQrXoLevWLI0QW4Ft adXOFRfNanG4cjwSMqESkI4IxusefDyJm0T1p8mY4KOYm0dXElmaMUpPrl7QqsdZ+I3D bvikUtKmBae+4IvJsmcEozhbf+S1+NNwrhO4r4jiHaYBpukbpAM7Fsus8thbhZOrq3hC SrA78EM3GBgYxM4WTs5iv5SsQIr3CCgWvAtKIRod86ky4BNp+MyMvSQZi4LHT67vaqNC 6wjmarLLTQPXgyXGHEEs5sZjYmeziPnkWyTHPCm+yJQPAEPFQcNIoTg1raR+CyrYSKBI A8rw== 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=n7oJYPppjNHv+Hb+2CTlnOn4o/FtAViKxPV8Et6uZ+E=; b=bhr5RgPu/Ia/uca9YeIviev3JX3RRsBQNFcrAcv38Kwabsb4V1M0KbB51z+eWdJq4d gmk3wE/XKrz2wRPt3j/7AsPrOQN51Hc34OaecsGK+b09k5ji5BTAabO9s7QtNH5LraOG 1/yz8xLwayeB0tL1ATKjxwNt14E3ZjVSmGZXryNbxv5l+VHLOflfINL6mshiIruTCyn9 vuE7PpASTUqVuuM4ZHykfq5RvZVIs5GqpjqS+jsBmT3OPs6TxvQ5a4VCgkitVBBnIxNm 0LEcCQuUAyluym+iFt3dj1QSOO+d3dAAa5PUC80GGPL0BjUuwoc8Kr6PL0BL8Yzjt4Uw gxZA== X-Gm-Message-State: AOAM5314O8TyaTgAcPLHDZl7tJ5haTxZVSwCHR1paWYRpDbHSl7TQX3d xfZZ1NO5T5MTPfmtzLDVOO4k4g== X-Received: by 2002:a1c:2e57:: with SMTP id u84mr9224980wmu.52.1594983105639; Fri, 17 Jul 2020 03:51:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j75sm15298926wrj.22.2020.07.17.03.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 03:51:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F06701FF90; Fri, 17 Jul 2020 11:51:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/5] util: add qemu_get_host_physmem utility function Date: Fri, 17 Jul 2020 11:51:38 +0100 Message-Id: <20200717105139.25293-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200717105139.25293-1-alex.bennee@linaro.org> References: <20200717105139.25293-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, 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 --- include/qemu/osdep.h | 10 ++++++++++ util/oslib-posix.c | 11 +++++++++++ util/oslib-win32.c | 6 ++++++ 3 files changed, 27 insertions(+) -- 2.20.1 diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 4841b5c6b5f..7ff209983e2 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -665,4 +665,14 @@ static inline void qemu_reset_optind(void) */ char *qemu_get_host_name(Error **errp); +/** + * qemu_get_host_physmem: + * + * Operating system agnostiv 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. + */ +size_t qemu_get_host_physmem(void); + #endif diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 36bf8593f8c..d9da782b896 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -839,3 +839,14 @@ 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) { + 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 Fri Jul 17 10:51:39 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: 235688 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1583162ilg; Fri, 17 Jul 2020 03:53:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+e5e8XmYhUJi6zM+FUjblGk/pob0Mx//M6xPxdj9Iz8L2EFpumYJTeFd/DiE0/Kz0awUb X-Received: by 2002:a25:3841:: with SMTP id f62mr13004712yba.64.1594983227645; Fri, 17 Jul 2020 03:53:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594983227; cv=none; d=google.com; s=arc-20160816; b=yq/3RJ9/a/omg6Ye+7VbwfJAxLBXCi5nRolhUOCDK53WNvRuyZWSp/+qkzDZRkLShf FMa1c2/cn+DlpJ2fWKADoI/EhNk+07nYCpkDYHu88qpkLkCLyoepJ6KZFW4vl7WaYPX2 e5yH+Y74xJkDKqQpy2JHYB6Gbia5d1ox3DgtJ00bLMUqNs6S00rUUqvRzmOt4c0AWc/u ENkQdLJtF8qHOG13UgEjW0idTAfUGwOW8d69VGGSLcOrc2uzhiT/h9kO3PxfsSFNzs8u UYEDUowROvPT8k1AS7ZNdDZlgFvsQLG7FL6lrIQhcQD8noyu5SK3BucCJrYXY3mFX68E exQQ== 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=KVJaVP/ZQ17vhjW05uiIXG4G85am9cMHX0FIzvUa6Gc=; b=axAUJJYkQYprhGabnchCo3bWz1RpcNn8T57qUSBXWg4UosudPkpQEuCVACyRA2OmRL 3pVDWAogy6pQgRgch7e6taFs+tWeXKf2YPqpcJ7kXGMzIKwujLAVOj5AMvEZcgMuFntF 6k1XGbqTZsSfhYM8q2spCeKjTHHfMUFr31J3E97AUVKkO446tT01Xe960uLqKYQsNX8A PLpELOlWIqLj5iBtd/SnTbVVJPag2HFR5oLkEzwBJYtelAF0G0RccqFxiBfkl2+c3rks up4EgRo3EqjZm3VgZV45PRUSw5xRUv9YMl6JskqCwfxfCQpn7D0ZRAYhyNHmc43CuDdH MrGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TIsgKk+7; 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 y74si7844468ybe.433.2020.07.17.03.53.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Jul 2020 03:53:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TIsgKk+7; 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]:42584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwNzv-0007DP-2X for patch@linaro.org; Fri, 17 Jul 2020 06:53:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwNy6-0004ct-OZ for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:51:54 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jwNy3-0003sB-BS for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:51:54 -0400 Received: by mail-wr1-x442.google.com with SMTP id z2so10539549wrp.2 for ; Fri, 17 Jul 2020 03:51:48 -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=KVJaVP/ZQ17vhjW05uiIXG4G85am9cMHX0FIzvUa6Gc=; b=TIsgKk+7hM/o3q1rcPINasp0D3y3YY7fmPqK+eUpDIjnY8yEsLNi6ZHjTVaScsxRab gSBtqT5xLA/2ClouJBexXk9NnHrmYBFCaxX6uCmkuCtSrNN9KFn7OY8X18/GnL6DxviQ mGXYxL1+URFB45O5Uwy/IBK0LGoGjGWcfZzu7P7Dl1Y0f2M+qyZvSwnj4mRsYi5ntk2U sUdOq4m8oAbYtvuYB3T6vDvh5KVR4PR6LtWYHA1RKmevmlx3h4KP7eFMfKUKReRUh/OX brnfUUVD6k/IJKidftnVoc93zDoxWB2alwQInixtDBJthDlz4xUW7LgpGrtk3AmBgyXM azew== 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=KVJaVP/ZQ17vhjW05uiIXG4G85am9cMHX0FIzvUa6Gc=; b=TORdoFQVLJRPc++k6hbrs7pEon/XbQ7VS50hfGkMnos8qjv5YlUozFVMBLeXlZw8Qf pjfwnaXxAp0hJsXyRdQcTunux1swUuV7hmc5H1RDNQHQu8awAH3VYZlnxGpwiDkfasj7 j2djw0nU6/fH41f0gqvqzLH602j57exTKXaq+vyOd5h5YEBg1HqcxSyI4VPjMtFwtHEK YIZByfS8OR99KptUs3OMyF7DbV/+qPzpNHUg2LZs5MavAWaFpBLQq1D5sWt1AxbJ7COT +Xoedyj2mZgiGkyjhFDrptBEOLujvmo6hJYmeaVrGbY9hnCvYj9F8Fk+fOVjzSs0vBDW YMpg== X-Gm-Message-State: AOAM53268o031PSWuYv/WeUAdqIeVqJMubP4av8BCoXhZSjO6JMHRhq2 zYaFw58DlH73LwAYmgI/UTKWgA== X-Received: by 2002:adf:f504:: with SMTP id q4mr9479420wro.163.1594983107713; Fri, 17 Jul 2020 03:51:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z16sm13486743wrr.35.2020.07.17.03.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 03:51:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 121B31FF91; Fri, 17 Jul 2020 11:51:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 5/5] accel/tcg: better handle memory constrained systems Date: Fri, 17 Jul 2020 11:51:39 +0100 Message-Id: <20200717105139.25293-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200717105139.25293-1-alex.bennee@linaro.org> References: <20200717105139.25293-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, =?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 --- accel/tcg/translate-all.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 2afa46bd2b1..2ff0ba6d19b 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 / 4; + } else { + tb_size = DEFAULT_CODE_GEN_BUFFER_SIZE; + } } if (tb_size < MIN_CODE_GEN_BUFFER_SIZE) { tb_size = MIN_CODE_GEN_BUFFER_SIZE;