target/riscv: rationalise softfloat includes

[qemu.git] / exec.c

diff --git a/exec.c b/exec.c
index 50ea9c5aaa8f2ad732793b91625194f781e8e24f..4aaa14b075fe522259a428c9a6473a655abc9702 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -42,11 +42,10 @@
 #if defined(CONFIG_USER_ONLY)
 #include "qemu.h"
 #else /* !CONFIG_USER_ONLY */
 #if defined(CONFIG_USER_ONLY)
 #include "qemu.h"
 #else /* !CONFIG_USER_ONLY */

-#include "hw/hw.h"

 #include "exec/memory.h"
 #include "exec/ioport.h"
 #include "sysemu/dma.h"
 #include "exec/memory.h"
 #include "exec/ioport.h"
 #include "sysemu/dma.h"

-#include "sysemu/numa.h"
+#include "sysemu/hostmem.h"

 #include "sysemu/hw_accel.h"
 #include "exec/address-spaces.h"
 #include "sysemu/xen-mapcache.h"
 #include "sysemu/hw_accel.h"
 #include "exec/address-spaces.h"
 #include "sysemu/xen-mapcache.h"


@@ -1358,6 +1357,8 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
     DirtyMemoryBlocks *blocks;
     unsigned long end, page;
     bool dirty = false;
     DirtyMemoryBlocks *blocks;
     unsigned long end, page;
     bool dirty = false;

+    RAMBlock *ramblock;
+    uint64_t mr_offset, mr_size;

 
     if (length == 0) {
         return false;
 
     if (length == 0) {
         return false;


@@ -1369,6 +1370,10 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
     rcu_read_lock();
 
     blocks = atomic_rcu_read(&ram_list.dirty_memory[client]);
     rcu_read_lock();
 
     blocks = atomic_rcu_read(&ram_list.dirty_memory[client]);

+    ramblock = qemu_get_ram_block(start);
+    /* Range sanity check on the ramblock */
+    assert(start >= ramblock->offset &&
+           start + length <= ramblock->offset + ramblock->used_length);

 
     while (page < end) {
         unsigned long idx = page / DIRTY_MEMORY_BLOCK_SIZE;
 
     while (page < end) {
         unsigned long idx = page / DIRTY_MEMORY_BLOCK_SIZE;


@@ -1380,6 +1385,10 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
         page += num;
     }
 
         page += num;
     }
 

+    mr_offset = (ram_addr_t)(page << TARGET_PAGE_BITS) - ramblock->offset;
+    mr_size = (end - page) << TARGET_PAGE_BITS;
+    memory_region_clear_dirty_bitmap(ramblock->mr, mr_offset, mr_size);
+

     rcu_read_unlock();
 
     if (dirty && tcg_enabled()) {
     rcu_read_unlock();
 
     if (dirty && tcg_enabled()) {


@@ -1390,9 +1399,10 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
 }
 
 DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
 }
 
 DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty

-     (ram_addr_t start, ram_addr_t length, unsigned client)
+    (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client)

 {
     DirtyMemoryBlocks *blocks;
 {
     DirtyMemoryBlocks *blocks;

+    ram_addr_t start = memory_region_get_ram_addr(mr) + offset;

     unsigned long align = 1UL << (TARGET_PAGE_BITS + BITS_PER_LEVEL);
     ram_addr_t first = QEMU_ALIGN_DOWN(start, align);
     ram_addr_t last  = QEMU_ALIGN_UP(start + length, align);
     unsigned long align = 1UL << (TARGET_PAGE_BITS + BITS_PER_LEVEL);
     ram_addr_t first = QEMU_ALIGN_DOWN(start, align);
     ram_addr_t last  = QEMU_ALIGN_UP(start + length, align);


@@ -1434,6 +1444,8 @@ DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
         tlb_reset_dirty_range_all(start, length);
     }
 
         tlb_reset_dirty_range_all(start, length);
     }
 

+    memory_region_clear_dirty_bitmap(mr, offset, length);
+

     return snap;
 }
 
     return snap;
 }