[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/11] memory: Extract memory_region_msync() from memory_region_wr
From: |
Stefan Hajnoczi |
Subject: |
[PULL 08/11] memory: Extract memory_region_msync() from memory_region_writeback() |
Date: |
Fri, 5 Jun 2020 10:47:47 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20200508062456.23344-3-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
include/exec/memory.h | 13 ++++++++++++-
memory.c | 10 ++++++++--
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 1b7cfdd5b6..3e00cdbbfa 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -1473,8 +1473,19 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr);
*/
void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize,
Error **errp);
+
/**
- * memory_region_writeback: Trigger cache writeback or msync for
+ * memory_region_msync: Synchronize selected address range of
+ * a memory mapped region
+ *
+ * @mr: the memory region to be msync
+ * @addr: the initial address of the range to be sync
+ * @size: the size of the range to be sync
+ */
+void memory_region_msync(MemoryRegion *mr, hwaddr addr, hwaddr size);
+
+/**
+ * memory_region_writeback: Trigger cache writeback for
* selected address range
*
* @mr: the memory region to be updated
diff --git a/memory.c b/memory.c
index bb84334e1e..93febe4759 100644
--- a/memory.c
+++ b/memory.c
@@ -2197,6 +2197,12 @@ void memory_region_ram_resize(MemoryRegion *mr,
ram_addr_t newsize, Error **errp
qemu_ram_resize(mr->ram_block, newsize, errp);
}
+void memory_region_msync(MemoryRegion *mr, hwaddr addr, hwaddr size)
+{
+ if (mr->ram_block) {
+ qemu_ram_writeback(mr->ram_block, addr, size);
+ }
+}
void memory_region_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size)
{
@@ -2204,8 +2210,8 @@ void memory_region_writeback(MemoryRegion *mr, hwaddr
addr, hwaddr size)
* Might be extended case needed to cover
* different types of memory regions
*/
- if (mr->ram_block && mr->dirty_log_mask) {
- qemu_ram_writeback(mr->ram_block, addr, size);
+ if (mr->dirty_log_mask) {
+ memory_region_msync(mr, addr, size);
}
}
--
2.25.4
- [PULL 00/11] Block patches, Stefan Hajnoczi, 2020/06/05
- [PULL 01/11] io_uring: retry io_uring_submit() if it fails with errno=EINTR, Stefan Hajnoczi, 2020/06/05
- [PULL 02/11] io_uring: use io_uring_cq_ready() to check for ready cqes, Stefan Hajnoczi, 2020/06/05
- [PULL 03/11] fuzz: add datadir for oss-fuzz compatability, Stefan Hajnoczi, 2020/06/05
- [PULL 04/11] fuzz: fix typo in i440fx-qtest-reboot arguments, Stefan Hajnoczi, 2020/06/05
- [PULL 05/11] fuzz: add mangled object name to linker script, Stefan Hajnoczi, 2020/06/05
- [PULL 06/11] fuzz: run the main-loop in fork-server process, Stefan Hajnoczi, 2020/06/05
- [PULL 08/11] memory: Extract memory_region_msync() from memory_region_writeback(),
Stefan Hajnoczi <=
- [PULL 07/11] memory: Rename memory_region_do_writeback -> memory_region_writeback, Stefan Hajnoczi, 2020/06/05
- [PULL 09/11] hw/block: Let the NVMe emulated device be target-agnostic, Stefan Hajnoczi, 2020/06/05
- [PULL 10/11] exec: Rename qemu_ram_writeback() as qemu_ram_msync(), Stefan Hajnoczi, 2020/06/05
- [PULL 11/11] block: Factor out bdrv_run_co(), Stefan Hajnoczi, 2020/06/05
- Re: [PULL 00/11] Block patches, Peter Maydell, 2020/06/05