Commit 86100290 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Paolo Bonzini
Browse files

hostmem: no need to check for host_memory_backend_mr_inited() in alloc() 



memfd_backend_memory_alloc/file_backend_memory_alloc both needlessly
are are calling host_memory_backend_mr_inited() which creates an
illusion that alloc could be called multiple times but it isn't, it's
called once from UserCreatable complete().

Suggested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 36ea3979

backends/hostmem-file.c

+12 −12
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ static void 
file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)

{

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(backend);

#ifdef CONFIG_POSIX

    gchar *path;

#endif



    if (!backend->size) {

        error_setg(errp, "can't create backend with size 0");
@@ -54,8 +57,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
#ifndef CONFIG_POSIX

    error_setg(errp, "-mem-path not supported on this host");

#else

    if (!host_memory_backend_mr_inited(backend)) {

        gchar *path;

    backend->force_prealloc = mem_prealloc;

    path = object_get_canonical_path(OBJECT(backend));

    memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),
@@ -65,7 +66,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
                                     (fb->is_pmem ? RAM_PMEM : 0),

                                     fb->mem_path, errp);

    g_free(path);

    }

#endif

}

backends/hostmem-memfd.c

+0 −4
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
        return;

    }



    if (host_memory_backend_mr_inited(backend)) {

        return;

    }



    backend->force_prealloc = mem_prealloc;

    fd = qemu_memfd_create(TYPE_MEMORY_BACKEND_MEMFD, backend->size,

                           m->hugetlb, m->hugetlbsize, m->seal ?