Commit cbfc0171 authored by Junyan He's avatar Junyan He Committed by Michael S. Tsirkin
Browse files

memory, exec: switch file ram allocation functions to 'flags' parameters 



As more flag parameters besides the existing 'share' are going to be
added to following functions
memory_region_init_ram_from_file
qemu_ram_alloc_from_fd
qemu_ram_alloc_from_file
let's switch them to use the 'flags' parameters so as to ease future
flag additions.

The existing 'share' flag is converted to the RAM_SHARED bit in ram_flags,
and other flag bits are ignored by above functions right now.

Signed-off-by: default avatarJunyan He <junyan.he@intel.com>
Signed-off-by: default avatarHaozhong Zhang <haozhong.zhang@intel.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent b0e5de93

backends/hostmem-file.c

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
        path = object_get_canonical_path(OBJECT(backend));

        memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),

                                 path,

                                 backend->size, fb->align, backend->share,

                                 backend->size, fb->align,

                                 backend->share ? RAM_SHARED : 0,

                                 fb->mem_path, errp);

        g_free(path);

    }

exec.c

+5 −5
Original line number Diff line number Diff line
@@ -2238,7 +2238,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared) 


#ifdef __linux__

RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,

                                 bool share, int fd,

                                 uint32_t ram_flags, int fd,

                                 Error **errp)

{

    RAMBlock *new_block;
@@ -2280,14 +2280,14 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, 
    new_block->mr = mr;

    new_block->used_length = size;

    new_block->max_length = size;

    new_block->flags = share ? RAM_SHARED : 0;

    new_block->flags = ram_flags;

    new_block->host = file_ram_alloc(new_block, size, fd, !file_size, errp);

    if (!new_block->host) {

        g_free(new_block);

        return NULL;

    }



    ram_block_add(new_block, &local_err, share);

    ram_block_add(new_block, &local_err, ram_flags & RAM_SHARED);

    if (local_err) {

        g_free(new_block);

        error_propagate(errp, local_err);
@@ -2299,7 +2299,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, 




RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,

                                   bool share, const char *mem_path,

                                   uint32_t ram_flags, const char *mem_path,

                                   Error **errp)

{

    int fd;
@@ -2311,7 +2311,7 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, 
        return NULL;

    }



    block = qemu_ram_alloc_from_fd(size, mr, share, fd, errp);

    block = qemu_ram_alloc_from_fd(size, mr, ram_flags, fd, errp);

    if (!block) {

        if (created) {

            unlink(mem_path);

include/exec/memory.h

+5 −2
Original line number Diff line number Diff line
@@ -640,6 +640,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr, 
                                                       void *host),

                                       Error **errp);

#ifdef __linux__



/**

 * memory_region_init_ram_from_file:  Initialize RAM memory region with a

 *                                    mmap-ed backend.
@@ -651,7 +652,9 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr, 
 * @size: size of the region.

 * @align: alignment of the region base address; if 0, the default alignment

 *         (getpagesize()) will be used.

 * @share: %true if memory must be mmaped with the MAP_SHARED flag

 * @ram_flags: Memory region features:

 *             - RAM_SHARED: memory must be mmaped with the MAP_SHARED flag

 *             Other bits are ignored now.

 * @path: the path in which to allocate the RAM.

 * @errp: pointer to Error*, to store an error if it happens.

 *
@@ -663,7 +666,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, 
                                      const char *name,

                                      uint64_t size,

                                      uint64_t align,

                                      bool share,

                                      uint32_t ram_flags,

                                      const char *path,

                                      Error **errp);

include/exec/ram_addr.h

+23 −2
Original line number Diff line number Diff line
@@ -71,12 +71,33 @@ static inline unsigned long int ramblock_recv_bitmap_offset(void *host_addr, 
}



long qemu_getrampagesize(void);



/**

 * qemu_ram_alloc_from_file,

 * qemu_ram_alloc_from_fd:  Allocate a ram block from the specified backing

 *                          file or device

 *

 * Parameters:

 *  @size: the size in bytes of the ram block

 *  @mr: the memory region where the ram block is

 *  @ram_flags: specify the properties of the ram block, which can be one

 *              or bit-or of following values

 *              - RAM_SHARED: mmap the backing file or device with MAP_SHARED

 *              Other bits are ignored.

 *  @mem_path or @fd: specify the backing file or device

 *  @errp: pointer to Error*, to store an error if it happens

 *

 * Return:

 *  On success, return a pointer to the ram block.

 *  On failure, return NULL.

 */

RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,

                                   bool share, const char *mem_path,

                                   uint32_t ram_flags, const char *mem_path,

                                   Error **errp);

RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,

                                 bool share, int fd,

                                 uint32_t ram_flags, int fd,

                                 Error **errp);



RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,

                                  MemoryRegion *mr, Error **errp);

RAMBlock *qemu_ram_alloc(ram_addr_t size, bool share, MemoryRegion *mr,

memory.c

+5 −3
Original line number Diff line number Diff line
@@ -1551,7 +1551,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, 
                                      const char *name,

                                      uint64_t size,

                                      uint64_t align,

                                      bool share,

                                      uint32_t ram_flags,

                                      const char *path,

                                      Error **errp)

{
@@ -1560,7 +1560,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, 
    mr->terminates = true;

    mr->destructor = memory_region_destructor_ram;

    mr->align = align;

    mr->ram_block = qemu_ram_alloc_from_file(size, mr, share, path, errp);

    mr->ram_block = qemu_ram_alloc_from_file(size, mr, ram_flags, path, errp);

    mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;

}
@@ -1576,7 +1576,9 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, 
    mr->ram = true;

    mr->terminates = true;

    mr->destructor = memory_region_destructor_ram;

    mr->ram_block = qemu_ram_alloc_from_fd(size, mr, share, fd, errp);

    mr->ram_block = qemu_ram_alloc_from_fd(size, mr,

                                           share ? RAM_SHARED : 0,

                                           fd, errp);

    mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;

}

#endif