ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RAMBlocks: Store page size 

Store the page size in each RAMBlock, we need it later.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2016-09-29 20:09:37 +01:00 committed by Juan Quintela
parent 2ebeaec012
commit 863e9621c5
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
exec.c
View File

@ -1199,7 +1199,6 @@ static void *file_ram_alloc(RAMBlock *block,
char *c; char *c;
void *area = MAP_FAILED; void *area = MAP_FAILED;
int fd = -1; int fd = -1;
int64_t page_size;
if (kvm_enabled() && !kvm_has_sync_mmu()) { if (kvm_enabled() && !kvm_has_sync_mmu()) {
error_setg(errp, error_setg(errp,
@ -1254,17 +1253,17 @@ static void *file_ram_alloc(RAMBlock *block,
*/ */
} }
page_size = qemu_fd_getpagesize(fd); block->page_size = qemu_fd_getpagesize(fd);
block->mr->align = MAX(page_size, QEMU_VMALLOC_ALIGN); block->mr->align = MAX(block->page_size, QEMU_VMALLOC_ALIGN);
if (memory < page_size) { if (memory < block->page_size) {
error_setg(errp, "memory size 0x" RAM_ADDR_FMT " must be equal to " error_setg(errp, "memory size 0x" RAM_ADDR_FMT " must be equal to "
"or larger than page size 0x%" PRIx64, "or larger than page size 0x%zx",
memory, page_size); memory, block->page_size);
goto error; goto error;
} }
memory = ROUND_UP(memory, page_size); memory = ROUND_UP(memory, block->page_size);
/* /*
* ftruncate is not supported by hugetlbfs in older * ftruncate is not supported by hugetlbfs in older
@ -1419,6 +1418,11 @@ void qemu_ram_unset_idstr(RAMBlock *block)
} }
} }
size_t qemu_ram_pagesize(RAMBlock *rb)
{
return rb->page_size;
}
static int memory_try_enable_merging(void *addr, size_t len) static int memory_try_enable_merging(void *addr, size_t len)
{ {
if (!machine_mem_merge(current_machine)) { if (!machine_mem_merge(current_machine)) {
@ -1658,6 +1662,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
new_block->max_length = max_size; new_block->max_length = max_size;
assert(max_size >= size); assert(max_size >= size);
new_block->fd = -1; new_block->fd = -1;
new_block->page_size = getpagesize();
new_block->host = host; new_block->host = host;
if (host) { if (host) {
new_block->flags |= RAM_PREALLOC; new_block->flags |= RAM_PREALLOC;

1
include/exec/cpu-common.h
View File

@ -63,6 +63,7 @@ RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset,
void qemu_ram_set_idstr(RAMBlock *block, const char *name, DeviceState *dev); void qemu_ram_set_idstr(RAMBlock *block, const char *name, DeviceState *dev);
void qemu_ram_unset_idstr(RAMBlock *block); void qemu_ram_unset_idstr(RAMBlock *block);
const char *qemu_ram_get_idstr(RAMBlock *rb); const char *qemu_ram_get_idstr(RAMBlock *rb);
size_t qemu_ram_pagesize(RAMBlock *block);
void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf, void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,
int len, int is_write); int len, int is_write);

1
include/exec/ram_addr.h
View File

@ -36,6 +36,7 @@ struct RAMBlock {
/* RCU-enabled, writes protected by the ramlist lock */ /* RCU-enabled, writes protected by the ramlist lock */
QLIST_ENTRY(RAMBlock) next; QLIST_ENTRY(RAMBlock) next;
int fd; int fd;
size_t page_size;
}; };
static inline bool offset_in_ramblock(RAMBlock *b, ram_addr_t offset) static inline bool offset_in_ramblock(RAMBlock *b, ram_addr_t offset)