From patchwork Fri Mar 25 14:57:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 554036 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp5527827mag; Fri, 25 Mar 2022 08:02:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQGWtSm7WC64IjJCkbnnN6K3FD2D4fIiNnHsLMsgImA+QB8skLKkwi5Oz89QB/MctzD0hZ X-Received: by 2002:a05:6102:3a64:b0:320:91a3:f093 with SMTP id bf4-20020a0561023a6400b0032091a3f093mr4973901vsb.58.1648220542618; Fri, 25 Mar 2022 08:02:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648220542; cv=none; d=google.com; s=arc-20160816; b=ntg2ERdPE3pPyRwLOTzBJipD3OuvzEh7Jh+3DRtQL7h9CAyLrK8Fs3yTJ5yjAs77kT TVKEKfhNt3joyNGXhHrHO0Map+ftc+tU5vkuazdWrYJxjzChDRmxDQBeYoJJJnHTNBSE 4r/vaIaGqS6xaUCWYZI8xuv7WRbEfm5bHNd3SwawkKIQ56gEJ9ZPv4v5z6H/EW9w8Xvp suBsU0JacicmMpWUEwJKZrA2jWhtuHvOhaJC2kzQOGd5Q2BfjEHfrrUOuOsfPzGvhLjB hmCHRoMSKAi8M7w+n0nHWQOh6AwRIC8vvGx1bd1dBLkqZfYOvfsAAicO8a7dZ0oy51Av a1PA== 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=4MlN/pySNODv55bFqFVfLg38b7ly0tYbAzl8thuVo7U=; b=jBCLsvv/vYcgRfcCLNmxIwlyq7pcxRWzFavDPlOO7ggVSL3gx+JTdlnxzicinabGpq 3Bbtnb7VvYl2aiXnOkifsW3IQ20B7F1IoGuuKKv9fl7gXEZEEOJmJcEPm7azQOM5bK9W LCcUp4M4adx21IkY01EoPSE37pUN8TeXNSp6ZDvfChCYLWY1z0d7R3gB1tHg8KEayttO cWGt5AmGNTEbR12RzWNXESL/a2cXbanF6391MgXBw7d2eWUixekaFKx/sGn7131/JpEz CJMKO1RsQcH/mtjVbIbahkv3G9UM5+hbBdRqBbK+YKiX0TBasZ+WChVxlkZyr+fJdy4o kOsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mUbMwdrE; 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 h1-20020a67b701000000b00324c5c3be4esi343806vsf.144.2022.03.25.08.02.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Mar 2022 08:02: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=pass header.i=@linaro.org header.s=google header.b=mUbMwdrE; 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]:49846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXlSI-0000y5-56 for patch@linaro.org; Fri, 25 Mar 2022 11:02:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXlNc-0004tc-HF for qemu-devel@nongnu.org; Fri, 25 Mar 2022 10:57:32 -0400 Received: from [2a00:1450:4864:20::32f] (port=44597 helo=mail-wm1-x32f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXlNb-0004DW-3r for qemu-devel@nongnu.org; Fri, 25 Mar 2022 10:57:32 -0400 Received: by mail-wm1-x32f.google.com with SMTP id bg31-20020a05600c3c9f00b00381590dbb33so4548392wmb.3 for ; Fri, 25 Mar 2022 07:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=4MlN/pySNODv55bFqFVfLg38b7ly0tYbAzl8thuVo7U=; b=mUbMwdrEqErii+hjQPzmiOjB5JYSQHIpv5KF4PniNEyWteBcKnmn98erfsKBuWpoOw 5p6qgiRD55W7p3W7w9hLTGud+EuvyhqUDVMV2u34O5bVIgi5Mp8yXazohkfr9Bcxn0hW pMajTO8HmV20WZFRmYL/neLgI+IAZVGtSg3p/4IRNndYoW6g+8oR7+S8zfwPbkHoqhGt wT+NK9mAnGWnrLfF545XzCO1TPYBJr7dfWt+em+NBP9SyliS1alorLrWFDYu72kjLFGc Hg4ldGVe4tcPtcsw3+PWuca2Ish+bhQgFj3mZ4FmruEpVxY7Il9utOXi9g/emiU13NqU InmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4MlN/pySNODv55bFqFVfLg38b7ly0tYbAzl8thuVo7U=; b=meXTf+xiqEXJmFVTRxlpCG4kris5q2VKddYsbmRmXhX8BEX2pKRrL7pRjpBadTS4eV unhFHlFTovhbKyehhxfaAzYOnq1H4Pq4bCHpIgDPv6PWVTcUERKE6OdgP11Zcajxh/9Q 9eWXbLx/NJq8GtFqFaNzQY+tnVpGSE2JyvtrmQhjzTeKwf9ouenqbPLqW8UxxgIF69Gg iC3UzvqyiW0dbfr2qzg0u1YIN4KqmPHsHSma7QeuEooK7Usk20HksBUwdjlag1jAIlGc 3OVsFb9Tyqi/SzKlSkDww7R0aIPSyRMZ3/VMvuZfErkHvGWb0TTz/5GR6vll4rlp/wN3 8jnA== X-Gm-Message-State: AOAM531sqKiZn8YdaoRp6K3kgYT0MZ7QCnXtrHO69s7ybJkkytabQ2AF P0WzqQUE9HcwjDaKq6ciqK8noeTF4qpjTA== X-Received: by 2002:a7b:c2aa:0:b0:389:891f:1fd1 with SMTP id c10-20020a7bc2aa000000b00389891f1fd1mr19626594wmk.138.1648220249687; Fri, 25 Mar 2022 07:57:29 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id c7-20020a5d4f07000000b00203db8f13c6sm5200583wru.75.2022.03.25.07.57.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 07:57:28 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 2/2] hw/intc/arm_gicv3_its: Add missing newlines to process_mapc() logging Date: Fri, 25 Mar 2022 14:57:25 +0000 Message-Id: <20220325145725.3891659-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325145725.3891659-1-peter.maydell@linaro.org> References: <20220325145725.3891659-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32f (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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" In commit 84d43d2e82da we rearranged the logging of errors in process_mapc(), and inadvertently dropped the trailing newlines from the log messages. Restore them. The same commit also attempted to switch the ICID printing to hex (which is how we print ICIDs elsewhere) but only did half the job, adding the 0x prefix but leaving the format string at %d; correct to %x. Fixes: 84d43d2e82da ("hw/intc/arm_gicv3_its: In MAPC with V=0, don't check rdbase field") Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- hw/intc/arm_gicv3_its.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index b96b874afdf..87466732139 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -524,12 +524,12 @@ static ItsCmdResult process_mapc(GICv3ITSState *s, const uint64_t *cmdpkt) trace_gicv3_its_cmd_mapc(icid, cte.rdbase, cte.valid); if (icid >= s->ct.num_entries) { - qemu_log_mask(LOG_GUEST_ERROR, "ITS MAPC: invalid ICID 0x%d", icid); + qemu_log_mask(LOG_GUEST_ERROR, "ITS MAPC: invalid ICID 0x%x\n", icid); return CMD_CONTINUE; } if (cte.valid && cte.rdbase >= s->gicv3->num_cpu) { qemu_log_mask(LOG_GUEST_ERROR, - "ITS MAPC: invalid RDBASE %u ", cte.rdbase); + "ITS MAPC: invalid RDBASE %u\n", cte.rdbase); return CMD_CONTINUE; }