memory: obsolete cpu_physical_memory_[gs]et_dirty_tracking() The getter is no longer used, so it is completely removed. Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
diff --git a/arch_init.c b/arch_init.c index de1886b..66f7a3f 100644 --- a/arch_init.c +++ b/arch_init.c
@@ -251,7 +251,7 @@ int ret; if (stage < 0) { - cpu_physical_memory_set_dirty_tracking(0); + memory_global_dirty_log_stop(); return 0; } @@ -274,8 +274,7 @@ } } - /* Enable dirty memory tracking */ - cpu_physical_memory_set_dirty_tracking(1); + memory_global_dirty_log_start(); qemu_put_be64(f, ram_bytes_total() | RAM_SAVE_FLAG_MEM_SIZE); @@ -320,7 +319,7 @@ while ((bytes_sent = ram_save_block(f)) != 0) { bytes_transferred += bytes_sent; } - cpu_physical_memory_set_dirty_tracking(0); + memory_global_dirty_log_stop(); } qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
diff --git a/cpu-all.h b/cpu-all.h index 4acaa8b..2fdb856 100644 --- a/cpu-all.h +++ b/cpu-all.h
@@ -566,10 +566,6 @@ int dirty_flags); void cpu_tlb_update_dirty(CPUState *env); -int cpu_physical_memory_set_dirty_tracking(int enable); - -int cpu_physical_memory_get_dirty_tracking(void); - void dump_exec_info(FILE *f, fprintf_function cpu_fprintf); #endif /* !CONFIG_USER_ONLY */
diff --git a/exec-obsolete.h b/exec-obsolete.h index 3a2faae..880105e 100644 --- a/exec-obsolete.h +++ b/exec-obsolete.h
@@ -61,6 +61,8 @@ void qemu_register_coalesced_mmio(target_phys_addr_t addr, ram_addr_t size); void qemu_unregister_coalesced_mmio(target_phys_addr_t addr, ram_addr_t size); +int cpu_physical_memory_set_dirty_tracking(int enable); + #endif #endif
diff --git a/exec.c b/exec.c index a4116d9..28c057c 100644 --- a/exec.c +++ b/exec.c
@@ -2008,19 +2008,9 @@ { int ret = 0; in_migration = enable; - if (enable) { - memory_global_dirty_log_start(); - } else { - memory_global_dirty_log_stop(); - } return ret; } -int cpu_physical_memory_get_dirty_tracking(void) -{ - return in_migration; -} - static inline void tlb_update_dirty(CPUTLBEntry *tlb_entry) { ram_addr_t ram_addr;
diff --git a/memory.c b/memory.c index f7b3d50..868ffd0 100644 --- a/memory.c +++ b/memory.c
@@ -1493,6 +1493,7 @@ { MemoryListener *listener; + cpu_physical_memory_set_dirty_tracking(1); global_dirty_log = true; QLIST_FOREACH(listener, &memory_listeners, link) { listener->log_global_start(listener); @@ -1507,6 +1508,7 @@ QLIST_FOREACH(listener, &memory_listeners, link) { listener->log_global_stop(listener); } + cpu_physical_memory_set_dirty_tracking(0); } static void listener_add_address_space(MemoryListener *listener,