Message ID | 1387293974-24718-31-git-send-email-quintela@redhat.com |
---|---|
State | New |
Headers | show |
On 12/17/2013 05:26 PM, Juan Quintela wrote: > All the functions that use ram_addr_t should be here. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > cputlb.c | 1 + > exec.c | 1 + > include/exec/memory-internal.h | 76 -------------------------------- > include/exec/ram_addr.h | 98 ++++++++++++++++++++++++++++++++++++++++++ > memory.c | 1 + > 5 files changed, 101 insertions(+), 76 deletions(-) > create mode 100644 include/exec/ram_addr.h > > diff --git a/cputlb.c b/cputlb.c > index a5805e1..a1e8421 100644 > --- a/cputlb.c > +++ b/cputlb.c > @@ -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 > diff --git a/exec.c b/exec.c > index d165fd8..be421e5 100644 > --- a/exec.c > +++ b/exec.c > @@ -50,6 +50,7 @@ > #include "translate-all.h" > > #include "exec/memory-internal.h" > +#include "exec/ram_addr.h" > > #include "qemu/range.h" > > diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h > index cb2249f..25c43c0 100644 > --- a/include/exec/memory-internal.h > +++ b/include/exec/memory-internal.h > @@ -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 > diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h > new file mode 100644 > index 0000000..db977fb > --- /dev/null > +++ b/include/exec/ram_addr.h > @@ -0,0 +1,98 @@ > +/* > + * 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 > diff --git a/memory.c b/memory.c > index c010296..59ecc28 100644 > --- a/memory.c > +++ b/memory.c > @@ -22,6 +22,7 @@ > #include <assert.h> > > #include "exec/memory-internal.h" > +#include "exec/ram_addr.h" > > //#define DEBUG_UNASSIGNED > Reviewed-by: Orit Wasserman <owasserm@redhat.com>
diff --git a/cputlb.c b/cputlb.c index a5805e1..a1e8421 100644 --- a/cputlb.c +++ b/cputlb.c @@ -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 diff --git a/exec.c b/exec.c index d165fd8..be421e5 100644 --- a/exec.c +++ b/exec.c @@ -50,6 +50,7 @@ #include "translate-all.h" #include "exec/memory-internal.h" +#include "exec/ram_addr.h" #include "qemu/range.h" diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index cb2249f..25c43c0 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -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 diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h new file mode 100644 index 0000000..db977fb --- /dev/null +++ b/include/exec/ram_addr.h @@ -0,0 +1,98 @@ +/* + * 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 diff --git a/memory.c b/memory.c index c010296..59ecc28 100644 --- a/memory.c +++ b/memory.c @@ -22,6 +22,7 @@ #include <assert.h> #include "exec/memory-internal.h" +#include "exec/ram_addr.h" //#define DEBUG_UNASSIGNED
All the functions that use ram_addr_t should be here. Signed-off-by: Juan Quintela <quintela@redhat.com> --- cputlb.c | 1 + exec.c | 1 + include/exec/memory-internal.h | 76 -------------------------------- include/exec/ram_addr.h | 98 ++++++++++++++++++++++++++++++++++++++++++ memory.c | 1 + 5 files changed, 101 insertions(+), 76 deletions(-) create mode 100644 include/exec/ram_addr.h