qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2015 Red Hat, Inc.
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library. If not, see
|
|
|
|
* <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
*/
|
|
|
|
|
2016-02-08 18:08:51 +00:00
|
|
|
#include "qemu/osdep.h"
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 08:01:28 +00:00
|
|
|
#include "qapi/error.h"
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
#include "qom/object.h"
|
|
|
|
#include "qemu/module.h"
|
2017-06-03 23:13:31 +00:00
|
|
|
#include "qemu/option.h"
|
|
|
|
#include "qemu/config-file.h"
|
|
|
|
#include "qom/object_interfaces.h"
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
#define TYPE_DUMMY "qemu-dummy"
|
|
|
|
|
|
|
|
typedef struct DummyObject DummyObject;
|
|
|
|
typedef struct DummyObjectClass DummyObjectClass;
|
|
|
|
|
|
|
|
#define DUMMY_OBJECT(obj) \
|
|
|
|
OBJECT_CHECK(DummyObject, (obj), TYPE_DUMMY)
|
|
|
|
|
qom: Add an object_property_add_enum() helper function
A QOM property can be parsed as enum using the visit_type_enum()
helper function, but this forces callers to use the more complex
generic object_property_add() method when registering it. It
also requires that users of that object have access to the
string map when they want to read the property value.
This patch introduces a specialized object_property_add_enum()
method which simplifies the use of enum properties, so the
setters/getters directly get passed the int value.
typedef enum {
MYDEV_TYPE_FROG,
MYDEV_TYPE_ALLIGATOR,
MYDEV_TYPE_PLATYPUS,
MYDEV_TYPE_LAST
} MyDevType;
Then provide a table of enum <-> string mappings
static const char *const mydevtypemap[MYDEV_TYPE_LAST + 1] = {
[MYDEV_TYPE_FROG] = "frog",
[MYDEV_TYPE_ALLIGATOR] = "alligator",
[MYDEV_TYPE_PLATYPUS] = "platypus",
[MYDEV_TYPE_LAST] = NULL,
};
Assuming an object struct of
typedef struct {
Object parent_obj;
MyDevType devtype;
...other fields...
} MyDev;
The property can then be registered as follows:
static int mydev_prop_get_devtype(Object *obj,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
return dev->devtype;
}
static void mydev_prop_set_devtype(Object *obj,
int value,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
dev->devtype = value;
}
object_property_add_enum(obj, "devtype",
mydevtypemap, "MyDevType",
mydev_prop_get_devtype,
mydev_prop_set_devtype,
NULL);
Note there is no need to check the range of 'value' in
the setter, because the string->enum conversion code will
have already done that and reported an error as required.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:08 +00:00
|
|
|
typedef enum DummyAnimal DummyAnimal;
|
|
|
|
|
|
|
|
enum DummyAnimal {
|
|
|
|
DUMMY_FROG,
|
|
|
|
DUMMY_ALLIGATOR,
|
|
|
|
DUMMY_PLATYPUS,
|
|
|
|
|
|
|
|
DUMMY_LAST,
|
|
|
|
};
|
|
|
|
|
2017-08-24 08:46:10 +00:00
|
|
|
const QEnumLookup dummy_animal_map = {
|
|
|
|
.array = (const char *const[]) {
|
|
|
|
[DUMMY_FROG] = "frog",
|
|
|
|
[DUMMY_ALLIGATOR] = "alligator",
|
|
|
|
[DUMMY_PLATYPUS] = "platypus",
|
|
|
|
},
|
|
|
|
.size = DUMMY_LAST
|
qom: Add an object_property_add_enum() helper function
A QOM property can be parsed as enum using the visit_type_enum()
helper function, but this forces callers to use the more complex
generic object_property_add() method when registering it. It
also requires that users of that object have access to the
string map when they want to read the property value.
This patch introduces a specialized object_property_add_enum()
method which simplifies the use of enum properties, so the
setters/getters directly get passed the int value.
typedef enum {
MYDEV_TYPE_FROG,
MYDEV_TYPE_ALLIGATOR,
MYDEV_TYPE_PLATYPUS,
MYDEV_TYPE_LAST
} MyDevType;
Then provide a table of enum <-> string mappings
static const char *const mydevtypemap[MYDEV_TYPE_LAST + 1] = {
[MYDEV_TYPE_FROG] = "frog",
[MYDEV_TYPE_ALLIGATOR] = "alligator",
[MYDEV_TYPE_PLATYPUS] = "platypus",
[MYDEV_TYPE_LAST] = NULL,
};
Assuming an object struct of
typedef struct {
Object parent_obj;
MyDevType devtype;
...other fields...
} MyDev;
The property can then be registered as follows:
static int mydev_prop_get_devtype(Object *obj,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
return dev->devtype;
}
static void mydev_prop_set_devtype(Object *obj,
int value,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
dev->devtype = value;
}
object_property_add_enum(obj, "devtype",
mydevtypemap, "MyDevType",
mydev_prop_get_devtype,
mydev_prop_set_devtype,
NULL);
Note there is no need to check the range of 'value' in
the setter, because the string->enum conversion code will
have already done that and reported an error as required.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:08 +00:00
|
|
|
};
|
|
|
|
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
struct DummyObject {
|
|
|
|
Object parent_obj;
|
|
|
|
|
|
|
|
bool bv;
|
qom: Add an object_property_add_enum() helper function
A QOM property can be parsed as enum using the visit_type_enum()
helper function, but this forces callers to use the more complex
generic object_property_add() method when registering it. It
also requires that users of that object have access to the
string map when they want to read the property value.
This patch introduces a specialized object_property_add_enum()
method which simplifies the use of enum properties, so the
setters/getters directly get passed the int value.
typedef enum {
MYDEV_TYPE_FROG,
MYDEV_TYPE_ALLIGATOR,
MYDEV_TYPE_PLATYPUS,
MYDEV_TYPE_LAST
} MyDevType;
Then provide a table of enum <-> string mappings
static const char *const mydevtypemap[MYDEV_TYPE_LAST + 1] = {
[MYDEV_TYPE_FROG] = "frog",
[MYDEV_TYPE_ALLIGATOR] = "alligator",
[MYDEV_TYPE_PLATYPUS] = "platypus",
[MYDEV_TYPE_LAST] = NULL,
};
Assuming an object struct of
typedef struct {
Object parent_obj;
MyDevType devtype;
...other fields...
} MyDev;
The property can then be registered as follows:
static int mydev_prop_get_devtype(Object *obj,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
return dev->devtype;
}
static void mydev_prop_set_devtype(Object *obj,
int value,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
dev->devtype = value;
}
object_property_add_enum(obj, "devtype",
mydevtypemap, "MyDevType",
mydev_prop_get_devtype,
mydev_prop_set_devtype,
NULL);
Note there is no need to check the range of 'value' in
the setter, because the string->enum conversion code will
have already done that and reported an error as required.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:08 +00:00
|
|
|
DummyAnimal av;
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
char *sv;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct DummyObjectClass {
|
|
|
|
ObjectClass parent_class;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static void dummy_set_bv(Object *obj,
|
|
|
|
bool value,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(obj);
|
|
|
|
|
|
|
|
dobj->bv = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool dummy_get_bv(Object *obj,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(obj);
|
|
|
|
|
|
|
|
return dobj->bv;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
qom: Add an object_property_add_enum() helper function
A QOM property can be parsed as enum using the visit_type_enum()
helper function, but this forces callers to use the more complex
generic object_property_add() method when registering it. It
also requires that users of that object have access to the
string map when they want to read the property value.
This patch introduces a specialized object_property_add_enum()
method which simplifies the use of enum properties, so the
setters/getters directly get passed the int value.
typedef enum {
MYDEV_TYPE_FROG,
MYDEV_TYPE_ALLIGATOR,
MYDEV_TYPE_PLATYPUS,
MYDEV_TYPE_LAST
} MyDevType;
Then provide a table of enum <-> string mappings
static const char *const mydevtypemap[MYDEV_TYPE_LAST + 1] = {
[MYDEV_TYPE_FROG] = "frog",
[MYDEV_TYPE_ALLIGATOR] = "alligator",
[MYDEV_TYPE_PLATYPUS] = "platypus",
[MYDEV_TYPE_LAST] = NULL,
};
Assuming an object struct of
typedef struct {
Object parent_obj;
MyDevType devtype;
...other fields...
} MyDev;
The property can then be registered as follows:
static int mydev_prop_get_devtype(Object *obj,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
return dev->devtype;
}
static void mydev_prop_set_devtype(Object *obj,
int value,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
dev->devtype = value;
}
object_property_add_enum(obj, "devtype",
mydevtypemap, "MyDevType",
mydev_prop_get_devtype,
mydev_prop_set_devtype,
NULL);
Note there is no need to check the range of 'value' in
the setter, because the string->enum conversion code will
have already done that and reported an error as required.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:08 +00:00
|
|
|
static void dummy_set_av(Object *obj,
|
|
|
|
int value,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(obj);
|
|
|
|
|
|
|
|
dobj->av = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dummy_get_av(Object *obj,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(obj);
|
|
|
|
|
|
|
|
return dobj->av;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
static void dummy_set_sv(Object *obj,
|
|
|
|
const char *value,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(obj);
|
|
|
|
|
|
|
|
g_free(dobj->sv);
|
|
|
|
dobj->sv = g_strdup(value);
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *dummy_get_sv(Object *obj,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(obj);
|
|
|
|
|
|
|
|
return g_strdup(dobj->sv);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void dummy_init(Object *obj)
|
|
|
|
{
|
|
|
|
object_property_add_bool(obj, "bv",
|
|
|
|
dummy_get_bv,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 15:29:22 +00:00
|
|
|
dummy_set_bv);
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
}
|
|
|
|
|
2015-10-13 12:37:46 +00:00
|
|
|
|
|
|
|
static void dummy_class_init(ObjectClass *cls, void *data)
|
|
|
|
{
|
|
|
|
object_class_property_add_str(cls, "sv",
|
|
|
|
dummy_get_sv,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 15:29:22 +00:00
|
|
|
dummy_set_sv);
|
2015-10-13 12:37:46 +00:00
|
|
|
object_class_property_add_enum(cls, "av",
|
|
|
|
"DummyAnimal",
|
2017-08-24 08:46:10 +00:00
|
|
|
&dummy_animal_map,
|
2015-10-13 12:37:46 +00:00
|
|
|
dummy_get_av,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 15:29:22 +00:00
|
|
|
dummy_set_av);
|
2015-10-13 12:37:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
static void dummy_finalize(Object *obj)
|
|
|
|
{
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(obj);
|
|
|
|
|
|
|
|
g_free(dobj->sv);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static const TypeInfo dummy_info = {
|
|
|
|
.name = TYPE_DUMMY,
|
|
|
|
.parent = TYPE_OBJECT,
|
|
|
|
.instance_size = sizeof(DummyObject),
|
|
|
|
.instance_init = dummy_init,
|
|
|
|
.instance_finalize = dummy_finalize,
|
|
|
|
.class_size = sizeof(DummyObjectClass),
|
2015-10-13 12:37:46 +00:00
|
|
|
.class_init = dummy_class_init,
|
2017-06-03 23:13:31 +00:00
|
|
|
.interfaces = (InterfaceInfo[]) {
|
|
|
|
{ TYPE_USER_CREATABLE },
|
|
|
|
{ }
|
|
|
|
}
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
};
|
|
|
|
|
2015-11-16 15:37:34 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The following 3 object classes are used to
|
|
|
|
* simulate the kind of relationships seen in
|
|
|
|
* qdev, which result in complex object
|
|
|
|
* property destruction ordering.
|
|
|
|
*
|
|
|
|
* DummyDev has a 'bus' child to a DummyBus
|
|
|
|
* DummyBus has a 'backend' child to a DummyBackend
|
|
|
|
* DummyDev has a 'backend' link to DummyBackend
|
|
|
|
*
|
|
|
|
* When DummyDev is finalized, it unparents the
|
|
|
|
* DummyBackend, which unparents the DummyDev
|
|
|
|
* which deletes the 'backend' link from DummyDev
|
|
|
|
* to DummyBackend. This illustrates that the
|
|
|
|
* object_property_del_all() method needs to
|
|
|
|
* cope with the list of properties being changed
|
|
|
|
* while it iterates over them.
|
|
|
|
*/
|
|
|
|
typedef struct DummyDev DummyDev;
|
|
|
|
typedef struct DummyDevClass DummyDevClass;
|
|
|
|
typedef struct DummyBus DummyBus;
|
|
|
|
typedef struct DummyBusClass DummyBusClass;
|
|
|
|
typedef struct DummyBackend DummyBackend;
|
|
|
|
typedef struct DummyBackendClass DummyBackendClass;
|
|
|
|
|
|
|
|
#define TYPE_DUMMY_DEV "qemu-dummy-dev"
|
|
|
|
#define TYPE_DUMMY_BUS "qemu-dummy-bus"
|
|
|
|
#define TYPE_DUMMY_BACKEND "qemu-dummy-backend"
|
|
|
|
|
|
|
|
#define DUMMY_DEV(obj) \
|
|
|
|
OBJECT_CHECK(DummyDev, (obj), TYPE_DUMMY_DEV)
|
|
|
|
#define DUMMY_BUS(obj) \
|
|
|
|
OBJECT_CHECK(DummyBus, (obj), TYPE_DUMMY_BUS)
|
|
|
|
#define DUMMY_BACKEND(obj) \
|
|
|
|
OBJECT_CHECK(DummyBackend, (obj), TYPE_DUMMY_BACKEND)
|
|
|
|
|
|
|
|
struct DummyDev {
|
|
|
|
Object parent_obj;
|
|
|
|
|
|
|
|
DummyBus *bus;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct DummyDevClass {
|
|
|
|
ObjectClass parent_class;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct DummyBus {
|
|
|
|
Object parent_obj;
|
|
|
|
|
|
|
|
DummyBackend *backend;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct DummyBusClass {
|
|
|
|
ObjectClass parent_class;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct DummyBackend {
|
|
|
|
Object parent_obj;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct DummyBackendClass {
|
|
|
|
ObjectClass parent_class;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2016-07-07 19:49:41 +00:00
|
|
|
static void dummy_dev_finalize(Object *obj)
|
|
|
|
{
|
|
|
|
DummyDev *dev = DUMMY_DEV(obj);
|
|
|
|
|
|
|
|
object_unref(OBJECT(dev->bus));
|
|
|
|
}
|
|
|
|
|
2015-11-16 15:37:34 +00:00
|
|
|
static void dummy_dev_init(Object *obj)
|
|
|
|
{
|
|
|
|
DummyDev *dev = DUMMY_DEV(obj);
|
|
|
|
DummyBus *bus = DUMMY_BUS(object_new(TYPE_DUMMY_BUS));
|
|
|
|
DummyBackend *backend = DUMMY_BACKEND(object_new(TYPE_DUMMY_BACKEND));
|
|
|
|
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 15:29:22 +00:00
|
|
|
object_property_add_child(obj, "bus", OBJECT(bus));
|
2015-11-16 15:37:34 +00:00
|
|
|
dev->bus = bus;
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 15:29:22 +00:00
|
|
|
object_property_add_child(OBJECT(bus), "backend", OBJECT(backend));
|
2015-11-16 15:37:34 +00:00
|
|
|
bus->backend = backend;
|
|
|
|
|
|
|
|
object_property_add_link(obj, "backend", TYPE_DUMMY_BACKEND,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 15:29:22 +00:00
|
|
|
(Object **)&bus->backend, NULL, 0);
|
2015-11-16 15:37:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void dummy_dev_unparent(Object *obj)
|
|
|
|
{
|
|
|
|
DummyDev *dev = DUMMY_DEV(obj);
|
|
|
|
object_unparent(OBJECT(dev->bus));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dummy_dev_class_init(ObjectClass *klass, void *opaque)
|
|
|
|
{
|
|
|
|
klass->unparent = dummy_dev_unparent;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-07-07 19:49:41 +00:00
|
|
|
static void dummy_bus_finalize(Object *obj)
|
|
|
|
{
|
|
|
|
DummyBus *bus = DUMMY_BUS(obj);
|
|
|
|
|
|
|
|
object_unref(OBJECT(bus->backend));
|
|
|
|
}
|
|
|
|
|
2015-11-16 15:37:34 +00:00
|
|
|
static void dummy_bus_init(Object *obj)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dummy_bus_unparent(Object *obj)
|
|
|
|
{
|
|
|
|
DummyBus *bus = DUMMY_BUS(obj);
|
2020-05-05 15:29:26 +00:00
|
|
|
object_property_del(obj->parent, "backend");
|
2015-11-16 15:37:34 +00:00
|
|
|
object_unparent(OBJECT(bus->backend));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dummy_bus_class_init(ObjectClass *klass, void *opaque)
|
|
|
|
{
|
|
|
|
klass->unparent = dummy_bus_unparent;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dummy_backend_init(Object *obj)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static const TypeInfo dummy_dev_info = {
|
|
|
|
.name = TYPE_DUMMY_DEV,
|
|
|
|
.parent = TYPE_OBJECT,
|
|
|
|
.instance_size = sizeof(DummyDev),
|
|
|
|
.instance_init = dummy_dev_init,
|
2016-07-07 19:49:41 +00:00
|
|
|
.instance_finalize = dummy_dev_finalize,
|
2015-11-16 15:37:34 +00:00
|
|
|
.class_size = sizeof(DummyDevClass),
|
|
|
|
.class_init = dummy_dev_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const TypeInfo dummy_bus_info = {
|
|
|
|
.name = TYPE_DUMMY_BUS,
|
|
|
|
.parent = TYPE_OBJECT,
|
|
|
|
.instance_size = sizeof(DummyBus),
|
|
|
|
.instance_init = dummy_bus_init,
|
2016-07-07 19:49:41 +00:00
|
|
|
.instance_finalize = dummy_bus_finalize,
|
2015-11-16 15:37:34 +00:00
|
|
|
.class_size = sizeof(DummyBusClass),
|
|
|
|
.class_init = dummy_bus_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const TypeInfo dummy_backend_info = {
|
|
|
|
.name = TYPE_DUMMY_BACKEND,
|
|
|
|
.parent = TYPE_OBJECT,
|
|
|
|
.instance_size = sizeof(DummyBackend),
|
|
|
|
.instance_init = dummy_backend_init,
|
|
|
|
.class_size = sizeof(DummyBackendClass),
|
|
|
|
};
|
|
|
|
|
2017-06-03 23:13:31 +00:00
|
|
|
static QemuOptsList qemu_object_opts = {
|
|
|
|
.name = "object",
|
|
|
|
.implied_opt_name = "qom-type",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_object_opts.head),
|
|
|
|
.desc = {
|
|
|
|
{ }
|
|
|
|
},
|
|
|
|
};
|
2015-11-16 15:37:34 +00:00
|
|
|
|
|
|
|
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
static void test_dummy_createv(void)
|
|
|
|
{
|
|
|
|
Error *err = NULL;
|
|
|
|
Object *parent = object_get_objects_root();
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(
|
|
|
|
object_new_with_props(TYPE_DUMMY,
|
|
|
|
parent,
|
|
|
|
"dummy0",
|
|
|
|
&err,
|
|
|
|
"bv", "yes",
|
|
|
|
"sv", "Hiss hiss hiss",
|
qom: Add an object_property_add_enum() helper function
A QOM property can be parsed as enum using the visit_type_enum()
helper function, but this forces callers to use the more complex
generic object_property_add() method when registering it. It
also requires that users of that object have access to the
string map when they want to read the property value.
This patch introduces a specialized object_property_add_enum()
method which simplifies the use of enum properties, so the
setters/getters directly get passed the int value.
typedef enum {
MYDEV_TYPE_FROG,
MYDEV_TYPE_ALLIGATOR,
MYDEV_TYPE_PLATYPUS,
MYDEV_TYPE_LAST
} MyDevType;
Then provide a table of enum <-> string mappings
static const char *const mydevtypemap[MYDEV_TYPE_LAST + 1] = {
[MYDEV_TYPE_FROG] = "frog",
[MYDEV_TYPE_ALLIGATOR] = "alligator",
[MYDEV_TYPE_PLATYPUS] = "platypus",
[MYDEV_TYPE_LAST] = NULL,
};
Assuming an object struct of
typedef struct {
Object parent_obj;
MyDevType devtype;
...other fields...
} MyDev;
The property can then be registered as follows:
static int mydev_prop_get_devtype(Object *obj,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
return dev->devtype;
}
static void mydev_prop_set_devtype(Object *obj,
int value,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
dev->devtype = value;
}
object_property_add_enum(obj, "devtype",
mydevtypemap, "MyDevType",
mydev_prop_get_devtype,
mydev_prop_set_devtype,
NULL);
Note there is no need to check the range of 'value' in
the setter, because the string->enum conversion code will
have already done that and reported an error as required.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:08 +00:00
|
|
|
"av", "platypus",
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
NULL));
|
|
|
|
|
|
|
|
g_assert(err == NULL);
|
|
|
|
g_assert_cmpstr(dobj->sv, ==, "Hiss hiss hiss");
|
|
|
|
g_assert(dobj->bv == true);
|
qom: Add an object_property_add_enum() helper function
A QOM property can be parsed as enum using the visit_type_enum()
helper function, but this forces callers to use the more complex
generic object_property_add() method when registering it. It
also requires that users of that object have access to the
string map when they want to read the property value.
This patch introduces a specialized object_property_add_enum()
method which simplifies the use of enum properties, so the
setters/getters directly get passed the int value.
typedef enum {
MYDEV_TYPE_FROG,
MYDEV_TYPE_ALLIGATOR,
MYDEV_TYPE_PLATYPUS,
MYDEV_TYPE_LAST
} MyDevType;
Then provide a table of enum <-> string mappings
static const char *const mydevtypemap[MYDEV_TYPE_LAST + 1] = {
[MYDEV_TYPE_FROG] = "frog",
[MYDEV_TYPE_ALLIGATOR] = "alligator",
[MYDEV_TYPE_PLATYPUS] = "platypus",
[MYDEV_TYPE_LAST] = NULL,
};
Assuming an object struct of
typedef struct {
Object parent_obj;
MyDevType devtype;
...other fields...
} MyDev;
The property can then be registered as follows:
static int mydev_prop_get_devtype(Object *obj,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
return dev->devtype;
}
static void mydev_prop_set_devtype(Object *obj,
int value,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
dev->devtype = value;
}
object_property_add_enum(obj, "devtype",
mydevtypemap, "MyDevType",
mydev_prop_get_devtype,
mydev_prop_set_devtype,
NULL);
Note there is no need to check the range of 'value' in
the setter, because the string->enum conversion code will
have already done that and reported an error as required.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:08 +00:00
|
|
|
g_assert(dobj->av == DUMMY_PLATYPUS);
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
|
|
|
|
g_assert(object_resolve_path_component(parent, "dummy0")
|
|
|
|
== OBJECT(dobj));
|
|
|
|
|
|
|
|
object_unparent(OBJECT(dobj));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static Object *new_helper(Error **errp,
|
|
|
|
Object *parent,
|
|
|
|
...)
|
|
|
|
{
|
|
|
|
va_list vargs;
|
|
|
|
Object *obj;
|
|
|
|
|
|
|
|
va_start(vargs, parent);
|
|
|
|
obj = object_new_with_propv(TYPE_DUMMY,
|
|
|
|
parent,
|
|
|
|
"dummy0",
|
|
|
|
errp,
|
|
|
|
vargs);
|
|
|
|
va_end(vargs);
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_dummy_createlist(void)
|
|
|
|
{
|
|
|
|
Error *err = NULL;
|
|
|
|
Object *parent = object_get_objects_root();
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(
|
|
|
|
new_helper(&err,
|
|
|
|
parent,
|
|
|
|
"bv", "yes",
|
|
|
|
"sv", "Hiss hiss hiss",
|
qom: Add an object_property_add_enum() helper function
A QOM property can be parsed as enum using the visit_type_enum()
helper function, but this forces callers to use the more complex
generic object_property_add() method when registering it. It
also requires that users of that object have access to the
string map when they want to read the property value.
This patch introduces a specialized object_property_add_enum()
method which simplifies the use of enum properties, so the
setters/getters directly get passed the int value.
typedef enum {
MYDEV_TYPE_FROG,
MYDEV_TYPE_ALLIGATOR,
MYDEV_TYPE_PLATYPUS,
MYDEV_TYPE_LAST
} MyDevType;
Then provide a table of enum <-> string mappings
static const char *const mydevtypemap[MYDEV_TYPE_LAST + 1] = {
[MYDEV_TYPE_FROG] = "frog",
[MYDEV_TYPE_ALLIGATOR] = "alligator",
[MYDEV_TYPE_PLATYPUS] = "platypus",
[MYDEV_TYPE_LAST] = NULL,
};
Assuming an object struct of
typedef struct {
Object parent_obj;
MyDevType devtype;
...other fields...
} MyDev;
The property can then be registered as follows:
static int mydev_prop_get_devtype(Object *obj,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
return dev->devtype;
}
static void mydev_prop_set_devtype(Object *obj,
int value,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
dev->devtype = value;
}
object_property_add_enum(obj, "devtype",
mydevtypemap, "MyDevType",
mydev_prop_get_devtype,
mydev_prop_set_devtype,
NULL);
Note there is no need to check the range of 'value' in
the setter, because the string->enum conversion code will
have already done that and reported an error as required.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:08 +00:00
|
|
|
"av", "platypus",
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
NULL));
|
|
|
|
|
|
|
|
g_assert(err == NULL);
|
|
|
|
g_assert_cmpstr(dobj->sv, ==, "Hiss hiss hiss");
|
|
|
|
g_assert(dobj->bv == true);
|
qom: Add an object_property_add_enum() helper function
A QOM property can be parsed as enum using the visit_type_enum()
helper function, but this forces callers to use the more complex
generic object_property_add() method when registering it. It
also requires that users of that object have access to the
string map when they want to read the property value.
This patch introduces a specialized object_property_add_enum()
method which simplifies the use of enum properties, so the
setters/getters directly get passed the int value.
typedef enum {
MYDEV_TYPE_FROG,
MYDEV_TYPE_ALLIGATOR,
MYDEV_TYPE_PLATYPUS,
MYDEV_TYPE_LAST
} MyDevType;
Then provide a table of enum <-> string mappings
static const char *const mydevtypemap[MYDEV_TYPE_LAST + 1] = {
[MYDEV_TYPE_FROG] = "frog",
[MYDEV_TYPE_ALLIGATOR] = "alligator",
[MYDEV_TYPE_PLATYPUS] = "platypus",
[MYDEV_TYPE_LAST] = NULL,
};
Assuming an object struct of
typedef struct {
Object parent_obj;
MyDevType devtype;
...other fields...
} MyDev;
The property can then be registered as follows:
static int mydev_prop_get_devtype(Object *obj,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
return dev->devtype;
}
static void mydev_prop_set_devtype(Object *obj,
int value,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
dev->devtype = value;
}
object_property_add_enum(obj, "devtype",
mydevtypemap, "MyDevType",
mydev_prop_get_devtype,
mydev_prop_set_devtype,
NULL);
Note there is no need to check the range of 'value' in
the setter, because the string->enum conversion code will
have already done that and reported an error as required.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:08 +00:00
|
|
|
g_assert(dobj->av == DUMMY_PLATYPUS);
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
|
|
|
|
g_assert(object_resolve_path_component(parent, "dummy0")
|
|
|
|
== OBJECT(dobj));
|
|
|
|
|
|
|
|
object_unparent(OBJECT(dobj));
|
|
|
|
}
|
|
|
|
|
2017-06-03 23:13:31 +00:00
|
|
|
static void test_dummy_createcmdl(void)
|
|
|
|
{
|
|
|
|
QemuOpts *opts;
|
|
|
|
DummyObject *dobj;
|
|
|
|
Error *err = NULL;
|
|
|
|
const char *params = TYPE_DUMMY \
|
|
|
|
",id=dev0," \
|
|
|
|
"bv=yes,sv=Hiss hiss hiss,av=platypus";
|
|
|
|
|
|
|
|
qemu_add_opts(&qemu_object_opts);
|
|
|
|
opts = qemu_opts_parse(&qemu_object_opts, params, true, &err);
|
|
|
|
g_assert(err == NULL);
|
|
|
|
g_assert(opts);
|
|
|
|
|
|
|
|
dobj = DUMMY_OBJECT(user_creatable_add_opts(opts, &err));
|
|
|
|
g_assert(err == NULL);
|
|
|
|
g_assert(dobj);
|
|
|
|
g_assert_cmpstr(dobj->sv, ==, "Hiss hiss hiss");
|
|
|
|
g_assert(dobj->bv == true);
|
|
|
|
g_assert(dobj->av == DUMMY_PLATYPUS);
|
|
|
|
|
|
|
|
user_creatable_del("dev0", &err);
|
|
|
|
g_assert(err == NULL);
|
|
|
|
error_free(err);
|
|
|
|
|
2017-06-09 13:33:37 +00:00
|
|
|
object_unref(OBJECT(dobj));
|
|
|
|
|
2017-06-03 23:13:31 +00:00
|
|
|
/*
|
|
|
|
* cmdline-parsing via qemu_opts_parse() results in a QemuOpts entry
|
|
|
|
* corresponding to the Object's ID to be added to the QemuOptsList
|
|
|
|
* for objects. To avoid having this entry conflict with future
|
|
|
|
* Objects using the same ID (which can happen in cases where
|
|
|
|
* qemu_opts_parse() is used to parse the object params, such as
|
|
|
|
* with hmp_object_add() at the time of this comment), we need to
|
|
|
|
* check for this in user_creatable_del() and remove the QemuOpts if
|
|
|
|
* it is present.
|
|
|
|
*
|
monitor: fix object_del for command-line-created objects
Currently objects specified on the command-line are only partially
cleaned up when 'object_del' is issued in either HMP or QMP: the
object itself is fully finalized, but the QemuOpts are not removed.
This results in the following behavior:
x86_64-softmmu/qemu-system-x86_64 -monitor stdio \
-object memory-backend-ram,id=ram1,size=256M
QEMU 2.7.91 monitor - type 'help' for more information
(qemu) object_del ram1
(qemu) object_del ram1
object 'ram1' not found
(qemu) object_add memory-backend-ram,id=ram1,size=256M
Duplicate ID 'ram1' for object
Try "help object_add" for more information
which can be an issue for use-cases like memory hotplug.
This happens on the HMP side because hmp_object_add() attempts to
create a temporary QemuOpts entry with ID 'ram1', which ends up
conflicting with the command-line-created entry, since it was never
cleaned up during the previous hmp_object_del() call.
We address this by adding a check in user_creatable_del(), which
is called by both qmp_object_del() and hmp_object_del() to handle
the actual object cleanup, to determine whether an option group entry
matching the object's ID is present and removing it if it is.
Note that qmp_object_add() never attempts to create a temporary
QemuOpts entry, so it does not encounter the duplicate ID error,
which is why this isn't generally visible in libvirt.
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Cc: Daniel Berrange <berrange@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1496531612-22166-3-git-send-email-mdroth@linux.vnet.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2017-06-03 23:13:32 +00:00
|
|
|
* The below check ensures this works as expected.
|
2017-06-03 23:13:31 +00:00
|
|
|
*/
|
monitor: fix object_del for command-line-created objects
Currently objects specified on the command-line are only partially
cleaned up when 'object_del' is issued in either HMP or QMP: the
object itself is fully finalized, but the QemuOpts are not removed.
This results in the following behavior:
x86_64-softmmu/qemu-system-x86_64 -monitor stdio \
-object memory-backend-ram,id=ram1,size=256M
QEMU 2.7.91 monitor - type 'help' for more information
(qemu) object_del ram1
(qemu) object_del ram1
object 'ram1' not found
(qemu) object_add memory-backend-ram,id=ram1,size=256M
Duplicate ID 'ram1' for object
Try "help object_add" for more information
which can be an issue for use-cases like memory hotplug.
This happens on the HMP side because hmp_object_add() attempts to
create a temporary QemuOpts entry with ID 'ram1', which ends up
conflicting with the command-line-created entry, since it was never
cleaned up during the previous hmp_object_del() call.
We address this by adding a check in user_creatable_del(), which
is called by both qmp_object_del() and hmp_object_del() to handle
the actual object cleanup, to determine whether an option group entry
matching the object's ID is present and removing it if it is.
Note that qmp_object_add() never attempts to create a temporary
QemuOpts entry, so it does not encounter the duplicate ID error,
which is why this isn't generally visible in libvirt.
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Cc: Daniel Berrange <berrange@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1496531612-22166-3-git-send-email-mdroth@linux.vnet.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2017-06-03 23:13:32 +00:00
|
|
|
g_assert_null(qemu_opts_find(&qemu_object_opts, "dev0"));
|
2017-06-03 23:13:31 +00:00
|
|
|
}
|
|
|
|
|
qom: Add an object_property_add_enum() helper function
A QOM property can be parsed as enum using the visit_type_enum()
helper function, but this forces callers to use the more complex
generic object_property_add() method when registering it. It
also requires that users of that object have access to the
string map when they want to read the property value.
This patch introduces a specialized object_property_add_enum()
method which simplifies the use of enum properties, so the
setters/getters directly get passed the int value.
typedef enum {
MYDEV_TYPE_FROG,
MYDEV_TYPE_ALLIGATOR,
MYDEV_TYPE_PLATYPUS,
MYDEV_TYPE_LAST
} MyDevType;
Then provide a table of enum <-> string mappings
static const char *const mydevtypemap[MYDEV_TYPE_LAST + 1] = {
[MYDEV_TYPE_FROG] = "frog",
[MYDEV_TYPE_ALLIGATOR] = "alligator",
[MYDEV_TYPE_PLATYPUS] = "platypus",
[MYDEV_TYPE_LAST] = NULL,
};
Assuming an object struct of
typedef struct {
Object parent_obj;
MyDevType devtype;
...other fields...
} MyDev;
The property can then be registered as follows:
static int mydev_prop_get_devtype(Object *obj,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
return dev->devtype;
}
static void mydev_prop_set_devtype(Object *obj,
int value,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
dev->devtype = value;
}
object_property_add_enum(obj, "devtype",
mydevtypemap, "MyDevType",
mydev_prop_get_devtype,
mydev_prop_set_devtype,
NULL);
Note there is no need to check the range of 'value' in
the setter, because the string->enum conversion code will
have already done that and reported an error as required.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:08 +00:00
|
|
|
static void test_dummy_badenum(void)
|
|
|
|
{
|
|
|
|
Error *err = NULL;
|
|
|
|
Object *parent = object_get_objects_root();
|
|
|
|
Object *dobj =
|
|
|
|
object_new_with_props(TYPE_DUMMY,
|
|
|
|
parent,
|
|
|
|
"dummy0",
|
|
|
|
&err,
|
|
|
|
"bv", "yes",
|
|
|
|
"sv", "Hiss hiss hiss",
|
|
|
|
"av", "yeti",
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
g_assert(dobj == NULL);
|
|
|
|
g_assert(err != NULL);
|
|
|
|
g_assert_cmpstr(error_get_pretty(err), ==,
|
|
|
|
"Invalid parameter 'yeti'");
|
|
|
|
|
|
|
|
g_assert(object_resolve_path_component(parent, "dummy0")
|
|
|
|
== NULL);
|
|
|
|
|
|
|
|
error_free(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-05-27 15:07:56 +00:00
|
|
|
static void test_dummy_getenum(void)
|
|
|
|
{
|
|
|
|
Error *err = NULL;
|
|
|
|
int val;
|
|
|
|
Object *parent = object_get_objects_root();
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(
|
|
|
|
object_new_with_props(TYPE_DUMMY,
|
|
|
|
parent,
|
|
|
|
"dummy0",
|
|
|
|
&err,
|
|
|
|
"av", "platypus",
|
|
|
|
NULL));
|
|
|
|
|
|
|
|
g_assert(err == NULL);
|
|
|
|
g_assert(dobj->av == DUMMY_PLATYPUS);
|
|
|
|
|
|
|
|
val = object_property_get_enum(OBJECT(dobj),
|
|
|
|
"av",
|
|
|
|
"DummyAnimal",
|
|
|
|
&err);
|
|
|
|
g_assert(err == NULL);
|
|
|
|
g_assert(val == DUMMY_PLATYPUS);
|
|
|
|
|
|
|
|
/* A bad enum type name */
|
|
|
|
val = object_property_get_enum(OBJECT(dobj),
|
|
|
|
"av",
|
|
|
|
"BadAnimal",
|
|
|
|
&err);
|
|
|
|
g_assert(err != NULL);
|
|
|
|
error_free(err);
|
|
|
|
err = NULL;
|
|
|
|
|
|
|
|
/* A non-enum property name */
|
|
|
|
val = object_property_get_enum(OBJECT(dobj),
|
|
|
|
"iv",
|
|
|
|
"DummyAnimal",
|
|
|
|
&err);
|
|
|
|
g_assert(err != NULL);
|
|
|
|
error_free(err);
|
2015-10-13 12:37:40 +00:00
|
|
|
|
|
|
|
object_unparent(OBJECT(dobj));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-05-05 15:29:16 +00:00
|
|
|
static void test_dummy_prop_iterator(ObjectPropertyIterator *iter,
|
|
|
|
const char *expected[], int n)
|
2015-10-13 12:37:40 +00:00
|
|
|
{
|
|
|
|
ObjectProperty *prop;
|
2020-05-05 15:29:16 +00:00
|
|
|
int i;
|
2015-10-13 12:37:40 +00:00
|
|
|
|
2018-09-06 14:13:34 +00:00
|
|
|
while ((prop = object_property_iter_next(iter))) {
|
2020-05-05 15:29:16 +00:00
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
if (!g_strcmp0(prop->name, expected[i])) {
|
|
|
|
break;
|
|
|
|
}
|
2015-10-13 12:37:40 +00:00
|
|
|
}
|
2020-05-05 15:29:16 +00:00
|
|
|
g_assert(i < n);
|
|
|
|
expected[i] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
g_assert(!expected[i]);
|
2015-10-13 12:37:40 +00:00
|
|
|
}
|
2018-09-06 14:13:34 +00:00
|
|
|
}
|
2015-10-13 12:37:40 +00:00
|
|
|
|
2018-09-06 14:13:34 +00:00
|
|
|
static void test_dummy_iterator(void)
|
|
|
|
{
|
2020-05-05 15:29:16 +00:00
|
|
|
const char *expected[] = {
|
|
|
|
"type", /* inherited from TYPE_OBJECT */
|
|
|
|
"sv", "av", /* class properties */
|
|
|
|
"bv"}; /* instance property */
|
2018-09-06 14:13:34 +00:00
|
|
|
Object *parent = object_get_objects_root();
|
|
|
|
DummyObject *dobj = DUMMY_OBJECT(
|
|
|
|
object_new_with_props(TYPE_DUMMY,
|
|
|
|
parent,
|
|
|
|
"dummy0",
|
|
|
|
&error_abort,
|
|
|
|
"bv", "yes",
|
|
|
|
"sv", "Hiss hiss hiss",
|
|
|
|
"av", "platypus",
|
|
|
|
NULL));
|
|
|
|
ObjectPropertyIterator iter;
|
|
|
|
|
|
|
|
object_property_iter_init(&iter, OBJECT(dobj));
|
2020-05-05 15:29:16 +00:00
|
|
|
test_dummy_prop_iterator(&iter, expected, ARRAY_SIZE(expected));
|
2015-10-13 12:37:40 +00:00
|
|
|
object_unparent(OBJECT(dobj));
|
2015-05-27 15:07:56 +00:00
|
|
|
}
|
|
|
|
|
2018-09-06 14:14:01 +00:00
|
|
|
static void test_dummy_class_iterator(void)
|
|
|
|
{
|
2020-05-05 15:29:16 +00:00
|
|
|
const char *expected[] = { "type", "av", "sv" };
|
2018-09-06 14:14:01 +00:00
|
|
|
ObjectPropertyIterator iter;
|
|
|
|
ObjectClass *klass = object_class_by_name(TYPE_DUMMY);
|
|
|
|
|
|
|
|
object_class_property_iter_init(&iter, klass);
|
2020-05-05 15:29:16 +00:00
|
|
|
test_dummy_prop_iterator(&iter, expected, ARRAY_SIZE(expected));
|
2018-09-06 14:14:01 +00:00
|
|
|
}
|
2015-05-27 15:07:56 +00:00
|
|
|
|
2015-11-16 15:37:34 +00:00
|
|
|
static void test_dummy_delchild(void)
|
|
|
|
{
|
|
|
|
Object *parent = object_get_objects_root();
|
|
|
|
DummyDev *dev = DUMMY_DEV(
|
|
|
|
object_new_with_props(TYPE_DUMMY_DEV,
|
|
|
|
parent,
|
|
|
|
"dev0",
|
|
|
|
&error_abort,
|
|
|
|
NULL));
|
|
|
|
|
|
|
|
object_unparent(OBJECT(dev));
|
|
|
|
}
|
|
|
|
|
2017-07-07 21:30:51 +00:00
|
|
|
static void test_qom_partial_path(void)
|
|
|
|
{
|
|
|
|
Object *root = object_get_objects_root();
|
|
|
|
Object *cont1 = container_get(root, "/cont1");
|
|
|
|
Object *obj1 = object_new(TYPE_DUMMY);
|
|
|
|
Object *obj2a = object_new(TYPE_DUMMY);
|
|
|
|
Object *obj2b = object_new(TYPE_DUMMY);
|
|
|
|
bool ambiguous;
|
|
|
|
|
|
|
|
/* Objects created:
|
|
|
|
* /cont1
|
|
|
|
* /cont1/obj1
|
|
|
|
* /cont1/obj2 (obj2a)
|
|
|
|
* /obj2 (obj2b)
|
|
|
|
*/
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 15:29:22 +00:00
|
|
|
object_property_add_child(cont1, "obj1", obj1);
|
2017-07-07 21:30:51 +00:00
|
|
|
object_unref(obj1);
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 15:29:22 +00:00
|
|
|
object_property_add_child(cont1, "obj2", obj2a);
|
2017-07-07 21:30:51 +00:00
|
|
|
object_unref(obj2a);
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 15:29:22 +00:00
|
|
|
object_property_add_child(root, "obj2", obj2b);
|
2017-07-07 21:30:51 +00:00
|
|
|
object_unref(obj2b);
|
|
|
|
|
|
|
|
ambiguous = false;
|
|
|
|
g_assert(!object_resolve_path_type("", TYPE_DUMMY, &ambiguous));
|
|
|
|
g_assert(ambiguous);
|
2017-07-07 21:30:52 +00:00
|
|
|
g_assert(!object_resolve_path_type("", TYPE_DUMMY, NULL));
|
2017-07-07 21:30:51 +00:00
|
|
|
|
|
|
|
ambiguous = false;
|
|
|
|
g_assert(!object_resolve_path("obj2", &ambiguous));
|
|
|
|
g_assert(ambiguous);
|
2017-07-07 21:30:52 +00:00
|
|
|
g_assert(!object_resolve_path("obj2", NULL));
|
2017-07-07 21:30:51 +00:00
|
|
|
|
|
|
|
ambiguous = false;
|
|
|
|
g_assert(object_resolve_path("obj1", &ambiguous) == obj1);
|
|
|
|
g_assert(!ambiguous);
|
2017-07-07 21:30:52 +00:00
|
|
|
g_assert(object_resolve_path("obj1", NULL) == obj1);
|
2017-07-07 21:30:51 +00:00
|
|
|
|
|
|
|
object_unparent(obj2b);
|
|
|
|
object_unparent(cont1);
|
|
|
|
}
|
|
|
|
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
|
|
|
|
module_call_init(MODULE_INIT_QOM);
|
|
|
|
type_register_static(&dummy_info);
|
2015-11-16 15:37:34 +00:00
|
|
|
type_register_static(&dummy_dev_info);
|
|
|
|
type_register_static(&dummy_bus_info);
|
|
|
|
type_register_static(&dummy_backend_info);
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
|
|
|
|
g_test_add_func("/qom/proplist/createlist", test_dummy_createlist);
|
|
|
|
g_test_add_func("/qom/proplist/createv", test_dummy_createv);
|
2017-06-03 23:13:31 +00:00
|
|
|
g_test_add_func("/qom/proplist/createcmdline", test_dummy_createcmdl);
|
qom: Add an object_property_add_enum() helper function
A QOM property can be parsed as enum using the visit_type_enum()
helper function, but this forces callers to use the more complex
generic object_property_add() method when registering it. It
also requires that users of that object have access to the
string map when they want to read the property value.
This patch introduces a specialized object_property_add_enum()
method which simplifies the use of enum properties, so the
setters/getters directly get passed the int value.
typedef enum {
MYDEV_TYPE_FROG,
MYDEV_TYPE_ALLIGATOR,
MYDEV_TYPE_PLATYPUS,
MYDEV_TYPE_LAST
} MyDevType;
Then provide a table of enum <-> string mappings
static const char *const mydevtypemap[MYDEV_TYPE_LAST + 1] = {
[MYDEV_TYPE_FROG] = "frog",
[MYDEV_TYPE_ALLIGATOR] = "alligator",
[MYDEV_TYPE_PLATYPUS] = "platypus",
[MYDEV_TYPE_LAST] = NULL,
};
Assuming an object struct of
typedef struct {
Object parent_obj;
MyDevType devtype;
...other fields...
} MyDev;
The property can then be registered as follows:
static int mydev_prop_get_devtype(Object *obj,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
return dev->devtype;
}
static void mydev_prop_set_devtype(Object *obj,
int value,
Error **errp G_GNUC_UNUSED)
{
MyDev *dev = MYDEV(obj);
dev->devtype = value;
}
object_property_add_enum(obj, "devtype",
mydevtypemap, "MyDevType",
mydev_prop_get_devtype,
mydev_prop_set_devtype,
NULL);
Note there is no need to check the range of 'value' in
the setter, because the string->enum conversion code will
have already done that and reported an error as required.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:08 +00:00
|
|
|
g_test_add_func("/qom/proplist/badenum", test_dummy_badenum);
|
2015-05-27 15:07:56 +00:00
|
|
|
g_test_add_func("/qom/proplist/getenum", test_dummy_getenum);
|
2015-10-13 12:37:40 +00:00
|
|
|
g_test_add_func("/qom/proplist/iterator", test_dummy_iterator);
|
2018-09-06 14:14:01 +00:00
|
|
|
g_test_add_func("/qom/proplist/class_iterator", test_dummy_class_iterator);
|
2015-11-16 15:37:34 +00:00
|
|
|
g_test_add_func("/qom/proplist/delchild", test_dummy_delchild);
|
2017-07-07 21:30:51 +00:00
|
|
|
g_test_add_func("/qom/resolve/partial", test_qom_partial_path);
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 16:14:06 +00:00
|
|
|
|
|
|
|
return g_test_run();
|
|
|
|
}
|