2013-07-10 22:08:40 +02:00
|
|
|
/*
|
|
|
|
* Test code for qdev global-properties handling
|
|
|
|
*
|
|
|
|
* Copyright (c) 2012 Red Hat Inc.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2016-02-08 19:08:51 +01:00
|
|
|
#include "qemu/osdep.h"
|
2013-07-10 22:08:40 +02:00
|
|
|
|
2019-08-12 07:23:51 +02:00
|
|
|
#include "hw/qdev-properties.h"
|
2013-07-10 22:08:42 +02:00
|
|
|
#include "qom/object.h"
|
qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
// only correct for bus-less @dev!
@@
expression errp;
expression dev;
@@
- qdev_init_nofail(dev);
+ qdev_realize(dev, NULL, &error_fatal);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(dev, true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
2020-06-10 07:32:45 +02:00
|
|
|
#include "qapi/error.h"
|
2013-07-10 22:08:42 +02:00
|
|
|
#include "qapi/visitor.h"
|
2013-07-10 22:08:40 +02:00
|
|
|
|
|
|
|
|
|
|
|
#define TYPE_STATIC_PROPS "static_prop_type"
|
2020-09-03 22:43:22 +02:00
|
|
|
typedef struct MyType MyType;
|
2020-08-31 23:07:33 +02:00
|
|
|
DECLARE_INSTANCE_CHECKER(MyType, STATIC_TYPE,
|
|
|
|
TYPE_STATIC_PROPS)
|
2013-07-10 22:08:40 +02:00
|
|
|
|
2017-07-11 02:43:02 +02:00
|
|
|
#define TYPE_SUBCLASS "static_prop_subtype"
|
|
|
|
|
2013-07-10 22:08:40 +02:00
|
|
|
#define PROP_DEFAULT 100
|
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct MyType {
|
2013-07-10 22:08:40 +02:00
|
|
|
DeviceState parent_obj;
|
|
|
|
|
|
|
|
uint32_t prop1;
|
|
|
|
uint32_t prop2;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
2013-07-10 22:08:40 +02:00
|
|
|
|
|
|
|
static Property static_props[] = {
|
|
|
|
DEFINE_PROP_UINT32("prop1", MyType, prop1, PROP_DEFAULT),
|
|
|
|
DEFINE_PROP_UINT32("prop2", MyType, prop2, PROP_DEFAULT),
|
|
|
|
DEFINE_PROP_END_OF_LIST()
|
|
|
|
};
|
|
|
|
|
|
|
|
static void static_prop_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
|
|
|
|
dc->realize = NULL;
|
2020-01-10 16:30:32 +01:00
|
|
|
device_class_set_props(dc, static_props);
|
2013-07-10 22:08:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo static_prop_type = {
|
|
|
|
.name = TYPE_STATIC_PROPS,
|
|
|
|
.parent = TYPE_DEVICE,
|
|
|
|
.instance_size = sizeof(MyType),
|
|
|
|
.class_init = static_prop_class_init,
|
|
|
|
};
|
|
|
|
|
2017-07-11 02:43:02 +02:00
|
|
|
static const TypeInfo subclass_type = {
|
|
|
|
.name = TYPE_SUBCLASS,
|
|
|
|
.parent = TYPE_STATIC_PROPS,
|
|
|
|
};
|
|
|
|
|
2013-07-10 22:08:40 +02:00
|
|
|
/* Test simple static property setting to default value */
|
2014-08-08 21:03:27 +02:00
|
|
|
static void test_static_prop_subprocess(void)
|
2013-07-10 22:08:40 +02:00
|
|
|
{
|
|
|
|
MyType *mt;
|
|
|
|
|
|
|
|
mt = STATIC_TYPE(object_new(TYPE_STATIC_PROPS));
|
qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
// only correct for bus-less @dev!
@@
expression errp;
expression dev;
@@
- qdev_init_nofail(dev);
+ qdev_realize(dev, NULL, &error_fatal);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(dev, true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
2020-06-10 07:32:45 +02:00
|
|
|
qdev_realize(DEVICE(mt), NULL, &error_fatal);
|
2013-07-10 22:08:40 +02:00
|
|
|
|
|
|
|
g_assert_cmpuint(mt->prop1, ==, PROP_DEFAULT);
|
|
|
|
}
|
|
|
|
|
2014-08-08 21:03:27 +02:00
|
|
|
static void test_static_prop(void)
|
|
|
|
{
|
|
|
|
g_test_trap_subprocess("/qdev/properties/static/default/subprocess", 0, 0);
|
|
|
|
g_test_trap_assert_passed();
|
|
|
|
g_test_trap_assert_stderr("");
|
|
|
|
g_test_trap_assert_stdout("");
|
|
|
|
}
|
|
|
|
|
2018-12-04 15:20:09 +01:00
|
|
|
static void register_global_properties(GlobalProperty *props)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; props[i].driver != NULL; i++) {
|
|
|
|
qdev_prop_register_global(props + i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-07-10 22:08:40 +02:00
|
|
|
/* Test setting of static property using global properties */
|
2014-08-08 21:03:27 +02:00
|
|
|
static void test_static_globalprop_subprocess(void)
|
2013-07-10 22:08:40 +02:00
|
|
|
{
|
|
|
|
MyType *mt;
|
|
|
|
static GlobalProperty props[] = {
|
|
|
|
{ TYPE_STATIC_PROPS, "prop1", "200" },
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
2018-12-04 15:20:09 +01:00
|
|
|
register_global_properties(props);
|
2013-07-10 22:08:40 +02:00
|
|
|
|
|
|
|
mt = STATIC_TYPE(object_new(TYPE_STATIC_PROPS));
|
qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
// only correct for bus-less @dev!
@@
expression errp;
expression dev;
@@
- qdev_init_nofail(dev);
+ qdev_realize(dev, NULL, &error_fatal);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(dev, true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
2020-06-10 07:32:45 +02:00
|
|
|
qdev_realize(DEVICE(mt), NULL, &error_fatal);
|
2013-07-10 22:08:40 +02:00
|
|
|
|
|
|
|
g_assert_cmpuint(mt->prop1, ==, 200);
|
|
|
|
g_assert_cmpuint(mt->prop2, ==, PROP_DEFAULT);
|
|
|
|
}
|
|
|
|
|
2014-08-08 21:03:27 +02:00
|
|
|
static void test_static_globalprop(void)
|
|
|
|
{
|
|
|
|
g_test_trap_subprocess("/qdev/properties/static/global/subprocess", 0, 0);
|
|
|
|
g_test_trap_assert_passed();
|
|
|
|
g_test_trap_assert_stderr("");
|
|
|
|
g_test_trap_assert_stdout("");
|
|
|
|
}
|
|
|
|
|
2013-07-10 22:08:42 +02:00
|
|
|
#define TYPE_DYNAMIC_PROPS "dynamic-prop-type"
|
2020-08-31 23:07:33 +02:00
|
|
|
DECLARE_INSTANCE_CHECKER(MyType, DYNAMIC_TYPE,
|
|
|
|
TYPE_DYNAMIC_PROPS)
|
2013-07-10 22:08:42 +02:00
|
|
|
|
2014-08-08 21:03:29 +02:00
|
|
|
#define TYPE_UNUSED_HOTPLUG "hotplug-type"
|
|
|
|
#define TYPE_UNUSED_NOHOTPLUG "nohotplug-type"
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:55 +01:00
|
|
|
static void prop1_accessor(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
2013-07-10 22:08:42 +02:00
|
|
|
{
|
|
|
|
MyType *mt = DYNAMIC_TYPE(obj);
|
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:54 +01:00
|
|
|
visit_type_uint32(v, name, &mt->prop1, errp);
|
2013-07-10 22:08:42 +02:00
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:55 +01:00
|
|
|
static void prop2_accessor(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
2013-07-10 22:08:42 +02:00
|
|
|
{
|
|
|
|
MyType *mt = DYNAMIC_TYPE(obj);
|
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:54 +01:00
|
|
|
visit_type_uint32(v, name, &mt->prop2, errp);
|
2013-07-10 22:08:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void dynamic_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
object_property_add(obj, "prop1", "uint32", prop1_accessor, prop1_accessor,
|
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 17:29:22 +02:00
|
|
|
NULL, NULL);
|
2013-07-10 22:08:42 +02:00
|
|
|
object_property_add(obj, "prop2", "uint32", prop2_accessor, prop2_accessor,
|
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 17:29:22 +02:00
|
|
|
NULL, NULL);
|
2013-07-10 22:08:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void dynamic_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
|
|
|
|
dc->realize = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static const TypeInfo dynamic_prop_type = {
|
|
|
|
.name = TYPE_DYNAMIC_PROPS,
|
|
|
|
.parent = TYPE_DEVICE,
|
|
|
|
.instance_size = sizeof(MyType),
|
|
|
|
.instance_init = dynamic_instance_init,
|
|
|
|
.class_init = dynamic_class_init,
|
|
|
|
};
|
|
|
|
|
2014-08-08 21:03:29 +02:00
|
|
|
static void hotplug_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
|
|
|
|
dc->realize = NULL;
|
|
|
|
dc->hotpluggable = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo hotplug_type = {
|
|
|
|
.name = TYPE_UNUSED_HOTPLUG,
|
|
|
|
.parent = TYPE_DEVICE,
|
|
|
|
.instance_size = sizeof(MyType),
|
|
|
|
.instance_init = dynamic_instance_init,
|
|
|
|
.class_init = hotplug_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void nohotplug_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
|
|
|
|
dc->realize = NULL;
|
|
|
|
dc->hotpluggable = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo nohotplug_type = {
|
|
|
|
.name = TYPE_UNUSED_NOHOTPLUG,
|
|
|
|
.parent = TYPE_DEVICE,
|
|
|
|
.instance_size = sizeof(MyType),
|
|
|
|
.instance_init = dynamic_instance_init,
|
|
|
|
.class_init = nohotplug_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define TYPE_NONDEVICE "nondevice-type"
|
|
|
|
|
|
|
|
static const TypeInfo nondevice_type = {
|
|
|
|
.name = TYPE_NONDEVICE,
|
|
|
|
.parent = TYPE_OBJECT,
|
|
|
|
};
|
|
|
|
|
2014-08-08 21:03:26 +02:00
|
|
|
/* Test setting of dynamic properties using global properties */
|
2014-08-08 21:03:27 +02:00
|
|
|
static void test_dynamic_globalprop_subprocess(void)
|
2013-07-10 22:08:42 +02:00
|
|
|
{
|
|
|
|
MyType *mt;
|
|
|
|
static GlobalProperty props[] = {
|
2018-11-06 12:59:23 +01:00
|
|
|
{ TYPE_DYNAMIC_PROPS, "prop1", "101", },
|
|
|
|
{ TYPE_DYNAMIC_PROPS, "prop2", "102", },
|
|
|
|
{ TYPE_DYNAMIC_PROPS"-bad", "prop3", "103", },
|
|
|
|
{ TYPE_UNUSED_HOTPLUG, "prop4", "104", },
|
|
|
|
{ TYPE_UNUSED_NOHOTPLUG, "prop5", "105", },
|
|
|
|
{ TYPE_NONDEVICE, "prop6", "106", },
|
2013-07-10 22:08:42 +02:00
|
|
|
{}
|
|
|
|
};
|
2018-12-04 15:20:05 +01:00
|
|
|
int global_error;
|
2013-07-10 22:08:42 +02:00
|
|
|
|
2018-12-04 15:20:09 +01:00
|
|
|
register_global_properties(props);
|
2013-07-10 22:08:42 +02:00
|
|
|
|
|
|
|
mt = DYNAMIC_TYPE(object_new(TYPE_DYNAMIC_PROPS));
|
qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
// only correct for bus-less @dev!
@@
expression errp;
expression dev;
@@
- qdev_init_nofail(dev);
+ qdev_realize(dev, NULL, &error_fatal);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(dev, true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
2020-06-10 07:32:45 +02:00
|
|
|
qdev_realize(DEVICE(mt), NULL, &error_fatal);
|
2013-07-10 22:08:42 +02:00
|
|
|
|
|
|
|
g_assert_cmpuint(mt->prop1, ==, 101);
|
|
|
|
g_assert_cmpuint(mt->prop2, ==, 102);
|
2018-12-04 15:20:05 +01:00
|
|
|
global_error = qdev_prop_check_globals();
|
|
|
|
g_assert_cmpuint(global_error, ==, 1);
|
2014-08-08 21:03:31 +02:00
|
|
|
g_assert(props[0].used);
|
|
|
|
g_assert(props[1].used);
|
|
|
|
g_assert(!props[2].used);
|
|
|
|
g_assert(!props[3].used);
|
|
|
|
g_assert(!props[4].used);
|
|
|
|
g_assert(!props[5].used);
|
2013-07-10 22:08:42 +02:00
|
|
|
}
|
|
|
|
|
2014-08-08 21:03:27 +02:00
|
|
|
static void test_dynamic_globalprop(void)
|
|
|
|
{
|
|
|
|
g_test_trap_subprocess("/qdev/properties/dynamic/global/subprocess", 0, 0);
|
|
|
|
g_test_trap_assert_passed();
|
|
|
|
g_test_trap_assert_stderr_unmatched("*prop1*");
|
|
|
|
g_test_trap_assert_stderr_unmatched("*prop2*");
|
2020-09-15 19:12:29 +02:00
|
|
|
g_test_trap_assert_stderr(
|
|
|
|
"*warning: global dynamic-prop-type-bad.prop3 has invalid class name*");
|
2014-08-08 21:03:29 +02:00
|
|
|
g_test_trap_assert_stderr_unmatched("*prop4*");
|
2020-09-15 19:12:29 +02:00
|
|
|
g_test_trap_assert_stderr(
|
|
|
|
"*warning: global nohotplug-type.prop5=105 not used*");
|
|
|
|
g_test_trap_assert_stderr(
|
|
|
|
"*warning: global nondevice-type.prop6 has invalid class name*");
|
2014-08-08 21:03:31 +02:00
|
|
|
g_test_trap_assert_stdout("");
|
|
|
|
}
|
|
|
|
|
2017-07-11 02:43:02 +02:00
|
|
|
/* Test if global props affecting subclasses are applied in the right order */
|
|
|
|
static void test_subclass_global_props(void)
|
|
|
|
{
|
|
|
|
MyType *mt;
|
|
|
|
/* Global properties must be applied in the order they were registered */
|
|
|
|
static GlobalProperty props[] = {
|
|
|
|
{ TYPE_STATIC_PROPS, "prop1", "101" },
|
|
|
|
{ TYPE_SUBCLASS, "prop1", "102" },
|
|
|
|
{ TYPE_SUBCLASS, "prop2", "103" },
|
|
|
|
{ TYPE_STATIC_PROPS, "prop2", "104" },
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
2018-12-04 15:20:09 +01:00
|
|
|
register_global_properties(props);
|
2017-07-11 02:43:02 +02:00
|
|
|
|
|
|
|
mt = STATIC_TYPE(object_new(TYPE_SUBCLASS));
|
qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
// only correct for bus-less @dev!
@@
expression errp;
expression dev;
@@
- qdev_init_nofail(dev);
+ qdev_realize(dev, NULL, &error_fatal);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(dev, true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
2020-06-10 07:32:45 +02:00
|
|
|
qdev_realize(DEVICE(mt), NULL, &error_fatal);
|
2017-07-11 02:43:02 +02:00
|
|
|
|
|
|
|
g_assert_cmpuint(mt->prop1, ==, 102);
|
|
|
|
g_assert_cmpuint(mt->prop2, ==, 104);
|
|
|
|
}
|
|
|
|
|
2013-07-10 22:08:40 +02:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
|
|
|
|
module_call_init(MODULE_INIT_QOM);
|
|
|
|
type_register_static(&static_prop_type);
|
2017-07-11 02:43:02 +02:00
|
|
|
type_register_static(&subclass_type);
|
2013-07-10 22:08:42 +02:00
|
|
|
type_register_static(&dynamic_prop_type);
|
2014-08-08 21:03:29 +02:00
|
|
|
type_register_static(&hotplug_type);
|
|
|
|
type_register_static(&nohotplug_type);
|
|
|
|
type_register_static(&nondevice_type);
|
2013-07-10 22:08:40 +02:00
|
|
|
|
2014-08-08 21:03:27 +02:00
|
|
|
g_test_add_func("/qdev/properties/static/default/subprocess",
|
|
|
|
test_static_prop_subprocess);
|
|
|
|
g_test_add_func("/qdev/properties/static/default",
|
|
|
|
test_static_prop);
|
|
|
|
|
|
|
|
g_test_add_func("/qdev/properties/static/global/subprocess",
|
|
|
|
test_static_globalprop_subprocess);
|
|
|
|
g_test_add_func("/qdev/properties/static/global",
|
|
|
|
test_static_globalprop);
|
|
|
|
|
|
|
|
g_test_add_func("/qdev/properties/dynamic/global/subprocess",
|
|
|
|
test_dynamic_globalprop_subprocess);
|
|
|
|
g_test_add_func("/qdev/properties/dynamic/global",
|
|
|
|
test_dynamic_globalprop);
|
2013-07-10 22:08:40 +02:00
|
|
|
|
2017-07-11 02:43:02 +02:00
|
|
|
g_test_add_func("/qdev/properties/global/subclass",
|
|
|
|
test_subclass_global_props);
|
|
|
|
|
2013-07-10 22:08:40 +02:00
|
|
|
g_test_run();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|