From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Beata Michalska" <beata.michalska@linaro.org>,
qemu-block@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
qemu-arm@nongnu.org, "Stefan Hajnoczi" <stefanha@redhat.com>,
"Keith Busch" <kbusch@kernel.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v2 4/4] exec: Rename qemu_ram_writeback() as qemu_ram_msync()
Date: Mon, 11 May 2020 10:17:19 +0200 [thread overview]
Message-ID: <20200511081719.31641-5-philmd@redhat.com> (raw)
In-Reply-To: <20200511081719.31641-1-philmd@redhat.com>
Rename qemu_ram_writeback() as qemu_ram_msync() to better
match what it does.
Suggested-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/exec/ram_addr.h | 4 ++--
exec.c | 2 +-
memory.c | 3 +--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index a94809f89b..84817e19fa 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -136,12 +136,12 @@ void qemu_ram_free(RAMBlock *block);
int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp);
-void qemu_ram_writeback(RAMBlock *block, ram_addr_t start, ram_addr_t length);
+void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length);
/* Clear whole block of mem */
static inline void qemu_ram_block_writeback(RAMBlock *block)
{
- qemu_ram_writeback(block, 0, block->used_length);
+ qemu_ram_msync(block, 0, block->used_length);
}
#define DIRTY_CLIENTS_ALL ((1 << DIRTY_MEMORY_NUM) - 1)
diff --git a/exec.c b/exec.c
index 2874bb5088..f5a8cdf370 100644
--- a/exec.c
+++ b/exec.c
@@ -2127,7 +2127,7 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
* Otherwise no-op.
* @Note: this is supposed to be a synchronous op.
*/
-void qemu_ram_writeback(RAMBlock *block, ram_addr_t start, ram_addr_t length)
+void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length)
{
/* The requested range should fit in within the block range */
g_assert((start + length) <= block->used_length);
diff --git a/memory.c b/memory.c
index 73534b26f4..5bfa1429df 100644
--- a/memory.c
+++ b/memory.c
@@ -2197,7 +2197,6 @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp
qemu_ram_resize(mr->ram_block, newsize, errp);
}
-
void memory_region_sync(MemoryRegion *mr, hwaddr addr, hwaddr size)
{
/*
@@ -2205,7 +2204,7 @@ void memory_region_sync(MemoryRegion *mr, hwaddr addr, hwaddr size)
* different types of memory regions
*/
if (mr->ram_block) {
- qemu_ram_writeback(mr->ram_block, addr, size);
+ qemu_ram_msync(mr->ram_block, addr, size);
}
}
--
2.21.3
next prev parent reply other threads:[~2020-05-11 8:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 8:17 [PATCH v2 0/4] memory: Add memory_region_sync() & make NVMe emulated device generic Philippe Mathieu-Daudé
2020-05-11 8:17 ` [PATCH v2 1/4] memory: Simplify memory_region_do_writeback() Philippe Mathieu-Daudé
2020-05-11 8:17 ` [PATCH v2 2/4] memory: Rename memory_region_do_writeback() -> memory_region_sync() Philippe Mathieu-Daudé
2020-05-11 8:17 ` [PATCH v2 3/4] hw/block: Let the NVMe emulated device be target-agnostic Philippe Mathieu-Daudé
2020-05-11 8:17 ` Philippe Mathieu-Daudé [this message]
2020-05-11 9:50 ` [PATCH v2 4/4] exec: Rename qemu_ram_writeback() as qemu_ram_msync() Stefan Hajnoczi
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=20200511081719.31641-5-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=beata.michalska@linaro.org \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=stefanha@redhat.com \
/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).