From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
kvm@vger.kernel.org, "Peter Xu" <peterx@redhat.com>,
"Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Fabiano Rosas" <farosas@suse.de>,
"David Hildenbrand" <david@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 4/6] system/ramblock: Use ram_addr_t in ram_block_discard_guest_memfd_range
Date: Wed, 1 Oct 2025 18:44:54 +0200 [thread overview]
Message-ID: <20251001164456.3230-5-philmd@linaro.org> (raw)
In-Reply-To: <20251001164456.3230-1-philmd@linaro.org>
Rename @start as @offset, since it express an offset within a RAMBlock.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/system/ramblock.h | 3 ++-
system/physmem.c | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/system/ramblock.h b/include/system/ramblock.h
index 530c5a2e4c2..839d8a070c1 100644
--- a/include/system/ramblock.h
+++ b/include/system/ramblock.h
@@ -104,7 +104,8 @@ struct RamBlockAttributes {
};
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, uint64_t offset,
size_t length);
RamBlockAttributes *ram_block_attributes_create(RAMBlock *ram_block);
diff --git a/system/physmem.c b/system/physmem.c
index 3766fae0aba..2bfddb3db52 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -3920,7 +3920,7 @@ err:
return ret;
}
-int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start,
+int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t offset,
size_t length)
{
int ret = -1;
@@ -3928,17 +3928,17 @@ int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start,
#ifdef CONFIG_FALLOCATE_PUNCH_HOLE
/* ignore fd_offset with guest_memfd */
ret = fallocate(rb->guest_memfd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
- start, length);
+ offset, length);
if (ret) {
ret = -errno;
error_report("%s: Failed to fallocate %s:%" PRIx64 " +%zx (%d)",
- __func__, rb->idstr, start, length, ret);
+ __func__, rb->idstr, offset, length, ret);
}
#else
ret = -ENOSYS;
error_report("%s: fallocate not available %s:%" PRIx64 " +%zx (%d)",
- __func__, rb->idstr, start, length, ret);
+ __func__, rb->idstr, offset, length, ret);
#endif
return ret;
--
2.51.0
next prev parent reply other threads:[~2025-10-01 16:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-01 16:44 [PATCH v2 0/6] system/ramblock: Sanitize header Philippe Mathieu-Daudé
2025-10-01 16:44 ` [PATCH v2 1/6] system/ramblock: Remove obsolete comment Philippe Mathieu-Daudé
2025-10-01 21:02 ` Richard Henderson
2025-10-01 16:44 ` [PATCH v2 2/6] system/ramblock: Move ram_block_is_pmem() declaration Philippe Mathieu-Daudé
2025-10-01 21:03 ` Richard Henderson
2025-10-01 16:44 ` [PATCH v2 3/6] system/ramblock: Move ram_block_discard_*_range() declarations Philippe Mathieu-Daudé
2025-10-01 21:04 ` Richard Henderson
2025-10-01 16:44 ` Philippe Mathieu-Daudé [this message]
2025-10-01 21:05 ` [PATCH v2 4/6] system/ramblock: Use ram_addr_t in ram_block_discard_guest_memfd_range Richard Henderson
2025-10-01 16:44 ` [PATCH v2 5/6] system/ramblock: Use ram_addr_t in ram_block_discard_range() Philippe Mathieu-Daudé
2025-10-01 21:05 ` Richard Henderson
2025-10-01 16:44 ` [PATCH v2 6/6] system/ramblock: Move RAMBlock helpers out of "system/ram_addr.h" Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251001164456.3230-5-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=david@redhat.com \
--cc=farosas@suse.de \
--cc=kvm@vger.kernel.org \
--cc=maciej.szmigiero@oracle.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).