[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 33/36] tests: Use static properties at check-qom-proplist test ca
From: |
Eduardo Habkost |
Subject: |
[PATCH 33/36] tests: Use static properties at check-qom-proplist test case |
Date: |
Thu, 29 Oct 2020 18:02:43 -0400 |
Use static properties for the bool and string properties used at
check-qom-proplist.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: qemu-devel@nongnu.org
---
tests/check-qom-proplist.c | 61 +++++---------------------------------
1 file changed, 8 insertions(+), 53 deletions(-)
diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c
index 1b76581980..94ad6631c0 100644
--- a/tests/check-qom-proplist.c
+++ b/tests/check-qom-proplist.c
@@ -26,6 +26,8 @@
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qom/object_interfaces.h"
+#include "qom/static-property.h"
+#include "qom/static-property-internal.h"
#define TYPE_DUMMY "qemu-dummy"
@@ -68,24 +70,6 @@ struct DummyObjectClass {
};
-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;
-}
-
-
static void dummy_set_av(Object *obj,
int value,
Error **errp)
@@ -103,39 +87,20 @@ static int dummy_get_av(Object *obj,
return dobj->av;
}
+static Property bv_prop =
+ DEFINE_PROP_BOOL("bv", DummyObject, bv, false);
-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 Property sv_prop =
+ DEFINE_PROP_STRING("sv", DummyObject, sv);
static void dummy_init(Object *obj)
{
- object_property_add_bool(obj, "bv",
- dummy_get_bv,
- dummy_set_bv);
+ object_property_add_static(obj, &bv_prop, NULL);
}
-
static void dummy_class_init(ObjectClass *cls, void *data)
{
- object_class_property_add_str(cls, "sv",
- dummy_get_sv,
- dummy_set_sv);
+ object_class_property_add_static(cls, &sv_prop, NULL);
object_class_property_add_enum(cls, "av",
"DummyAnimal",
&dummy_animal_map,
@@ -143,21 +108,11 @@ static void dummy_class_init(ObjectClass *cls, void *data)
dummy_set_av);
}
-
-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),
.class_init = dummy_class_init,
.interfaces = (InterfaceInfo[]) {
--
2.28.0
- Re: [PATCH 34/36] machine: Use DEFINE_PROP_STRING for string properties, (continued)
- [PATCH 27/36] qdev: Reuse DEFINE_PROP in all DEFINE_PROP_* macros, Eduardo Habkost, 2020/10/29
- [PATCH 29/36] qdev: Move qdev_prop_tpm declaration to tpm_prop.h, Eduardo Habkost, 2020/10/29
- [PATCH 32/36] qdev: Move base property types to qom/property-types.c, Eduardo Habkost, 2020/10/29
- [PATCH 35/36] machine: Use DEFINE_PROP_BOOL for boolean properties, Eduardo Habkost, 2020/10/29
- [PATCH 36/36] qom: Include static property API reference in documentation, Eduardo Habkost, 2020/10/29
- [PATCH 33/36] tests: Use static properties at check-qom-proplist test case,
Eduardo Habkost <=