From nobody Wed Feb 11 04:36:30 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1691426315; cv=none; d=zohomail.com; s=zohoarc; b=m+Du8djq5+/taR9zTF0Fq9yhttKyF81iwWdWtk3KCvvB5mFCi3KLcaTPfrLlWPoQ6gGFz0EYPo5GqPWsDCXy/Qcn60v2AV4IzZdf1U8vFRcGmXLYHdKwulh6kh1JK4kx1qekmKQsQ0c0xJ5mkjdYumHiqm+ubn6XiIJjUvGmwbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691426315; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LDhuT++xsqj01ETEWaKWE9ZYg7Hhe6sUk2NPXqCd0Zs=; b=Tu0gCpK/A02XHp6VcxGK3DstgCJHg7P80wAfJNQbAY/oqfT5Mu9LIzzAFID9LNxfno3ohnKcXIaYbqQL1rfyZiG5RlVRUri5QWTzaVkZl42gRcGnOqG6808q6LupzaGWACyStpcziOGday3fCx9zTcbhYLNqpJ7M2tRbRg6E1mQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1691426315606494.7459864355641; Mon, 7 Aug 2023 09:38:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qT3EV-0007JI-SX; Mon, 07 Aug 2023 12:37:27 -0400 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 1qT3EN-00076H-El for qemu-devel@nongnu.org; Mon, 07 Aug 2023 12:37:22 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qT3EL-0002i8-Sj for qemu-devel@nongnu.org; Mon, 07 Aug 2023 12:37:19 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1b9c5e07c1bso42277755ad.2 for ; Mon, 07 Aug 2023 09:37:17 -0700 (PDT) Received: from stoup.. ([2602:47:d490:6901:e306:567a:e0a1:341]) by smtp.gmail.com with ESMTPSA id l6-20020a170902d34600b001b9df8f14d7sm7119837plk.267.2023.08.07.09.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 09:37:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691426236; x=1692031036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LDhuT++xsqj01ETEWaKWE9ZYg7Hhe6sUk2NPXqCd0Zs=; b=n5zy/PhrTWy23L1oOIUnWS3oJprsmY065QGpA6tsdpW52JiRhhFYVFMZjyjUGt3qYY dvT4rvHyGK4zf7n5CLupovHy4sXDiLhepcpla6/cG5NsClwbHT1bYgzQGjSK4gedw8a4 ueYvOG2XpIEZmehlu47t7pDkwiLeaJxLhGMnrY9fKN1C3K/UsDsBnWhVITz0oJeMZhrM uSX8RGODefpcG73TowuV83wnZ7t5y9qLriWuiPnR58Njg1VwJmTEfNbHN5cDMx1cP8OS mDY07idypRUIqK6ogu2OtRbhEq5H3Lu1L5PuvMO1nzf4Ls/PI0ixsbuIzCJVpA+oaOAI XHMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691426236; x=1692031036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LDhuT++xsqj01ETEWaKWE9ZYg7Hhe6sUk2NPXqCd0Zs=; b=bBFsjioUinWt5MUPQdaDX3tzBJd1xA+zzq7Nv7aCexPrC+P6L1tbmZ2faNLCHAVwXb Nr5tAauPTY7W+2oDtLqQs5t4Hv/TYCc45l8GEUNnDOJofI6ZZ+83CXhd/bvhkOvJEFLL rbFz9JqxkCBlKqlqSeu3vRTmp4Uwj6oc7wODHy1BteQ1fM1o3wzj6kGccTAetd4tmoiR oFwt4rqAehpEDr26k2uVBMlLxQLALoC21oGLVlu2aVBStE+XWJWx+b/tBeumCZ1M70+B oBbd7hjeKHAEZfC3/RmtnHzCBVj6ZJDG8QxEDdWVEov2GjIbyehO5CWM1vJyEtJSdhAI w30A== X-Gm-Message-State: AOJu0YyNiaEoeL5QC9ST2YpmaOO1OswXr2QB65p6O+2gQU7IBd6iaMak 0hq7OfCpUVuL3HWdk0ubWWWq/5pbFA8w6nE5XKU= X-Google-Smtp-Source: AGHT+IE8oOogRSkCK3NkJEnZlvw5H/UH4+A+pk/QD11PDJ03AeOOc6usZboIVur0jDVWUD3flYWoqQ== X-Received: by 2002:a17:902:6bc9:b0:1bb:ed01:2d03 with SMTP id m9-20020a1709026bc900b001bbed012d03mr9511445plt.50.1691426236511; Mon, 07 Aug 2023 09:37:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, philmd@linaro.org, laurent@vivier.eu, deller@gmx.de Subject: [PATCH for-8.1 v10 11/14] linux-user: Remove duplicate CPU_LOG_PAGE from probe_guest_base Date: Mon, 7 Aug 2023 09:37:02 -0700 Message-Id: <20230807163705.9848-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230807163705.9848-1-richard.henderson@linaro.org> References: <20230807163705.9848-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1691426316840100001 Content-Type: text/plain; charset="utf-8" The proper logging for probe_guest_base is in the main function. There is no need to duplicate that in the subroutines. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- linux-user/elfload.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index f497286abe..400af4a4c0 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2562,9 +2562,6 @@ static void pgb_have_guest_base(const char *image_nam= e, abi_ulong guest_loaddr, if (test !=3D addr) { pgb_fail_in_use(image_name); } - qemu_log_mask(CPU_LOG_PAGE, - "%s: base @ %p for %" PRIu64 " bytes\n", - __func__, addr, (uint64_t)guest_hiaddr - guest_loaddr + = 1); } =20 /** @@ -2607,9 +2604,6 @@ static uintptr_t pgd_find_hole_fallback(uintptr_t gue= st_size, uintptr_t brk, if (mmap_start !=3D MAP_FAILED) { munmap(mmap_start, guest_size); if (mmap_start =3D=3D (void *) align_start) { - qemu_log_mask(CPU_LOG_PAGE, - "%s: base @ %p for %" PRIdPTR" bytes\n", - __func__, mmap_start + offset, guest_siz= e); return (uintptr_t) mmap_start + offset; } } @@ -2691,13 +2685,6 @@ static uintptr_t pgb_find_hole(uintptr_t guest_loadd= r, uintptr_t guest_size, } } free_self_maps(maps); - - if (ret !=3D -1) { - qemu_log_mask(CPU_LOG_PAGE, "%s: base @ %" PRIxPTR - " for %" PRIuPTR " bytes\n", - __func__, ret, guest_size); - } - return ret; } =20 @@ -2749,9 +2736,6 @@ static void pgb_static(const char *image_name, abi_ul= ong orig_loaddr, } =20 guest_base =3D addr; - - qemu_log_mask(CPU_LOG_PAGE, "%s: base @ %"PRIxPTR" for %" PRIuPTR" byt= es\n", - __func__, addr, hiaddr - loaddr); } =20 static void pgb_dynamic(const char *image_name, long align) @@ -2809,9 +2793,6 @@ static void pgb_reserved_va(const char *image_name, a= bi_ulong guest_loaddr, reserved_va + 1, test, strerror(errno)); exit(EXIT_FAILURE); } - - qemu_log_mask(CPU_LOG_PAGE, "%s: base @ %p for %lu bytes\n", - __func__, addr, reserved_va + 1); } =20 void probe_guest_base(const char *image_name, abi_ulong guest_loaddr, --=20 2.34.1