From nobody Fri Nov 14 23:31:37 2025 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=1759160828; cv=none; d=zohomail.com; s=zohoarc; b=WX+yn1JioSKgd1qNZWc13XtgRK6dx7m8szVMXVo9c52aSdigXs3BB+23XgRnovucEAhzkHsUY0CxRAc1fhKZSbR/b678QGryE8hcEEC1skMgiIueJXxjjxzyJasPJNpAD/OQfabraLdh5z7dUejrJ3oCnoFY26CgfNBdO0qZKOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759160828; h=Content-Type: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=5duVBAedShsIcSkwo/CkemVnUoYuZ0b5Z9+Uw86N4Pg=; b=nSJD9ycGayKGZtYmEYw4LQ+AgZt9GnSZJh+E08MpLpx43Guxv9X5yqazlqHRNae6UjyR0Ial1WZB+MFiH7iOGCIia6zRUxTTpByj71DXSibDhW9SxbEVIZZ0xmcR1Ai90Q1F+G2YP9TcBIgMkbDG4Jazk9FM99UpHtoD+/kFWQ8= 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 1759160828207923.0985438040234; Mon, 29 Sep 2025 08:47:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3G4z-0003Cs-CF; Mon, 29 Sep 2025 11:46:25 -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 1v3G4X-0002tq-9f for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:45:56 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3G4J-000810-Ju for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:45:51 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-46e4f2696bdso21874135e9.0 for ; Mon, 29 Sep 2025 08:45:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e56f3d754sm18544875e9.4.2025.09.29.08.45.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 08:45:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759160736; x=1759765536; darn=nongnu.org; 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=5duVBAedShsIcSkwo/CkemVnUoYuZ0b5Z9+Uw86N4Pg=; b=EmlZDPVMgOAKRE49nHsPYiSrRv7W9b+iNcNgCcICmjECSWWnV1Z6FCZx1+MZxSbNTs RfmDTu4pkineZjgf0eE/mjwKL3hzWXN9LGdoeWzcQmt/SXLXBPCIhCu5ap7Xnblrfeap 9Vl3WjONRzq4onGJ5pDRTGI7Yq2pj2FDRLC05rJCgxVvF+sO+afKh0YOQT5FOQE3oR8M 5fQlNfuaSam8Cewuzs6MBBd/CslFw3vtcfot+uSzFIzjLL120+4IWJzM614EFJpkEHxp OX3O0MFREX7HQ9eFf+Bd5UpRdFyOg1kniS5wjlchJNY6+j3BNCe3xtygZxALGzPSJUNB Q8qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759160736; x=1759765536; 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=5duVBAedShsIcSkwo/CkemVnUoYuZ0b5Z9+Uw86N4Pg=; b=Db2gHJp43lG9qPBrwgog84vtiD1enxbYv2ogr/Tt8unsXlI6ezleEqolyqvWF/U5AA eH/eX+ZOMCYQo+JL6SGHvOhqWN8jmdu0O4db/khxV3InjtP76jgbiRVEDNp6M1ATayLA CArmlSW+pk9HrtKW3EHMkgwXh3VrcLDzQJlwOg3J4MNVlO84FS8Kgvvf2W0EhvHfLh9a sS+WyncEzVkE61UBH6H17xMOB3d86ouRxGRbNcfFQb+e5/PWkv0Xd9A+ximWRGBoEaMU /Jk9xHTwboXr/EF+8pJFoeVM+VpeioodvjivdA0APGo1J1js5j75M+nZb31wxg6hUv1D trCQ== X-Gm-Message-State: AOJu0YxHxJ+mI4opzHjToskmnRWNPUdlGmasuqwFBv37k3GHQwWd2hXn gX3Y0rBITXfOjOOHG3ph89R0nmAunV+s0etSxlSE96yKf7bnqeQXbVRWPawbYILVVyUm6mQkyox uVUd3a+IUwA== X-Gm-Gg: ASbGncvpkL7aAOIkfItL0orQZ3wS4UfIRrn/yF70vStwI5ChaeKeUtNYgFO+YRMWsIk ZsPJNemNnPvow2ye9GPj1RsgrUjYDxZKQfjaqmup1W7J3rpXOXeqV9HZWoeUW4SrKdtnk0+9I+O XzbnRtciNvHnA7ZKe9qm6Mxm66shPDnuBh9lBAYBQifN8syeSAcZMJVVHJ8XIJiSGh6XfC2KL0M oSHjDHcHougxiWx3vmmbGbFuC5GBYJgVd+grkP2b52wy+Nx+TF7E+j2kvS9IYSL/WjRlNyGvzqJ K1LJFvSFSOvP+E66HOREk0SvlA7bFw2WCHliOZGvNlqk3gR5sz3S2U0wUJq5pwVnhrsRXniZq8r 41hEwnqw/g01y+l8SZNcUUjPU6XfY0fuwswpVHTnSS1Su+CUgcw3/AEHpPeDdIcM3Aux3ZRJz X-Google-Smtp-Source: AGHT+IFnrr+DJyaTbMYchai+g7LxYZJVHLrsdZD0UddcfiiaoKSbGm+KV6blFypn4IkDHPPrhdVuzQ== X-Received: by 2002:a05:600c:1d16:b0:459:d3ce:2cbd with SMTP id 5b1f17b1804b1-46e329ee194mr156056255e9.13.1759160736157; Mon, 29 Sep 2025 08:45:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Fabiano Rosas , "Maciej S. Szmigiero" , Richard Henderson , "Michael S. Tsirkin" , Paolo Bonzini , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, Peter Xu Subject: [PATCH 1/6] system/ramblock: Remove obsolete comment Date: Mon, 29 Sep 2025 17:45:24 +0200 Message-ID: <20250929154529.72504-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929154529.72504-1-philmd@linaro.org> References: <20250929154529.72504-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1759160829388116600 This comment was added almost 5 years ago in commit 41aa4e9fd84 ("ram_addr: Split RAMBlock definition"). Clearly it got ignored: $ git grep -l system/ramblock.h hw/display/virtio-gpu-udmabuf.c hw/hyperv/hv-balloon.c hw/virtio/vhost-user.c migration/dirtyrate.c migration/file.c migration/multifd-nocomp.c migration/multifd-qatzip.c migration/multifd-qpl.c migration/multifd-uadk.c migration/multifd-zero-page.c migration/multifd-zlib.c migration/multifd-zstd.c migration/multifd.c migration/postcopy-ram.c system/ram-block-attributes.c target/i386/kvm/tdx.c tests/qtest/fuzz/generic_fuzz.c At this point it seems saner to just remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand --- include/system/ramblock.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/system/ramblock.h b/include/system/ramblock.h index 87e847e184a..8999206592d 100644 --- a/include/system/ramblock.h +++ b/include/system/ramblock.h @@ -11,11 +11,6 @@ * */ =20 -/* - * This header is for use by exec.c and memory.c ONLY. Do not include it. - * The functions declared here will be removed soon. - */ - #ifndef SYSTEM_RAMBLOCK_H #define SYSTEM_RAMBLOCK_H =20 --=20 2.51.0 From nobody Fri Nov 14 23:31:37 2025 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=1759160823; cv=none; d=zohomail.com; s=zohoarc; b=H3XvqG652yzBGU8T7zfEIKLC5aYQxBSd9lq0+4LXbSnEOmNX8UJJJFHHQ7128/sCSqnVfcPu0O5G98TLWDOghx9hcVmCFxGACl5O4SAr20QbRvkZCbRUquzfxGj0dbYDzg6Pk5NBVvoiaWbjvNcsSD1EiGFrk+AZzkzkNittyVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759160823; h=Content-Type: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=Ier7ZLUPhxlD0fGogfBr0oZm5kAnkym39eZlbfBVpIE=; b=CXDzwR6S3nA+yNJcnPcO5rb9tl641bUkrEmNaP8O9ecxb4bmhjHMdDIL5aoL7EbNLfMtk7wmN2tAXMUc8btGZ9ffNFTtBEOmeGSqliCiyWUSEG4inNESwcHwwdvHCwnNduXTyXNdcWZ27DoYNKUQdVzOLi+nnPxV9Fs9XoIMrIk= 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 1759160823202913.293689018567; Mon, 29 Sep 2025 08:47:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3G59-0003RY-RH; Mon, 29 Sep 2025 11:46:32 -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 1v3G4X-0002tr-9c for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:45:55 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3G4Q-000839-Vu for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:45:52 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3e8ef75b146so3435856f8f.0 for ; Mon, 29 Sep 2025 08:45:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e59af1975sm402735e9.3.2025.09.29.08.45.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 08:45:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759160741; x=1759765541; darn=nongnu.org; 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=Ier7ZLUPhxlD0fGogfBr0oZm5kAnkym39eZlbfBVpIE=; b=yZViLbV7N1SA2VHKm8n3oG4137DtMbW6PQJ77+8RQxR0LLRnzVDYhtFDg62vy+5+Wq Us5OPsF6MIXNqEWskwvOa9xAFCrlDAPjNj0DGvzKOpyw48S2eykf7DCOdl84pWNaeDsH TbkHxZ02n2YhVhjG60kvQV7tBlJFTdGXcM+Wmr/DRutYojBBPzRcNMVSnPycp5NaSQEx OS3tg2IahHhTKcXFnAJpWIeDdJluu54Iu+ZsVHHtVgIM62k6EddCrIRpC+SIKsEPq6eW QZaBLBhc6zK6DxZr/dBF+mJ1+tCVWyqTg2WUoDjzWNvkIeuCAi6OLBbcymkI6/DIvQno fa7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759160741; x=1759765541; 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=Ier7ZLUPhxlD0fGogfBr0oZm5kAnkym39eZlbfBVpIE=; b=hlc7Xxpumgv90WvGJ12nrVkEyH6hR4eaoC/QJE2r5XMGgqm6wHKl8Ge8DVtcTYXUw6 OwY8VnNM0VXvod0ssDAgaSfnul+lRBThPOB/McTjxLa13duji8DO9/m4dZxvsL4YozDa 5yAQbsb1sAZEsO4sSGWdkHGZnSu+PipvNurpSHJEgn1BnjccRwPG5+F0D8hh+zAF1G0/ bKCHcbaWqioX0C5OvJmiV5ttxgXIla5XMnwW6sKlzeLGrUxFxqjKSHqkF5uOwBEeBMrm oCn8PI5i8yEB5xxfs6WKrecWFe3/0fqJ+zJQlvawBe00NCBLoQUYLuH5CwfLwO2MhdKz MyZw== X-Gm-Message-State: AOJu0YyEXIUWgUSItexEmIcA8Wi+/sl+D9dCDO/lONOYZadCG4goi7to zGAOsjzt6K3qEOd8K54gjpK23mTV0uVJBf/fk10UnDYgsFNfLkOLzQJNrlRJHcs9dHpR4ibRJ6s GlcwGQPPFNQ== X-Gm-Gg: ASbGncvgaSihUfAJWyKjh8h0AFnmFZx6wjAkc0mvGV+MEZBPEJKsBYPFTuqmNn6csBn jx8+2SsfoGUSMhyw504cIXEqCnL5FQmQy7SuLp5V8yzUylZEckkxtNFnwb6UNV50f1uCXXsFAjX sgaFJtwfwyTRYPGlZv8G7Mfcu8uoxpQfnxv8C2XGBmfbzymkLtWmtKda0jxT9VfMTz9kLyKGsQI frNQEbfZ4FrY73UzHNRvEgK12qoC8XiNhZQaxf8yrDGESxm9Ypvo9QHIoaMWosVYcM5bjABlA5G FZloHmAv1yybPMC88KFFv1PqufkTfdJIrXJn0HNAZemLIVHBRdTbZtyEsvHUbBKU2MDy4XuXP95 xV6rlXf2jFRvfeLvdQssBWWCH+R2kCa/iUAVbf3NHQvUqZmzRXTqriK3OFc/4V4A9jaKSh8dz8C ey6yDtsC4= X-Google-Smtp-Source: AGHT+IH9iVMg3sncAg6Mjrqkf34b84fuhD2iKYy8WAQ/+/TUPiyjYY3xhW8ytrinUFRfyHO92RR0MA== X-Received: by 2002:a05:6000:1ace:b0:400:6e06:e0ae with SMTP id ffacd0b85a97d-40e4cc62efbmr15549709f8f.47.1759160740972; Mon, 29 Sep 2025 08:45:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Fabiano Rosas , "Maciej S. Szmigiero" , Richard Henderson , "Michael S. Tsirkin" , Paolo Bonzini , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, Peter Xu Subject: [PATCH 2/6] system/ramblock: Move ram_block_is_pmem() declaration Date: Mon, 29 Sep 2025 17:45:25 +0200 Message-ID: <20250929154529.72504-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929154529.72504-1-philmd@linaro.org> References: <20250929154529.72504-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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: 1759160825312116600 Move ramblock_is_pmem() along with the RAM Block API exposed by the "system/ramblock.h" header. Rename as ram_block_is_pmem() to keep API prefix consistency. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- include/system/ram_addr.h | 2 -- include/system/ramblock.h | 5 +++++ migration/ram.c | 3 ++- system/physmem.c | 5 +++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h index 15a1b1a4fa2..53c0c8c3856 100644 --- a/include/system/ram_addr.h +++ b/include/system/ram_addr.h @@ -99,8 +99,6 @@ static inline unsigned long int ramblock_recv_bitmap_offs= et(void *host_addr, return host_addr_offset >> TARGET_PAGE_BITS; } =20 -bool ramblock_is_pmem(RAMBlock *rb); - /** * qemu_ram_alloc_from_file, * qemu_ram_alloc_from_fd: Allocate a ram block from the specified backing diff --git a/include/system/ramblock.h b/include/system/ramblock.h index 8999206592d..12f64fbf78b 100644 --- a/include/system/ramblock.h +++ b/include/system/ramblock.h @@ -108,4 +108,9 @@ void ram_block_attributes_destroy(RamBlockAttributes *a= ttr); int ram_block_attributes_state_change(RamBlockAttributes *attr, uint64_t o= ffset, uint64_t size, bool to_discard); =20 +/** + * ramblock_is_pmem: Whether the RAM block is of persistent memory + */ +bool ram_block_is_pmem(RAMBlock *rb); + #endif diff --git a/migration/ram.c b/migration/ram.c index 7208bc114fb..91e65be83d8 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -53,6 +53,7 @@ #include "qemu/rcu_queue.h" #include "migration/colo.h" #include "system/cpu-throttle.h" +#include "system/ramblock.h" #include "savevm.h" #include "qemu/iov.h" #include "multifd.h" @@ -4367,7 +4368,7 @@ static bool ram_has_postcopy(void *opaque) { RAMBlock *rb; RAMBLOCK_FOREACH_NOT_IGNORED(rb) { - if (ramblock_is_pmem(rb)) { + if (ram_block_is_pmem(rb)) { info_report("Block: %s, host: %p is a nvdimm memory, postcopy" "is not supported now!", rb->idstr, rb->host); return false; diff --git a/system/physmem.c b/system/physmem.c index ae8ecd50ea1..3766fae0aba 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -43,6 +43,7 @@ #include "system/kvm.h" #include "system/tcg.h" #include "system/qtest.h" +#include "system/ramblock.h" #include "qemu/timer.h" #include "qemu/config-file.h" #include "qemu/error-report.h" @@ -1804,7 +1805,7 @@ void qemu_ram_msync(RAMBlock *block, ram_addr_t start= , ram_addr_t length) =20 #ifdef CONFIG_LIBPMEM /* The lack of support for pmem should not block the sync */ - if (ramblock_is_pmem(block)) { + if (ram_block_is_pmem(block)) { void *addr =3D ramblock_ptr(block, start); pmem_persist(addr, length); return; @@ -3943,7 +3944,7 @@ int ram_block_discard_guest_memfd_range(RAMBlock *rb,= uint64_t start, return ret; } =20 -bool ramblock_is_pmem(RAMBlock *rb) +bool ram_block_is_pmem(RAMBlock *rb) { return rb->flags & RAM_PMEM; } --=20 2.51.0 From nobody Fri Nov 14 23:31:37 2025 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=1759160821; cv=none; d=zohomail.com; s=zohoarc; b=H7hP6lzj6+k6uNxtwtOFSut/1vdzOxP534tONnjdZzuIZNBg2h2qT6HSKEpL6Vz7uF5uakynXqLg9pZcVO4KICkW/yL6FpxJQRpBOk/Xhw1KqglME+AWUx93gnveuhQuMYT+SenmyioQVr6Xq5OmDkN30RpUylkaK+XHw/rQaP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759160821; h=Content-Type: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=FOipWRU8fk4RKadfaCTuleiBvZNuXiEbbPLdGlI48oU=; b=FmKWk3KaXDol61q1g84uCcgIBv24KB9lGElG2SKr/ISKBbsqycrYp+GpAgYB4FB4eLsF6GbvzgjdKvC+33HOKNpPnsbnKxOIIVoD0CGcc9f7qwSbfDuIF1CqgNpVD0H99aPRdZUJBZBUerJpop14POAlzc+Z3XOh/pBfMyS8lMU= 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 1759160821165349.51720685522105; Mon, 29 Sep 2025 08:47:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3G5O-0003Zw-OZ; Mon, 29 Sep 2025 11:46:46 -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 1v3G4k-00031V-Ec for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:46:11 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3G4Y-000854-4U for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:46:00 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3ed20bdfdffso3942672f8f.2 for ; Mon, 29 Sep 2025 08:45:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e572683ccsm18198795e9.22.2025.09.29.08.45.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 08:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759160746; x=1759765546; darn=nongnu.org; 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=FOipWRU8fk4RKadfaCTuleiBvZNuXiEbbPLdGlI48oU=; b=mcje6Uy+t8wz+8HiSBwrffhE53/2BT508rQOSe60dH/eQJQ5NlgdFXXWbXd+ZByhiI dqHQLBXXxIy0+fAm92y6AV3ZUjO/A/DmkN/yB5CCWGFZPdW9fknHHPrlOy0anPI0MOfH 2JrbWwakAA7febOHYiETW+2sNxeICwaG93WrqVAQy0UomLTauSzUW+PIMe1NiPR6PmDN ucgyZk8zlB/yN51ylHuEn5MVb+QnzcSkAjQkfGNznwItWbwyHfAiYDon5IKOl/JKFwyV VuayfsuzQ9l9PIZWGgDZGu0TlhCsBmzWzq6ayIv7dKKwmWaLmR8DpG2fhza6jp9of4gt b9QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759160746; x=1759765546; 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=FOipWRU8fk4RKadfaCTuleiBvZNuXiEbbPLdGlI48oU=; b=L06wV036hkTRevJzd1odaAfI2179lK398I+7tJMsSyoYF0MGQPNdBlcVrZPO9ZBG2P tiQ+lQlRRtGbaRXk1NLfkwZ+p8bctDmTR9mxFz/mpFtkGPnf7BMp7yqa1xNluxFrZ8FZ NTpUD72bFkSfpwp08S7lLjfO/kn4OJmfMT+X1PL2iJGULKzoyxj4eDR85f40cAXCCP6P unUk8G+9xU4UdsvP8fNGMkM10oh7Ydq2/iVd9mgNaUsWztTV1Lk436WRacbJogXuvD/C IOUurCMUJ98HE4RNdeKzZxaPXHXNgqxRDqZOoXvhFODCMD3LbyGbKjrHO8j1HPOXuP6f nprA== X-Gm-Message-State: AOJu0YyVKLx52NMDruoh3HqDdjju3pRXlXjwM9TwsZIy3SYKpzth2uqZ 0b7La39p5oc87q7uvAZAqR9z0+PCpbRUzvaHo3ULVWaIv+OaGf8Lu/9lS5EldS0J94aVuaNNM3m tX7JsoevhUg== X-Gm-Gg: ASbGncsKR1WiKjeyYzGQmlF7O1rCLIylZ6HlrdHrUGE3M36bWs7UlD2VCLjsm0K29Lt wU4KGeV37gq5Z9c9HSNBCclzMsBtED3Ys0BIdNsT8/8vVPzINIa5y11chyjUeJfF4EWK731CyK5 6qzAEeJGsHtwcByoL+G+tUHEsG+/cjOG5Nk96zc0808idO9v/t/m54X7Ojy2QnypqscPrMvyPsS ACBYnCRDIYsnOrFaHMVspjUWKe27/uxuhktTdmlxaSGchozukAkWCm3d6/7KzihfEdwpbJww0j1 HVVebAlFCLkLH5dVdywSOSFe3oVfbxzwvZ2bSEU6s+rbinXem/R3ylLaVsS5T83yCWNRHFvAeme sNkHXdPlSFnITABBhRIcwphpKftVF0wTyT1czzI8XI7xBeUkjJEuGWGIyttDZy8ddYHscnR2W X-Google-Smtp-Source: AGHT+IEqDnpJSC0UsoPMmNpmG7ETJKIQx2OcIo9sQftcKrpnYAKz1TRrqCbtGIzqdge9XOJaoUrErg== X-Received: by 2002:a05:6000:613:b0:3ec:8c8:7b79 with SMTP id ffacd0b85a97d-40e4d9ca985mr15223191f8f.61.1759160745826; Mon, 29 Sep 2025 08:45:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Fabiano Rosas , "Maciej S. Szmigiero" , Richard Henderson , "Michael S. Tsirkin" , Paolo Bonzini , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, Peter Xu Subject: [PATCH 3/6] system/ramblock: Move ram_block_discard_*_range() declarations Date: Mon, 29 Sep 2025 17:45:26 +0200 Message-ID: <20250929154529.72504-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929154529.72504-1-philmd@linaro.org> References: <20250929154529.72504-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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_PASS=-0.001, T_SPF_HELO_TEMPERROR=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 @linaro.org) X-ZM-MESSAGEID: 1759160823388116600 Keep RAM blocks API in the same header: "system/ramblock.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/cpu-common.h | 3 --- include/system/ramblock.h | 4 ++++ accel/kvm/kvm-all.c | 1 + hw/hyperv/hv-balloon-our_range_memslots.c | 1 + hw/virtio/virtio-balloon.c | 1 + hw/virtio/virtio-mem.c | 1 + 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index f373781ae07..e413d8b3079 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -163,9 +163,6 @@ void cpu_flush_icache_range(hwaddr start, hwaddr len); typedef int (RAMBlockIterFunc)(RAMBlock *rb, void *opaque); =20 int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque); -int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length); -int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start, - size_t length); =20 /* Returns: 0 on success, -1 on error */ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, diff --git a/include/system/ramblock.h b/include/system/ramblock.h index 12f64fbf78b..e69af20b810 100644 --- a/include/system/ramblock.h +++ b/include/system/ramblock.h @@ -103,6 +103,10 @@ struct RamBlockAttributes { QLIST_HEAD(, RamDiscardListener) rdl_list; }; =20 +int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length); +int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start, + size_t length); + RamBlockAttributes *ram_block_attributes_create(RAMBlock *ram_block); void ram_block_attributes_destroy(RamBlockAttributes *attr); int ram_block_attributes_state_change(RamBlockAttributes *attr, uint64_t o= ffset, diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 9060599cd73..e3c84723406 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -32,6 +32,7 @@ #include "system/runstate.h" #include "system/cpus.h" #include "system/accel-blocker.h" +#include "system/ramblock.h" #include "accel/accel-ops.h" #include "qemu/bswap.h" #include "exec/tswap.h" diff --git a/hw/hyperv/hv-balloon-our_range_memslots.c b/hw/hyperv/hv-ballo= on-our_range_memslots.c index 1505a395cf7..1fc95e16480 100644 --- a/hw/hyperv/hv-balloon-our_range_memslots.c +++ b/hw/hyperv/hv-balloon-our_range_memslots.c @@ -8,6 +8,7 @@ */ =20 #include "qemu/osdep.h" +#include "system/ramblock.h" #include "hv-balloon-internal.h" #include "hv-balloon-our_range_memslots.h" #include "trace.h" diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index db787d00b31..02cdd807d77 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -23,6 +23,7 @@ #include "hw/qdev-properties.h" #include "hw/boards.h" #include "system/balloon.h" +#include "system/ramblock.h" #include "hw/virtio/virtio-balloon.h" #include "system/address-spaces.h" #include "qapi/error.h" diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index c46f6f9c3e2..1de2d3de521 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -17,6 +17,7 @@ #include "qemu/units.h" #include "system/numa.h" #include "system/system.h" +#include "system/ramblock.h" #include "system/reset.h" #include "system/runstate.h" #include "hw/virtio/virtio.h" --=20 2.51.0 From nobody Fri Nov 14 23:31:37 2025 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=1759160809; cv=none; d=zohomail.com; s=zohoarc; b=cxmPQKxb6kanA+SYCunLXY1PjNiEUsH5EqlfmVUOjnD0fcukkRPnALfgm2wL2hwjmzC9yaHgIXWKH1YGKtJzhDNE5CWExdJoz/v/xx6CXSV86/TRYaC6t7wfulCdK8aQIFgZ0Spz5bHIfAyASK88b92wsV68Hyi/ADjaKsi5vmw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759160809; h=Content-Type: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=skSiBrYgmNb3KW5VmEKPkKDMJ6jv8aZ6s7jfJf5MQP4=; b=XZPUk+9WhO0BJ2Azpwj3krpd748TSzHNVFkP0p015+uz1XB+woO12QRRGlyTuC7R6wKqn1GIr+Vd/1//YuvmmrXQ1LOyayAwufho5Cisp8eBFzgTJr5PbuYHpSNqRl9BlzjpsC+3xBw92Ba6yyb3w3QB4cLKHjU093H9Vpr4z3Q= 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 1759160809098949.1786337884643; Mon, 29 Sep 2025 08:46:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3G4z-0003Fo-Di; Mon, 29 Sep 2025 11:46:25 -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 1v3G4k-00031R-7V for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:46:11 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3G4Y-00085d-46 for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:45:57 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46e3cdc1a6aso26066885e9.1 for ; Mon, 29 Sep 2025 08:45:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2ab31bdesm229147985e9.11.2025.09.29.08.45.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 08:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759160750; x=1759765550; darn=nongnu.org; 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=skSiBrYgmNb3KW5VmEKPkKDMJ6jv8aZ6s7jfJf5MQP4=; b=E88KMOJbKblFnAt9IKKIUn/BOwloZwd1qfqpBsc1GnyzggaCxngQacaDlKkUQg7CBZ cRgo4dKKLta7e3UdI14G66gBBwnrfKtLzujAuL7Lxln5hY9ebzQ4TQLFius7EXmHFpBE p3M+FS08gOLX8aP4DfkKAT7zSPz9b66Qp2AYBZjLjRx+I57kjdPBWPwG1gMj8Cf4OtZF /vXbvgdXHE43O0QwRflMdkWD/sxTdf+WXT79/8OpVYYM9p4xb2wFjR91fKEJINcy7w+n gCLREiSaOlTopLBwSDtV8Gs+yg8dJ+GPK/wx1ZUfID8SETCpPCNo//NA3nMzhAZvEVZE EVdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759160750; x=1759765550; 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=skSiBrYgmNb3KW5VmEKPkKDMJ6jv8aZ6s7jfJf5MQP4=; b=nB5r9XgIekpMqgAEV59pHUi+lAyMDAmptSx/yI27zZvgAItv1IRkZ7sJcgnxD8bOAi dymTyfzAznqSYrVTWkBicaqfV7PDFND6rxhOsZ0dMl27WGxh/PBchoDC7rbf97lFPday rBSM6/hBEgLZCKlDa0vYYGk59FCSlU5F7Z/NpGCeqsGpG62vyO7kt2si6O9Al96nIwWh zLghclb10muzJGGpuOCIlTb05Rq8qXZtkbYuw24OGgTIXX4ZT6ORE62m+bnw2SYSIdEd Yl3R381Mm5k9HhwPnJkq1pZ4HvUkZlFPHUMoXryaEYgn/xpoNt1EfTZW+5i+FclQt3PR J5vA== X-Gm-Message-State: AOJu0YyXwiTajBC+0NlSHfzW1/VCu7XolA5k1GGAsl92QE0NO9b+gqBE 3ufy88SOwAlK0Afl8KAoIyG63SovoL9MTq/udhLwUUwHK4kGfg2x2vVuFwSWSt3aamy3MIjFd8+ x4Bc4ngHtGw== X-Gm-Gg: ASbGncvPIaGWja4KYH9PnIvdIh8YAaz3QfEBEjemaa87aQWxNF7XpIpWaKn1Nlvi05v ljCIamNsJy+b7Pd8cLQxMMvUombYm7KsgfnCLmUbV1HgbBPrJXCfWdFs2lVbcg6fyNFt/KgJKRf KT1MEu01zewj5p51GiKlpebF1K+y4momI9NpA39Zyh+fshaDhEax09HVQEDVl6aSydiwm29eHVi o0KN93IQFg2CHVkGPR3R0gSxvvXyWdaU+UflsqkpzZPtjk6UQwvg/e6dfjLspU0PJT0bs6wZc3E 92mUE0RocroqEV28Akxg69Bd8bc6y1VR9OWUle/8PzsdLKtt5SGm+NYh9asTEzuD45sIfN2ICY5 6LjV8PbM8UEne/1VSiTO1G5KBfgiTA9eEeys2QToTUBf2W3AbpoLWZp9HveIrcy/3CSAPFnT7Qb t2G13b8JA= X-Google-Smtp-Source: AGHT+IGsNO4ME1VQ2l5Lp9gwMoIxExUWy6pxs/+HaIF3NAnkZSji+lWI9Q/AGB1Bpc3JW6TXnXKfoQ== X-Received: by 2002:a05:600d:112:b0:46d:38c4:1ac9 with SMTP id 5b1f17b1804b1-46e58aac96bmr8112745e9.2.1759160750552; Mon, 29 Sep 2025 08:45:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Fabiano Rosas , "Maciej S. Szmigiero" , Richard Henderson , "Michael S. Tsirkin" , Paolo Bonzini , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, Peter Xu Subject: [PATCH 4/6] system/ramblock: Use ram_addr_t in ram_block_discard_guest_memfd_range Date: Mon, 29 Sep 2025 17:45:27 +0200 Message-ID: <20250929154529.72504-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929154529.72504-1-philmd@linaro.org> References: <20250929154529.72504-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1759160811196116600 Rename @start as @offset. Since it express an offset within a RAMBlock, use the ram_addr_t type to make emphasis on the QEMU intermediate address space represented. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/system/ramblock.h | 3 ++- system/physmem.c | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/system/ramblock.h b/include/system/ramblock.h index e69af20b810..897c5333eaf 100644 --- a/include/system/ramblock.h +++ b/include/system/ramblock.h @@ -104,7 +104,8 @@ struct RamBlockAttributes { }; =20 int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length); -int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start, +/* @offset: the offset within the RAMBlock */ +int ram_block_discard_guest_memfd_range(RAMBlock *rb, ram_addr_t offset, size_t length); =20 RamBlockAttributes *ram_block_attributes_create(RAMBlock *ram_block); diff --git a/system/physmem.c b/system/physmem.c index 3766fae0aba..e2721b1902a 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3920,7 +3920,7 @@ err: return ret; } =20 -int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start, +int ram_block_discard_guest_memfd_range(RAMBlock *rb, ram_addr_t offset, size_t length) { int ret =3D -1; @@ -3928,17 +3928,17 @@ int ram_block_discard_guest_memfd_range(RAMBlock *r= b, uint64_t start, #ifdef CONFIG_FALLOCATE_PUNCH_HOLE /* ignore fd_offset with guest_memfd */ ret =3D fallocate(rb->guest_memfd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KE= EP_SIZE, - start, length); + offset, length); =20 if (ret) { ret =3D -errno; - error_report("%s: Failed to fallocate %s:%" PRIx64 " +%zx (%d)", - __func__, rb->idstr, start, length, ret); + error_report("%s: Failed to fallocate %s:" RAM_ADDR_FMT " +%zx (%d= )", + __func__, rb->idstr, offset, length, ret); } #else ret =3D -ENOSYS; - error_report("%s: fallocate not available %s:%" PRIx64 " +%zx (%d)", - __func__, rb->idstr, start, length, ret); + error_report("%s: fallocate not available %s:" RAM_ADDR_FMT " +%zx (%d= )", + __func__, rb->idstr, offset, length, ret); #endif =20 return ret; --=20 2.51.0 From nobody Fri Nov 14 23:31:37 2025 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=1759160886; cv=none; d=zohomail.com; s=zohoarc; b=ZS6OshZTWx56XqMWSP2179Rpb2XlIBKVn2x3Brs+KJJpObKdtYQeRDJhlkus0Y9BzXwLOZ/JgOWIGM3hbvMuxSecSPZNdQ7uuMemgIbNMazQzv+RyQf7Bw3mViktcxcWo8Rw2qaP5FbnLocerBjAA2Gm3ywATxrtIC1Pb/gXhnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759160886; h=Content-Type: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=txLBq2hBcl/jIiqR1VpYD85vDq9mb0UsYkys8wX8u/M=; b=CogH6yOws+X8pfpPWTIRjK34WKtCqG6soVRMonc6agQBKCucFv5E/LkIXOF+HB8VPg8kL9WxHITTlsGmmYO9nEY6vtsEBhB+s2AGrngKG0iPB1tJsk1y7jaCj5LR4F8/AviETDILhHi77Hm27OiC0XuwNecvGe2Hfx54bXVBD+g= 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 1759160886626221.2258187801865; Mon, 29 Sep 2025 08:48:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3G5P-0003nA-6h; Mon, 29 Sep 2025 11:46:47 -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 1v3G4t-0003Af-BY for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:46:17 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3G4j-00088o-Ec for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:46:14 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3ee1381b835so4030170f8f.1 for ; Mon, 29 Sep 2025 08:45:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-40fb72facf9sm19283036f8f.13.2025.09.29.08.45.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 08:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759160755; x=1759765555; darn=nongnu.org; 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=txLBq2hBcl/jIiqR1VpYD85vDq9mb0UsYkys8wX8u/M=; b=PLtP00L3LWhhcTLcP5mWHTxUpmLp1ls+t9fY8XVeD7psufQ86PokO1qFkz5ucMXX7J o5mEdMu9K68X4qqzS4/9zAL4YnG5oz3UAnsC11KRvaKMj5FT4gMfnTG6hHMDIBg72jJa QIX8QPfsPZx2aWqLbSU7csUnuimK6QvAGZ0JoRdv869dHXn7YxvhvSM68qmDg/+OmkzW 6TyDT5taXNeVA/Vfzbv72dJJukKbMceITjqvs4H1j2ArT3/7kM71Z2qpOEloNksrPd93 NjztVGbENuAYAUCVee9l7cZbIh+rZOZkHwtveE0/N2J2cLWo5OtLF59Ynr4dDE95EevC CSPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759160755; x=1759765555; 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=txLBq2hBcl/jIiqR1VpYD85vDq9mb0UsYkys8wX8u/M=; b=AnHPpSj2Enro6OeCkzGSDemYLs47X4gOeXCgSArqQDKNRPYYu/FH7jK48I6O/imcy8 eNSK6I9NuSHvqLtf7DqORPUifOrdenBIqbUL7gPwIgGdFiA7w8d+L2XOEytO+2qOC+ay kCVzMfS0QWKKximnR+cPB4jqUy5aQLKorsa/fzYs1rtiSp+2ohPz98mGHbgEoxrW4Hy9 7abyrxW1B+bPhs3Up8tVbyRMiSEN+q9EKW8E0vT1vdBSAYQCdPwXXNyP5voKXWhSYEOM ux1Oh+BX65/iEdoIpUdZ5rIVwFyOCndBSOnKIZ5nT3K8OKUZty1+KAxyt0YVDQlQPEr5 Zmpw== X-Gm-Message-State: AOJu0YxtnJOUqn6tMBFRoZb2edlLDlD/92LZ+byvO5d0Rrtb5NSm37Lg Akl+rrgJb3IveoOOlUVsD9sf33Sz8CVT7J0sjI3SyYuUcEoOd0lXEj0zG07J9sxF+VBZT/sBT/S o/8upr+FnQw== X-Gm-Gg: ASbGncsNsRVfnOOYIZEgWdEMRid8mYZBKsvXAEO9PF86gdBJdzp074wK1FFZV5R2UiS 7/+TKNUDOrtbDjX+kgh1AqT0t0ZDPrFfCzYXGPH+5rQUHfeWGbJyUImoeuydlLdmStt6z9QDhFD D90os+njLaby1GFVddz5T3q/lTQBCt2VeLSWs591yQUxXYybmv0VAt5qL5n3ErIZZApMcfjFtnR qa/73JsARCQ7xn4Vl/2uWov/2BTYWAOe9+tvDnWUb5ucIDkBiQvkiwfMA8oRH3eipU5VzSfHJIW qas1MR2aGubtWa5nlA35LRuSfttatKE4P94OZ55atuEgSDXAo65cSgBZo4RjzxJvEDhVB71SEpO D81wthSflIuvrfeB8DYCrBhoyy461f561U3jza9HOfKKJI4o9xOCNAUsaFC/rEmOyTkWvfB88M5 9iq7UgFxw= X-Google-Smtp-Source: AGHT+IGTzp+BirKcRPCXo+kANtj3p1s1iIIjZmLqbDvTsgjpRSs7dA5CM6VwfzYsQdra8DfpYPvayw== X-Received: by 2002:a05:6000:268a:b0:3e9:b7a5:5dc9 with SMTP id ffacd0b85a97d-40e479258cfmr15786461f8f.23.1759160755369; Mon, 29 Sep 2025 08:45:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Fabiano Rosas , "Maciej S. Szmigiero" , Richard Henderson , "Michael S. Tsirkin" , Paolo Bonzini , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, Peter Xu Subject: [PATCH 5/6] system/ramblock: Use ram_addr_t in ram_block_discard_range() Date: Mon, 29 Sep 2025 17:45:28 +0200 Message-ID: <20250929154529.72504-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929154529.72504-1-philmd@linaro.org> References: <20250929154529.72504-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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: 1759160888062116600 Rename @start as @offset. Since it express an offset within a RAMBlock, use the ram_addr_t type to make emphasis on the QEMU intermediate address space represented. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/system/ramblock.h | 3 ++- system/physmem.c | 33 ++++++++++++++++++--------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/include/system/ramblock.h b/include/system/ramblock.h index 897c5333eaf..57c00e42ca6 100644 --- a/include/system/ramblock.h +++ b/include/system/ramblock.h @@ -103,7 +103,8 @@ struct RamBlockAttributes { QLIST_HEAD(, RamDiscardListener) rdl_list; }; =20 -int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length); +/* @offset: the offset within the RAMBlock */ +int ram_block_discard_range(RAMBlock *rb, ram_addr_t offset, size_t length= ); /* @offset: the offset within the RAMBlock */ int ram_block_discard_guest_memfd_range(RAMBlock *rb, ram_addr_t offset, size_t length); diff --git a/system/physmem.c b/system/physmem.c index e2721b1902a..bb744f0758e 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3797,18 +3797,18 @@ int qemu_ram_foreach_block(RAMBlockIterFunc func, v= oid *opaque) } =20 /* - * Unmap pages of memory from start to start+length such that + * Unmap pages of memory from offset to offset+length such that * they a) read as 0, b) Trigger whatever fault mechanism * the OS provides for postcopy. * The pages must be unmapped by the end of the function. * Returns: 0 on success, none-0 on failure * */ -int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) +int ram_block_discard_range(RAMBlock *rb, ram_addr_t offset, size_t length) { int ret =3D -1; =20 - uint8_t *host_startaddr =3D rb->host + start; + uint8_t *host_startaddr =3D rb->host + offset; =20 if (!QEMU_PTR_IS_ALIGNED(host_startaddr, rb->page_size)) { error_report("%s: Unaligned start address: %p", @@ -3816,7 +3816,7 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t st= art, size_t length) goto err; } =20 - if ((start + length) <=3D rb->max_length) { + if ((offset + length) <=3D rb->max_length) { bool need_madvise, need_fallocate; if (!QEMU_IS_ALIGNED(length, rb->page_size)) { error_report("%s: Unaligned length: %zx", __func__, length); @@ -3867,19 +3867,20 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t = start, size_t length) } =20 ret =3D fallocate(rb->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEE= P_SIZE, - start + rb->fd_offset, length); + offset + rb->fd_offset, length); if (ret) { ret =3D -errno; - error_report("%s: Failed to fallocate %s:%" PRIx64 "+%" PR= Ix64 - " +%zx (%d)", __func__, rb->idstr, start, + error_report("%s: Failed to fallocate %s:" + RAM_ADDR_FMT "+%" PRIx64 " +%zx (%d)", + __func__, rb->idstr, offset, rb->fd_offset, length, ret); goto err; } #else ret =3D -ENOSYS; error_report("%s: fallocate not available/file" - "%s:%" PRIx64 "+%" PRIx64 " +%zx (%d)", __func__, - rb->idstr, start, rb->fd_offset, length, ret); + "%s:" RAM_ADDR_FMT "+%" PRIx64 " +%zx (%d)", __fu= nc__, + rb->idstr, offset, rb->fd_offset, length, ret); goto err; #endif } @@ -3898,22 +3899,24 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t = start, size_t length) if (ret) { ret =3D -errno; error_report("%s: Failed to discard range " - "%s:%" PRIx64 " +%zx (%d)", - __func__, rb->idstr, start, length, ret); + "%s:" RAM_ADDR_FMT " +%zx (%d)", + __func__, rb->idstr, offset, length, ret); goto err; } #else ret =3D -ENOSYS; - error_report("%s: MADVISE not available %s:%" PRIx64 " +%zx (%= d)", - __func__, rb->idstr, start, length, ret); + error_report("%s: MADVISE not available %s:" + RAM_ADDR_FMT " +%zx (%d)", + __func__, rb->idstr, offset, length, ret); goto err; #endif } trace_ram_block_discard_range(rb->idstr, host_startaddr, length, need_madvise, need_fallocate, ret); } else { - error_report("%s: Overrun block '%s' (%" PRIu64 "/%zx/" RAM_ADDR_F= MT")", - __func__, rb->idstr, start, length, rb->max_length); + error_report("%s: Overrun block '%s' " + "(" RAM_ADDR_FMT "/%zx/" RAM_ADDR_FMT")", + __func__, rb->idstr, offset, length, rb->max_length); } =20 err: --=20 2.51.0 From nobody Fri Nov 14 23:31:37 2025 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=1759160894; cv=none; d=zohomail.com; s=zohoarc; b=Hl1+1jGjXlSwg9Deq9aHacxWw4laqkGhFrX9wKYnxkSYHm1EvurI/jUjfEuj41M9jSYJAhBFHtnkzwORqT7drtCppjRfBDsKvN7mHZ/ZM9Brtf1v1OZU80UJS5pyoVwzDBWGHeg223d8sxOwifHh24HMMiTYXw55ZNT90O7q1aY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759160894; h=Content-Type: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=Mzk7TvYEUHOAeZyPbb/RaRgUKTr/BD06CzZU6YBZwkQ=; b=iS1kkXGqlbGVQCDT0DJcZBb9Vt0BHUweesKvjuC34+Oq/OFXGWPkgJlD5L3MFg4VIDrwkDFK/YGIVReIcYqZ8sBPbXJ5hYyw6Hoyix+oDuRbgk9V7QMDmQ3Ola3U51DNiBWPx3T4EeA46B2gFBrSyLXXbLSInXVgmgB+lcXFw9Q= 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 1759160894062972.8740301862188; Mon, 29 Sep 2025 08:48:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3G5Q-0003uw-DX; Mon, 29 Sep 2025 11:46:48 -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 1v3G4y-0003Fi-CR for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:46:21 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3G4m-0008Cp-VX for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:46:19 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3ece1102998so3257836f8f.2 for ; Mon, 29 Sep 2025 08:46:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-40fc5602df0sm18812064f8f.36.2025.09.29.08.45.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 08:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759160760; x=1759765560; darn=nongnu.org; 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=Mzk7TvYEUHOAeZyPbb/RaRgUKTr/BD06CzZU6YBZwkQ=; b=qxxURNWtuHFAoCPMDG6V7F9dmE0U0/nwFqLv9jkV+k8hYYK7Wo+ANO98+rNnSodXEH vdg+EUjjHm1rHbw0g2aBcBRmKbd9qkEscR7XDuoh7Ul5rzGRdvfl3w494Gjp79odUVou ac43z3bhRH7UOjovjiHLjMc7u/INr13TkTtfxKtIB7dw31AyFZFpTHnveV67weiN7d41 +Tg/d/zGxbeX+A3syKAI7ck7AZTjl/vcq3LnMZf0SbqlXFAJbZAkGjwdsOu2fwXj6fpg LOeq9P/drgKX54tDWFrP3GHiu+A7d/dTx7gipxOKMAcaoV+gHIxCzzy22A5Z8ewq9eIz nMiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759160760; x=1759765560; 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=Mzk7TvYEUHOAeZyPbb/RaRgUKTr/BD06CzZU6YBZwkQ=; b=xIZP3r5wU7qOZ70m1dDLrJVszqLYUIQXwpCAfRo2D28OX2Toz9EH4CY+b4gxCEa3Qi bBnGcE71YgIMic8JSOew2MJHUFX9hCjrH7RMVZa1cOVjXL1jcikRL3C4FRpa4aDi2z0D CIxdi52gpQhvj/hUvum57WBU1AnREfbDoCIwjqW1AEaut7a+yfoieioNHl/hzq0KLQlI SkTPyY7FbnS7oDXN2la4Wh/vafEYF/474gPWbj68vY29JSTIiEZpdGCSoWnl1isxRQ0m SWe4qvwIuGjiQytBHIM3Tr1asSg9oJDcIJpcWzWTKfFy3fFuL+oj6m03mPFN5EEVFWK8 hNWA== X-Gm-Message-State: AOJu0YyemBgfeAV0K1ITwtJw7TmmrssS8XmvlWSSH5bDnKnqBfeuIpHm Z+3tW/MbIKsA+25w9ammZM1lXLK4TU4aJAMQgpvY6anw6JM5UR8EfOaiiLs4ui6MqoSshus+yG+ nLRIFzTQLwQ== X-Gm-Gg: ASbGncu2jKPsxr4m+xsm4hixwSs1on6hDx9JmFBEcWilSsIcgo2nixoRgp7oG8YTqOF eRbqpeWT7CO2KD4hBI1rMJqSs3FH645mRp1k+8bAP1kJ/fHZ5ZbDiINm+W+mT6V1TzWv1gxdMLW p1qCDlIfY7ZgFJGEWIlrTiypMu+XGskjxIsM3L2EYPfEoVcCgl7BK5De1dRKUxeK8syqzAsIQt8 y6Xq5C5tBO6zF/EPvq5RVUD2dgcFmHAN0iMKqZen6rBlr8/stkHbBQQXOlL0SzYEV35amdWnyeQ CLLEY8+MMTVV3hx/uU/l/SiXdNwKys4M+3vqQIACr3Dwk2H8GOgd0ofQQ7jo8GKQYiuLjsl0EjG YddGJdoAqRuLNaDlQmktoQCmhSIre/1HJ+YoiJrt+Ax0A2krXVfPU9M9lwPTCmbbEq6rlbr+apm IIqM3YVgw= X-Google-Smtp-Source: AGHT+IH3YlclHUvzBeZmjHgHfu13/rjSq09wBftIgqk34vt3aorhDGFF6U+XwbRLbXnplvAK5b40Pg== X-Received: by 2002:a5d:66ce:0:b0:40f:288e:9966 with SMTP id ffacd0b85a97d-40f288e9d15mr10386034f8f.51.1759160760285; Mon, 29 Sep 2025 08:46:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Fabiano Rosas , "Maciej S. Szmigiero" , Richard Henderson , "Michael S. Tsirkin" , Paolo Bonzini , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, Peter Xu Subject: [PATCH 6/6] system/ramblock: Move RAMBlock helpers out of "system/ram_addr.h" Date: Mon, 29 Sep 2025 17:45:29 +0200 Message-ID: <20250929154529.72504-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929154529.72504-1-philmd@linaro.org> References: <20250929154529.72504-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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, T_SPF_TEMPERROR=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 @linaro.org) X-ZM-MESSAGEID: 1759160896029116600 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/system/ram_addr.h | 11 ----------- include/system/ramblock.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h index 53c0c8c3856..6b528338efc 100644 --- a/include/system/ram_addr.h +++ b/include/system/ram_addr.h @@ -80,17 +80,6 @@ static inline bool clear_bmap_test_and_clear(RAMBlock *r= b, uint64_t page) return bitmap_test_and_clear(rb->clear_bmap, page >> shift, 1); } =20 -static inline bool offset_in_ramblock(RAMBlock *b, ram_addr_t offset) -{ - return (b && b->host && offset < b->used_length) ? true : false; -} - -static inline void *ramblock_ptr(RAMBlock *block, ram_addr_t offset) -{ - assert(offset_in_ramblock(block, offset)); - return (char *)block->host + offset; -} - static inline unsigned long int ramblock_recv_bitmap_offset(void *host_add= r, RAMBlock *rb) { diff --git a/include/system/ramblock.h b/include/system/ramblock.h index 57c00e42ca6..1b4092d6322 100644 --- a/include/system/ramblock.h +++ b/include/system/ramblock.h @@ -119,4 +119,15 @@ int ram_block_attributes_state_change(RamBlockAttribut= es *attr, uint64_t offset, */ bool ram_block_is_pmem(RAMBlock *rb); =20 +static inline bool offset_in_ramblock(RAMBlock *b, ram_addr_t offset) +{ + return (b && b->host && offset < b->used_length) ? true : false; +} + +static inline void *ramblock_ptr(RAMBlock *block, ram_addr_t offset) +{ + assert(offset_in_ramblock(block, offset)); + return (char *)block->host + offset; +} + #endif --=20 2.51.0