Commit 6f4c60e4 authored by Peter Xu's avatar Peter Xu Committed by Eduardo Habkost
Browse files

hostmem: use host_memory_backend_mr_inited() where proper 



Use the new interface to boost readability.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <1489151370-15453-3-git-send-email-peterx@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 4728b574

backends/hostmem-file.c

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
#ifndef CONFIG_LINUX

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

#else

    if (!memory_region_size(&backend->mr)) {

    if (!host_memory_backend_mr_inited(backend)) {

        gchar *path;

        backend->force_prealloc = mem_prealloc;

        path = object_get_canonical_path(OBJECT(backend));
@@ -76,7 +76,7 @@ static void set_mem_path(Object *o, const char *str, Error **errp) 
    HostMemoryBackend *backend = MEMORY_BACKEND(o);

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);



    if (memory_region_size(&backend->mr)) {

    if (host_memory_backend_mr_inited(backend)) {

        error_setg(errp, "cannot change property value");

        return;

    }
@@ -96,7 +96,7 @@ static void file_memory_backend_set_share(Object *o, bool value, Error **errp) 
    HostMemoryBackend *backend = MEMORY_BACKEND(o);

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);



    if (memory_region_size(&backend->mr)) {

    if (host_memory_backend_mr_inited(backend)) {

        error_setg(errp, "cannot change property value");

        return;

    }

backends/hostmem.c

+5 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ host_memory_backend_set_size(Object *obj, Visitor *v, const char *name, 
    Error *local_err = NULL;

    uint64_t value;



    if (memory_region_size(&backend->mr)) {

    if (host_memory_backend_mr_inited(backend)) {

        error_setg(&local_err, "cannot change property value");

        goto out;

    }
@@ -146,7 +146,7 @@ static void host_memory_backend_set_merge(Object *obj, bool value, Error **errp) 
{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    if (!memory_region_size(&backend->mr)) {

    if (!host_memory_backend_mr_inited(backend)) {

        backend->merge = value;

        return;

    }
@@ -172,7 +172,7 @@ static void host_memory_backend_set_dump(Object *obj, bool value, Error **errp) 
{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    if (!memory_region_size(&backend->mr)) {

    if (!host_memory_backend_mr_inited(backend)) {

        backend->dump = value;

        return;

    }
@@ -208,7 +208,7 @@ static void host_memory_backend_set_prealloc(Object *obj, bool value, 
        }

    }



    if (!memory_region_size(&backend->mr)) {

    if (!host_memory_backend_mr_inited(backend)) {

        backend->prealloc = value;

        return;

    }
@@ -249,7 +249,7 @@ bool host_memory_backend_mr_inited(HostMemoryBackend *backend) 
MemoryRegion *

host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp)

{

    return memory_region_size(&backend->mr) ? &backend->mr : NULL;

    return host_memory_backend_mr_inited(backend) ? &backend->mr : NULL;

}



void host_memory_backend_set_mapped(HostMemoryBackend *backend, bool mapped)