From nobody Wed Nov 27 08:47:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1700032649; cv=none; d=zohomail.com; s=zohoarc; b=Kp9RwsdWOtulC6Someef+Tta+E5iEdXNZzfuX+ptJj7owrjBO5YwWTwiB35IFFHCdSBR43VjIZbFV1qrIoMo9OW6s1ZkxZf8F/THO/+4SPHNrkvCB7kinPq4tDyGXU6hAce5qP1l39lAddLOaQ2SUmQGPe/JuOQ6KDOrU1DLJnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700032649; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=r8/ePtnDpAOq3w7or72AqwStosQsoNIs5vPiriK26uI=; b=CfrDbJvYjweTs1TQ+IhS2ykyzRvYG4dCQhepJ2oOcaMGHJLMJWXIZ/6vEOm/wemLeVuxZuKgEmFx4i7n3RbmlS7dR9tHIhWSLRcxzffxbePWR3rBC69C7gj7CzCKvISRKvkRxha+mwgPsdsBMRRV5FqKJD6HyA4hJ4AZ5RT5D/g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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 1700032649104213.16859374833325; Tue, 14 Nov 2023 23:17:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3A9C-00070g-EF; Wed, 15 Nov 2023 02:17:18 -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 1r3A8Z-00060s-Mv for qemu-devel@nongnu.org; Wed, 15 Nov 2023 02:16:40 -0500 Received: from mgamail.intel.com ([192.55.52.115]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3A8X-0002Gw-7w for qemu-devel@nongnu.org; Wed, 15 Nov 2023 02:16:35 -0500 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 23:16:31 -0800 Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52]) by orsmga003.jf.intel.com with ESMTP; 14 Nov 2023 23:16:23 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700032593; x=1731568593; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6duWlmGjrYjaSy+uawy4hL3f6xwtFIDwK1CCT0SHZFw=; b=OOn/tTCQ0QgJBEGisBMeqSXy0AvrHqb2yu08QnithWrrI4Y1PNYJie/2 xzEg0F8GTaiPqKe0YY7jNuCO2bV9mEGBtSg5i6/hWkYuKQSsBbWvVipKy vGwozgZ5CwW8ZPa4B5UXKc7f+mSg7EJ4zkX//nN7KWWXCP/J5yG6l/r3b DrcrmacDmPkMPCMhkR5dV/7wiCgBBobdepBvCAbCVV1W/sWZcaNS0c+yA Sws4P+8UheNJBu60UlZjD7+XaK2i2q+ViwXLFQQmz81adw82w6me2hkwx D1SECAcIMzQ0ulIUIdfRnmZ2Lmj9h5g868xCcTUZU47xUwzM2Uqpfm5xd w==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="390622221" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="390622221" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="714797093" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="714797093" From: Xiaoyao Li To: Paolo Bonzini , David Hildenbrand , Igor Mammedov , "Michael S . Tsirkin" , Marcel Apfelbaum , Richard Henderson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eric Blake , Markus Armbruster , Marcelo Tosatti Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, xiaoyao.li@intel.com, Michael Roth , Sean Christopherson , Claudio Fontana , Gerd Hoffmann , Isaku Yamahata , Chenyi Qiang Subject: [PATCH v3 08/70] physmem: replace function name with __func__ in ram_block_discard_range() Date: Wed, 15 Nov 2023 02:14:17 -0500 Message-Id: <20231115071519.2864957-9-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115071519.2864957-1-xiaoyao.li@intel.com> References: <20231115071519.2864957-1-xiaoyao.li@intel.com> 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=192.55.52.115; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.999, HK_RANDOM_FROM=0.999, RCVD_IN_DNSWL_MED=-2.3, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1700032650835100015 Content-Type: text/plain; charset="utf-8" Use __func__ to avoid hard-coded function name. Signed-off-by: Xiaoyao Li Reviewed-by: David Hildenbrand --- system/physmem.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/system/physmem.c b/system/physmem.c index 8a4e42c7cf60..ddfecddefcd6 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3533,16 +3533,15 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t = start, size_t length) uint8_t *host_startaddr =3D rb->host + start; =20 if (!QEMU_PTR_IS_ALIGNED(host_startaddr, qemu_host_page_size)) { - error_report("ram_block_discard_range: Unaligned start address: %p= ", - host_startaddr); + error_report("%s: Unaligned start address: %p", + __func__, host_startaddr); goto err; } =20 if ((start + length) <=3D rb->max_length) { bool need_madvise, need_fallocate; if (!QEMU_IS_ALIGNED(length, rb->page_size)) { - error_report("ram_block_discard_range: Unaligned length: %zx", - length); + error_report("%s: Unaligned length: %zx", __func__, length); goto err; } =20 @@ -3566,8 +3565,8 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t st= art, size_t length) * proper error message. */ if (rb->flags & RAM_READONLY_FD) { - error_report("ram_block_discard_range: Discarding RAM" - " with readonly files is not supported"); + error_report("%s: Discarding RAM with readonly files is no= t" + " supported", __func__); goto err; =20 } @@ -3582,27 +3581,26 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t = start, size_t length) * file. */ if (!qemu_ram_is_shared(rb)) { - warn_report_once("ram_block_discard_range: Discarding RAM" + warn_report_once("%s: Discarding RAM" " in private file mappings is possibly" " dangerous, because it will modify the" " underlying file and will affect other" - " users of the file"); + " users of the file", __func__); } =20 ret =3D fallocate(rb->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEE= P_SIZE, start, length); if (ret) { ret =3D -errno; - error_report("ram_block_discard_range: Failed to fallocate= " - "%s:%" PRIx64 " +%zx (%d)", - rb->idstr, start, length, ret); + error_report("%s: Failed to fallocate %s:%" PRIx64 " +%zx = (%d)", + __func__, rb->idstr, start, length, ret); goto err; } #else ret =3D -ENOSYS; - error_report("ram_block_discard_range: fallocate not available= /file" + error_report("%s: fallocate not available/file" "%s:%" PRIx64 " +%zx (%d)", - rb->idstr, start, length, ret); + __func__, rb->idstr, start, length, ret); goto err; #endif } @@ -3620,25 +3618,23 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t = start, size_t length) } if (ret) { ret =3D -errno; - error_report("ram_block_discard_range: Failed to discard r= ange " + error_report("%s: Failed to discard range " "%s:%" PRIx64 " +%zx (%d)", - rb->idstr, start, length, ret); + __func__, rb->idstr, start, length, ret); goto err; } #else ret =3D -ENOSYS; - error_report("ram_block_discard_range: MADVISE not available" - "%s:%" PRIx64 " +%zx (%d)", - rb->idstr, start, length, ret); + error_report("%s: MADVISE not available %s:%" PRIx64 " +%zx (%= d)", + __func__, rb->idstr, start, length, ret); goto err; #endif } trace_ram_block_discard_range(rb->idstr, host_startaddr, length, need_madvise, need_fallocate, ret); } else { - error_report("ram_block_discard_range: Overrun block '%s' (%" PRIu= 64 - "/%zx/" RAM_ADDR_FMT")", - rb->idstr, start, length, rb->max_length); + error_report("%s: Overrun block '%s' (%" PRIu64 "/%zx/" RAM_ADDR_F= MT")", + __func__, rb->idstr, start, length, rb->max_length); } =20 err: --=20 2.34.1