Commit 220c3ebd authored by Juan Quintela's avatar Juan Quintela
Browse files

memory: split cpu_physical_memory_* functions to its own include 



All the functions that use ram_addr_t should be here.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarOrit Wasserman <owasserm@redhat.com>
parent 981fdf23

cputlb.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "exec/cputlb.h"



#include "exec/memory-internal.h"

#include "exec/ram_addr.h"



//#define DEBUG_TLB

//#define DEBUG_TLB_CHECK

exec.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "translate-all.h"



#include "exec/memory-internal.h"

#include "exec/ram_addr.h"

#include "qemu/cache-utils.h"



#include "qemu/range.h"

include/exec/memory-internal.h

+0 −76
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
#define MEMORY_INTERNAL_H



#ifndef CONFIG_USER_ONLY

#include "hw/xen/xen.h"





typedef struct AddressSpaceDispatch AddressSpaceDispatch;



void address_space_init_dispatch(AddressSpace *as);
@@ -33,78 +30,5 @@ extern const MemoryRegionOps unassigned_mem_ops; 
bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr,

                                unsigned size, bool is_write);



ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,

                                   MemoryRegion *mr);

ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr);

void *qemu_get_ram_ptr(ram_addr_t addr);

void qemu_ram_free(ram_addr_t addr);

void qemu_ram_free_from_ptr(ram_addr_t addr);



static inline bool cpu_physical_memory_get_dirty(ram_addr_t start,

                                                 ram_addr_t length,

                                                 unsigned client)

{

    unsigned long end, page, next;



    assert(client < DIRTY_MEMORY_NUM);



    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

    page = start >> TARGET_PAGE_BITS;

    next = find_next_bit(ram_list.dirty_memory[client], end, page);



    return next < end;

}



static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,

                                                      unsigned client)

{

    return cpu_physical_memory_get_dirty(addr, 1, client);

}



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);

}



static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,

                                                      unsigned client)

{

    assert(client < DIRTY_MEMORY_NUM);

    set_bit(addr >> TARGET_PAGE_BITS, ram_list.dirty_memory[client]);

}



static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,

                                                       ram_addr_t length)

{

    unsigned long end, page;



    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

    page = start >> TARGET_PAGE_BITS;

    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION], page, end - page);

    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_VGA], page, end - page);

    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_CODE], page, end - page);

    xen_modified_memory(start, length);

}



static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start,

                                                         ram_addr_t length,

                                                         unsigned client)

{

    unsigned long end, page;



    assert(client < DIRTY_MEMORY_NUM);

    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

    page = start >> TARGET_PAGE_BITS;

    bitmap_clear(ram_list.dirty_memory[client], page, end - page);

}



void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t length,

                                     unsigned client);



#endif



#endif

include/exec/ram_addr.h

0 → 100644
+98 −0
Original line number Diff line number Diff line 
/*

 * Declarations for cpu physical memory functions

 *

 * Copyright 2011 Red Hat, Inc. and/or its affiliates

 *

 * Authors:

 *  Avi Kivity <avi@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or

 * later.  See the COPYING file in the top-level directory.

 *

 */



/*

 * This header is for use by exec.c and memory.c ONLY.  Do not include it.

 * The functions declared here will be removed soon.

 */



#ifndef RAM_ADDR_H

#define RAM_ADDR_H



#ifndef CONFIG_USER_ONLY

#include "hw/xen/xen.h"



ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,

                                   MemoryRegion *mr);

ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr);

void *qemu_get_ram_ptr(ram_addr_t addr);

void qemu_ram_free(ram_addr_t addr);

void qemu_ram_free_from_ptr(ram_addr_t addr);



static inline bool cpu_physical_memory_get_dirty(ram_addr_t start,

                                                 ram_addr_t length,

                                                 unsigned client)

{

    unsigned long end, page, next;



    assert(client < DIRTY_MEMORY_NUM);



    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

    page = start >> TARGET_PAGE_BITS;

    next = find_next_bit(ram_list.dirty_memory[client], end, page);



    return next < end;

}



static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,

                                                      unsigned client)

{

    return cpu_physical_memory_get_dirty(addr, 1, client);

}



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);

}



static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,

                                                      unsigned client)

{

    assert(client < DIRTY_MEMORY_NUM);

    set_bit(addr >> TARGET_PAGE_BITS, ram_list.dirty_memory[client]);

}



static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,

                                                       ram_addr_t length)

{

    unsigned long end, page;



    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

    page = start >> TARGET_PAGE_BITS;

    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION], page, end - page);

    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_VGA], page, end - page);

    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_CODE], page, end - page);

    xen_modified_memory(start, length);

}



static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start,

                                                         ram_addr_t length,

                                                         unsigned client)

{

    unsigned long end, page;



    assert(client < DIRTY_MEMORY_NUM);

    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

    page = start >> TARGET_PAGE_BITS;

    bitmap_clear(ram_list.dirty_memory[client], page, end - page);

}



void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t length,

                                     unsigned client);



#endif

#endif

memory.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <assert.h>



#include "exec/memory-internal.h"

#include "exec/ram_addr.h"



//#define DEBUG_UNASSIGNED