Commit 31ed4188 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/elmarco/tags/machine-props-pull-request' into staging 



Generalize machine compatibility properties

During "[PATCH v2 05/10] qom/globals: generalize
object_property_set_globals()" review, Eduardo suggested to rework the
GlobalProperty handling, so that -global is limited to QDev only and
we avoid mixing the machine compats and the user-provided -global
properties (instead of generalizing -global to various object kinds,
like I proposed in v2).

"qdev: do not mix compat props with global props" patch decouples a
bit user-provided -global from machine compat properties. This allows
to get rid of "user_provided" and "errp" fields in following patches.

A new compat property "x-use-canonical-path-for-ramblock-id" is added
to hostmem for legacy canonical path names, set to true for -file and
-memfd with qemu < 4.0.

(this series was initially titled "[PATCH v2 00/10] hostmem: use
object "id" for memory region name with >= 3.1", but its focus is more
in refactoring the global and compatilibity properties handling now)

# gpg: Signature made Mon 07 Jan 2019 12:22:43 GMT
# gpg:                using RSA key DAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/machine-props-pull-request: (28 commits)
  hostmem: use object id for memory region name with >= 4.0
  arm: replace instance_post_init()
  qdev-props: call object_apply_global_props()
  qdev-props: remove errp from GlobalProperty
  qdev-props: convert global_props to GPtrArray
  qdev: all globals are now user-provided
  qdev: make a separate helper function to apply compat properties
  compat: remove remaining PC_COMPAT macros
  include: remove compat.h
  compat: replace PC_COMPAT_2_1 & HW_COMPAT_2_1 macros
  compat: replace PC_COMPAT_2_2 & HW_COMPAT_2_2 macros
  compat: replace PC_COMPAT_2_3 & HW_COMPAT_2_3 macros
  compat: replace PC_COMPAT_2_4 & HW_COMPAT_2_4 macros
  compat: replace PC_COMPAT_2_5 & HW_COMPAT_2_5 macros
  compat: replace PC_COMPAT_2_6 & HW_COMPAT_2_6 macros
  compat: replace PC_COMPAT_2_7 & HW_COMPAT_2_7 macros
  compat: replace PC_COMPAT_2_8 & HW_COMPAT_2_8 macros
  compat: replace PC_COMPAT_2_9 & HW_COMPAT_2_9 macros
  compat: replace PC_COMPAT_2_10 & HW_COMPAT_2_10 macros
  compat: replace PC_COMPAT_2_11 & HW_COMPAT_2_11 macros
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a2964459 fa0cb34d

accel/accel.c

+0 −12
Original line number Diff line number Diff line
@@ -119,18 +119,6 @@ void configure_accelerator(MachineState *ms) 
    }

}



void accel_register_compat_props(AccelState *accel)

{

    AccelClass *class = ACCEL_GET_CLASS(accel);

    GlobalProperty *prop = class->global_props;



    for (; prop && prop->driver; prop++) {

        /* Any compat_props must never cause error */

        prop->errp = &error_abort;

        qdev_prop_register_global(prop);

    }

}



void accel_setup_post(MachineState *ms)

{

    AccelState *accel = ms->accelerator;

backends/hostmem-file.c

+4 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
{

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(backend);

#ifdef CONFIG_POSIX

    gchar *path;

    gchar *name;

#endif



    if (!backend->size) {
@@ -58,14 +58,14 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
    error_setg(errp, "-mem-path not supported on this host");

#else

    backend->force_prealloc = mem_prealloc;

    path = object_get_canonical_path(OBJECT(backend));

    name = host_memory_backend_get_name(backend);

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

                                     path,

                                     name,

                                     backend->size, fb->align,

                                     (backend->share ? RAM_SHARED : 0) |

                                     (fb->is_pmem ? RAM_PMEM : 0),

                                     fb->mem_path, errp);

    g_free(path);

    g_free(name);

#endif

}

backends/hostmem-memfd.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
        return;

    }



    name = object_get_canonical_path(OBJECT(backend));

    name = host_memory_backend_get_name(backend);

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

                                   name, backend->size,

                                   backend->share, fd, errp);

backends/hostmem-ram.c

+4 −5
Original line number Diff line number Diff line
@@ -16,21 +16,20 @@ 


#define TYPE_MEMORY_BACKEND_RAM "memory-backend-ram"





static void

ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)

{

    char *path;

    char *name;



    if (!backend->size) {

        error_setg(errp, "can't create backend with size 0");

        return;

    }



    path = object_get_canonical_path_component(OBJECT(backend));

    memory_region_init_ram_shared_nomigrate(&backend->mr, OBJECT(backend), path,

    name = host_memory_backend_get_name(backend);

    memory_region_init_ram_shared_nomigrate(&backend->mr, OBJECT(backend), name,

                           backend->size, backend->share, errp);

    g_free(path);

    g_free(name);

}



static void

backends/hostmem.c

+36 −0
Original line number Diff line number Diff line
@@ -28,6 +28,16 @@ QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_BIND != MPOL_BIND); 
QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_INTERLEAVE != MPOL_INTERLEAVE);

#endif



char *

host_memory_backend_get_name(HostMemoryBackend *backend)

{

    if (!backend->use_canonical_path) {

        return object_get_canonical_path_component(OBJECT(backend));

    }



    return object_get_canonical_path(OBJECT(backend));

}



static void

host_memory_backend_get_size(Object *obj, Visitor *v, const char *name,

                             void *opaque, Error **errp)
@@ -247,6 +257,11 @@ static void host_memory_backend_init(Object *obj) 
    backend->prealloc = mem_prealloc;

}



static void host_memory_backend_post_init(Object *obj)

{

    object_apply_compat_props(obj);

}



bool host_memory_backend_mr_inited(HostMemoryBackend *backend)

{

    /*
@@ -395,6 +410,23 @@ static void host_memory_backend_set_share(Object *o, bool value, Error **errp) 
    backend->share = value;

}



static bool

host_memory_backend_get_use_canonical_path(Object *obj, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    return backend->use_canonical_path;

}



static void

host_memory_backend_set_use_canonical_path(Object *obj, bool value,

                                           Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    backend->use_canonical_path = value;

}



static void

host_memory_backend_class_init(ObjectClass *oc, void *data)

{
@@ -441,6 +473,9 @@ host_memory_backend_class_init(ObjectClass *oc, void *data) 
        &error_abort);

    object_class_property_set_description(oc, "share",

        "Mark the memory as private to QEMU or shared", &error_abort);

    object_class_property_add_bool(oc, "x-use-canonical-path-for-ramblock-id",

        host_memory_backend_get_use_canonical_path,

        host_memory_backend_set_use_canonical_path, &error_abort);

}



static const TypeInfo host_memory_backend_info = {
@@ -451,6 +486,7 @@ static const TypeInfo host_memory_backend_info = { 
    .class_init = host_memory_backend_class_init,

    .instance_size = sizeof(HostMemoryBackend),

    .instance_init = host_memory_backend_init,

    .instance_post_init = host_memory_backend_post_init,

    .interfaces = (InterfaceInfo[]) {

        { TYPE_USER_CREATABLE },

        { }