Commit 9ecc996a authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Stefan Hajnoczi
Browse files

memory: Extract memory_region_msync() from memory_region_writeback() 



Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 20200508062456.23344-3-philmd@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 4dfe59d1

include/exec/memory.h

+12 −1
Original line number Diff line number Diff line
@@ -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_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 or msync for

 * memory_region_writeback: Trigger cache writeback for

 * selected address range

 *

 * @mr: the memory region to be updated

memory.c

+8 −2
Original line number Diff line number Diff line
@@ -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);

    }

}