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: 1331055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=NIXZ17l6; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B7Scn5NRTz9sRN for ; Fri, 17 Jul 2020 20:52:25 +1000 (AEST) Received: from localhost ([::1]:36366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwNyZ-0004dU-20 for incoming@patchwork.ozlabs.org; Fri, 17 Jul 2020 06:52:23 -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-Google-Smtp-Source: ABdhPJzJekrXgd8UkGDZidqSD+I/3umaYrZkM0HxRuVVJ/2Qf7kkrLfeTDsRVb7D+OnI2zOwsVOZhA== 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_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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é --- .shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: 1331054 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=D71HrpPV; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B7Scl51xXz9sTC for ; Fri, 17 Jul 2020 20:52:23 +1000 (AEST) Received: from localhost ([::1]:36358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwNyX-0004dH-Em for incoming@patchwork.ozlabs.org; Fri, 17 Jul 2020 06:52:21 -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-Google-Smtp-Source: ABdhPJz7dL6fTElluDQ3aZyYE0DjPygeznw2ul6bEAPaRr6p5mJeDP6XIl+K5xwOcZgtzFy07k0IeA== 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+incoming=patchwork.ozlabs.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 Reviewed-by: Richard Henderson --- softmmu/vl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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: 1331060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=bys4P6c6; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B7Shn58ssz9sRW for ; Fri, 17 Jul 2020 20:55:53 +1000 (AEST) Received: from localhost ([::1]:51656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwO1v-0002bh-D6 for incoming@patchwork.ozlabs.org; Fri, 17 Jul 2020 06:55:51 -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-Google-Smtp-Source: ABdhPJw/yUg68Gw0SgqvHgZ+Y1Pb5+AS8wB1I5oPLmtzekrfL9+TJ9aFH9abanY8n/AK1xWJjV8MOA== 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_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , KONRAD Frederic , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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> Reviewed-by: Richard Henderson --- hw/semihosting/console.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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: 1331057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=T48STVcB; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B7Sff6HbYz9sRN for ; Fri, 17 Jul 2020 20:54:02 +1000 (AEST) Received: from localhost ([::1]:42596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwO08-0007Da-Jo for incoming@patchwork.ozlabs.org; Fri, 17 Jul 2020 06:54:00 -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-Google-Smtp-Source: ABdhPJxBD+XYa+aWamzNymFw2wA9vK/E6L++kYOwkecxL8AmW5JpUFzFXHZPd5xDww1yC38ckeQM3g== 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+incoming=patchwork.ozlabs.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(+) 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: 1331056 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=TIsgKk+7; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B7Sff0GTpz9sRN for ; Fri, 17 Jul 2020 20:54:02 +1000 (AEST) Received: from localhost ([::1]:42584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwO07-0007DP-NV for incoming@patchwork.ozlabs.org; Fri, 17 Jul 2020 06:53:59 -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-Google-Smtp-Source: ABdhPJwzBflR/rTnGfoL9M2+KTqfN9wYlFd/SsM6RgDTvjAqKdYh+NRhzl3o22Fnmdp2M+TT9ZyJPw== 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+incoming=patchwork.ozlabs.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(-) 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;