From patchwork Fri Jan 26 14:33:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 766345 Delivered-To: patch@linaro.org Received: by 2002:adf:a314:0:b0:337:62d3:c6d5 with SMTP id c20csp266688wrb; Fri, 26 Jan 2024 06:34:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IHskFCF5/SsSsGPRdNPg4wgq4HsVQlcwnvc+PAteKc5Dfn+mPAB7oz/W5HSwypkbx8BiM3T X-Received: by 2002:a05:620a:1448:b0:783:c881:679f with SMTP id i8-20020a05620a144800b00783c881679fmr1474984qkl.52.1706279695101; Fri, 26 Jan 2024 06:34:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706279695; cv=none; d=google.com; s=arc-20160816; b=BMAbQzQwQ35MKSxhgrQ9D6+NGSjlUyKu327Bc31nCvzqCQCUReotI+h4mq3FUbq0at uWUAiFOIZ3OrrHKg7/ekwXIiPhHn/KkwTgWN8RzDNqdFAWacz+XsJGgveWX+MU7yTKfg BK/ezH2SR4/m5dtF90fr/8sh7S0/JNvj9PPWcGovHBtfk8UKO0RlMlbAtPpMHOUsspoM 9AE6w+6nUTpFRx8yVNJg0UzKDfEUNF4F3zdUgeziU3qOlbKzKWZi2UvUOHukql4JDS+r 0jGvTTCLeHVTvpHIz2kTn7DWqJP0BlyRPeatE28EOXQa5xqzuwb22A4EReRdrkrAXWYP Cdww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=M6SHCWbrZ+mqpOFqOLQgsC9xtK67Vc6rtoI9yN+xnY0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=FxPQ4z1GHMNxKNnwUCiYPDzYskwZimZhIAaS3DCt0IaNxSBaBFIZq9Xeq59uv6ppGr /+ye44DLtRH+SQ7EJ8a6CE09i4TfuOUq7cw4/E2G3SJFhSC6Z3EuBPqvJElpoHgDJSDs BV9tpiTN1FDAV/cbsRg5J9n0QC2VUVRAar1SDQzplskxAivNfM6qtdbLa9NKA+ehiR8s 4Y67GciwGlqfG717vvujMSllAeAGopjAmf80YKFh8HfK4lFrqd0aodPG2nwZ6+o2F7jU JQqdNSx2Ri2+P3Q51zoSu7LlBFFetTCmnixbIs5mT4iSs393Gi0V5qGGm0EJM3ktWYWz bL0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HRR83KHa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k13-20020a05620a0b8d00b00783cbc0d9dcsi1358724qkh.83.2024.01.26.06.34.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jan 2024 06:34:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HRR83KHa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTNHB-0002EM-N4; Fri, 26 Jan 2024 09:33:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTNH9-0002CF-Jc for qemu-devel@nongnu.org; Fri, 26 Jan 2024 09:33:47 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rTNH7-0007rY-ET for qemu-devel@nongnu.org; Fri, 26 Jan 2024 09:33:47 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-337d99f9cdfso590952f8f.0 for ; Fri, 26 Jan 2024 06:33:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706279624; x=1706884424; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=M6SHCWbrZ+mqpOFqOLQgsC9xtK67Vc6rtoI9yN+xnY0=; b=HRR83KHaiqPLmY9SCDjp0Jzs/DRAuoWS9eD/c286vUxHyB8ggw09K4diaQHzrml1sv ljdiiVk7jdt4EwsC4spiUNAl4kLmUJ+BE6j0WN/zMA31fPsgfzwKVkgVepai6rXdU56c mMQUoIIq89Mxu+jzelGiQSduzEEZ9M4o1ImoP0ozXUT8gVTkwA/bjZWJkOcO+nwl5ne1 6V739ZmC0zPhKo6Aq17BXFZww+CfpM3FBGuXZkANy1bxqMBMqGr2Wwar4zSRKZeCEOmv IfiBQtTCHPdxbEDcQ/W13luyOyUjI14A2IQR/HUkg9u6EDaFXJzjrkJL7VEXniZ17HmO zKGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706279624; x=1706884424; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M6SHCWbrZ+mqpOFqOLQgsC9xtK67Vc6rtoI9yN+xnY0=; b=TOg2+5NvHOSXcnAc4vQNtChRBFQ3Uu9rylsg89kKiI56xj4Ch3E01NW6g/43gZHD/D SBWo3D3jj4SOAP8ufH4muxAu8rJXmt+3kwvVLnBK1LaFMOAZPWVVRVWUi//Ab4Dh5XPi qdGl6pxFPFRh2EHo8a+9JYaYrYMe4YJP56spNYDBr5FX258bRUKfJJ0nBrnWKRHsea1p gI95RD6T2g+/w6ZAVwjmqg89m5V3YlhI1yJsG2AX/+xg5kRgsjOVepbIdPPLpeyHutJI u1//1MJQjxbmY19GocRpOC0bxmJDQ3XyghslpzwlY9PQb9j0eIyER7H0++0JmwfJShLJ t3Hw== X-Gm-Message-State: AOJu0Yz6rcpPZZIg6qdOEX7kAl0m8xTOGyg2Jm1PI02x2u9Kig4yKQBc igRrKJ2mqTYn9AmKko9FwMGFlE61ubXZ0O00GzO/Pr6Bu7CtwWIj2N6d5+bAoaY2D0v/hVJvEQE N X-Received: by 2002:a5d:518e:0:b0:336:6ed3:2ead with SMTP id k14-20020a5d518e000000b003366ed32eadmr505348wrv.17.1706279623777; Fri, 26 Jan 2024 06:33:43 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a5d4845000000b00337f722e5ccsm1396207wrs.65.2024.01.26.06.33.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 06:33:43 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/36] hw/arm/virt.c: Remove newline from error_report() string Date: Fri, 26 Jan 2024 14:33:08 +0000 Message-Id: <20240126143341.2101237-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240126143341.2101237-1-peter.maydell@linaro.org> References: <20240126143341.2101237-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org error_report() strings should not include trailing newlines; remove the newline from the error we print when devices won't fit into the address space of the CPU. This commit also fixes the accidental hardcoded tabs that were in this line, since we have to touch the line anyway. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-id: 20240118131649.2726375-1-peter.maydell@linaro.org --- hw/arm/virt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 5cbc69dff83..ed4ed9f4142 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1771,8 +1771,8 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits) /* Base address of the high IO region */ memtop = base = device_memory_base + ROUND_UP(device_memory_size, GiB); if (memtop > BIT_ULL(pa_bits)) { - error_report("Addressing limited to %d bits, but memory exceeds it by %llu bytes\n", - pa_bits, memtop - BIT_ULL(pa_bits)); + error_report("Addressing limited to %d bits, but memory exceeds it by %llu bytes", + pa_bits, memtop - BIT_ULL(pa_bits)); exit(EXIT_FAILURE); } if (base < device_memory_base) {