Commit 006dce5f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging 



Machine queue, 2019-01-28

* Fix small leak on NUMA code
* Improve memory backend error messages

# gpg: Signature made Mon 28 Jan 2019 19:42:40 GMT
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  hostmem: add more information in error messages
  numa: Fixed the memory leak of numa error message

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 13c2361b 21d16836

backends/hostmem-file.c

+4 −2
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ static void set_mem_path(Object *o, const char *str, Error **errp) 
    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);



    if (host_memory_backend_mr_inited(backend)) {

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

        error_setg(errp, "cannot change property 'mem-path' of %s",

                   object_get_typename(o));

        return;

    }

    g_free(fb->mem_path);
@@ -120,7 +121,8 @@ static void file_memory_backend_set_align(Object *o, Visitor *v, 
    uint64_t val;



    if (host_memory_backend_mr_inited(backend)) {

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

        error_setg(&local_err, "cannot change property '%s' of %s",

                   name, object_get_typename(o));

        goto out;

    }

backends/hostmem.c

+5 −3
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ host_memory_backend_set_size(Object *obj, Visitor *v, const char *name, 
    uint64_t value;



    if (host_memory_backend_mr_inited(backend)) {

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

        error_setg(&local_err, "cannot change property %s of %s ",

                   name, object_get_typename(obj));

        goto out;

    }
@@ -66,8 +67,9 @@ host_memory_backend_set_size(Object *obj, Visitor *v, const char *name, 
        goto out;

    }

    if (!value) {

        error_setg(&local_err, "Property '%s.%s' doesn't take value '%"

                   PRIu64 "'", object_get_typename(obj), name, value);

        error_setg(&local_err,

                   "property '%s' of %s doesn't take value '%" PRIu64 "'",

                   name, object_get_typename(obj), value);

        goto out;

    }

    backend->size = value;

numa.c

+1 −0
Original line number Diff line number Diff line
@@ -533,6 +533,7 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, 
            error_report("memory backend %s is used multiple times. Each "

                         "-numa option must use a different memdev value.",

                         path);

            g_free(path);

            exit(1);

        }