memory: s/dirty/clean/ in cpu_physical_memory_is_dirty()
All uses except one really want the other meaning. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Orit Wasserman <owasserm@redhat.com>
This commit is contained in:
		
							parent
							
								
									a461e389f4
								
							
						
					
					
						commit
						a2cd8c852d
					
				
							
								
								
									
										3
									
								
								cputlb.c
								
								
								
								
							
							
						
						
									
										3
									
								
								cputlb.c
								
								
								
								
							| 
						 | 
				
			
			@ -284,7 +284,8 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr,
 | 
			
		|||
            /* Write access calls the I/O callback.  */
 | 
			
		||||
            te->addr_write = address | TLB_MMIO;
 | 
			
		||||
        } else if (memory_region_is_ram(section->mr)
 | 
			
		||||
                   && !cpu_physical_memory_is_dirty(section->mr->ram_addr + xlat)) {
 | 
			
		||||
                   && cpu_physical_memory_is_clean(section->mr->ram_addr
 | 
			
		||||
                                                   + xlat)) {
 | 
			
		||||
            te->addr_write = address | TLB_NOTDIRTY;
 | 
			
		||||
        } else {
 | 
			
		||||
            te->addr_write = address;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										6
									
								
								exec.c
								
								
								
								
							
							
						
						
									
										6
									
								
								exec.c
								
								
								
								
							| 
						 | 
				
			
			@ -1514,7 +1514,7 @@ static void notdirty_mem_write(void *opaque, hwaddr ram_addr,
 | 
			
		|||
    cpu_physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_VGA);
 | 
			
		||||
    /* we remove the notdirty callback only if the code has been
 | 
			
		||||
       flushed */
 | 
			
		||||
    if (cpu_physical_memory_is_dirty(ram_addr)) {
 | 
			
		||||
    if (!cpu_physical_memory_is_clean(ram_addr)) {
 | 
			
		||||
        CPUArchState *env = current_cpu->env_ptr;
 | 
			
		||||
        tlb_set_dirty(env, env->mem_io_vaddr);
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			@ -1917,7 +1917,7 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,
 | 
			
		|||
static void invalidate_and_set_dirty(hwaddr addr,
 | 
			
		||||
                                     hwaddr length)
 | 
			
		||||
{
 | 
			
		||||
    if (!cpu_physical_memory_is_dirty(addr)) {
 | 
			
		||||
    if (cpu_physical_memory_is_clean(addr)) {
 | 
			
		||||
        /* invalidate code */
 | 
			
		||||
        tb_invalidate_phys_page_range(addr, addr + length, 0);
 | 
			
		||||
        /* set dirty bit */
 | 
			
		||||
| 
						 | 
				
			
			@ -2533,7 +2533,7 @@ void stl_phys_notdirty(hwaddr addr, uint32_t val)
 | 
			
		|||
        stl_p(ptr, val);
 | 
			
		||||
 | 
			
		||||
        if (unlikely(in_migration)) {
 | 
			
		||||
            if (!cpu_physical_memory_is_dirty(addr1)) {
 | 
			
		||||
            if (cpu_physical_memory_is_clean(addr1)) {
 | 
			
		||||
                /* invalidate code */
 | 
			
		||||
                tb_invalidate_phys_page_range(addr1, addr1 + 4, 0);
 | 
			
		||||
                /* set dirty bit */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -61,14 +61,13 @@ static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,
 | 
			
		|||
    return cpu_physical_memory_get_dirty(addr, 1, client);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* read dirty bit (return 0 or 1) */
 | 
			
		||||
static inline bool cpu_physical_memory_is_dirty(ram_addr_t addr)
 | 
			
		||||
static inline bool cpu_physical_memory_is_clean(ram_addr_t addr)
 | 
			
		||||
{
 | 
			
		||||
    bool vga = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA);
 | 
			
		||||
    bool code = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE);
 | 
			
		||||
    bool migration =
 | 
			
		||||
        cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);
 | 
			
		||||
    return vga && code && migration;
 | 
			
		||||
    return !(vga && code && migration);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue