[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/21] hw/core/qdev-properties: Export some integer-related functi
From: |
Eduardo Habkost |
Subject: |
[PULL 07/21] hw/core/qdev-properties: Export some integer-related functions |
Date: |
Mon, 5 Oct 2020 17:09:46 -0400 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
We are going to split this file and reuse these static functions.
Declare them in the local "qdev-prop-internal.h" header.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200930164949.1425294-8-philmd@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/core/qdev-prop-internal.h | 11 +++++++++
hw/core/qdev-properties.c | 46 +++++++++++++++++++-----------------
2 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/hw/core/qdev-prop-internal.h b/hw/core/qdev-prop-internal.h
index 2a8c9a306a5..9cf5cc1d519 100644
--- a/hw/core/qdev-prop-internal.h
+++ b/hw/core/qdev-prop-internal.h
@@ -15,5 +15,16 @@ void qdev_propinfo_set_enum(Object *obj, Visitor *v, const
char *name,
void qdev_propinfo_set_default_value_enum(ObjectProperty *op,
const Property *prop);
+void qdev_propinfo_set_default_value_int(ObjectProperty *op,
+ const Property *prop);
+void qdev_propinfo_set_default_value_uint(ObjectProperty *op,
+ const Property *prop);
+
+void qdev_propinfo_get_uint16(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp);
+void qdev_propinfo_get_int32(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp);
+void qdev_propinfo_get_size32(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp);
#endif
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 31dfe441e2e..37e309077a1 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -271,12 +271,14 @@ static void set_uint8(Object *obj, Visitor *v, const char
*name, void *opaque,
visit_type_uint8(v, name, ptr, errp);
}
-static void set_default_value_int(ObjectProperty *op, const Property *prop)
+void qdev_propinfo_set_default_value_int(ObjectProperty *op,
+ const Property *prop)
{
object_property_set_default_int(op, prop->defval.i);
}
-static void set_default_value_uint(ObjectProperty *op, const Property *prop)
+void qdev_propinfo_set_default_value_uint(ObjectProperty *op,
+ const Property *prop)
{
object_property_set_default_uint(op, prop->defval.u);
}
@@ -285,13 +287,13 @@ const PropertyInfo qdev_prop_uint8 = {
.name = "uint8",
.get = get_uint8,
.set = set_uint8,
- .set_default_value = set_default_value_uint,
+ .set_default_value = qdev_propinfo_set_default_value_uint,
};
/* --- 16bit integer --- */
-static void get_uint16(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
+void qdev_propinfo_get_uint16(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
{
DeviceState *dev = DEVICE(obj);
Property *prop = opaque;
@@ -317,9 +319,9 @@ static void set_uint16(Object *obj, Visitor *v, const char
*name,
const PropertyInfo qdev_prop_uint16 = {
.name = "uint16",
- .get = get_uint16,
+ .get = qdev_propinfo_get_uint16,
.set = set_uint16,
- .set_default_value = set_default_value_uint,
+ .set_default_value = qdev_propinfo_set_default_value_uint,
};
/* --- 32bit integer --- */
@@ -349,8 +351,8 @@ static void set_uint32(Object *obj, Visitor *v, const char
*name,
visit_type_uint32(v, name, ptr, errp);
}
-static void get_int32(Object *obj, Visitor *v, const char *name, void *opaque,
- Error **errp)
+void qdev_propinfo_get_int32(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
{
DeviceState *dev = DEVICE(obj);
Property *prop = opaque;
@@ -378,14 +380,14 @@ const PropertyInfo qdev_prop_uint32 = {
.name = "uint32",
.get = get_uint32,
.set = set_uint32,
- .set_default_value = set_default_value_uint,
+ .set_default_value = qdev_propinfo_set_default_value_uint,
};
const PropertyInfo qdev_prop_int32 = {
.name = "int32",
- .get = get_int32,
+ .get = qdev_propinfo_get_int32,
.set = set_int32,
- .set_default_value = set_default_value_int,
+ .set_default_value = qdev_propinfo_set_default_value_int,
};
/* --- 64bit integer --- */
@@ -444,14 +446,14 @@ const PropertyInfo qdev_prop_uint64 = {
.name = "uint64",
.get = get_uint64,
.set = set_uint64,
- .set_default_value = set_default_value_uint,
+ .set_default_value = qdev_propinfo_set_default_value_uint,
};
const PropertyInfo qdev_prop_int64 = {
.name = "int64",
.get = get_int64,
.set = set_int64,
- .set_default_value = set_default_value_int,
+ .set_default_value = qdev_propinfo_set_default_value_int,
};
/* --- string --- */
@@ -820,8 +822,8 @@ const PropertyInfo qdev_prop_pci_devfn = {
/* --- 32bit unsigned int 'size' type --- */
-static void get_size32(Object *obj, Visitor *v, const char *name, void *opaque,
- Error **errp)
+void qdev_propinfo_get_size32(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
{
DeviceState *dev = DEVICE(obj);
Property *prop = opaque;
@@ -861,9 +863,9 @@ static void set_size32(Object *obj, Visitor *v, const char
*name, void *opaque,
const PropertyInfo qdev_prop_size32 = {
.name = "size",
- .get = get_size32,
+ .get = qdev_propinfo_get_size32,
.set = set_size32,
- .set_default_value = set_default_value_uint,
+ .set_default_value = qdev_propinfo_set_default_value_uint,
};
/* --- blocksize --- */
@@ -919,9 +921,9 @@ const PropertyInfo qdev_prop_blocksize = {
.name = "size",
.description = "A power of two between " MIN_BLOCK_SIZE_STR
" and " MAX_BLOCK_SIZE_STR,
- .get = get_size32,
+ .get = qdev_propinfo_get_size32,
.set = set_blocksize,
- .set_default_value = set_default_value_uint,
+ .set_default_value = qdev_propinfo_set_default_value_uint,
};
/* --- pci host address --- */
@@ -1190,7 +1192,7 @@ const PropertyInfo qdev_prop_arraylen = {
.name = "uint32",
.get = get_uint32,
.set = set_prop_arraylen,
- .set_default_value = set_default_value_uint,
+ .set_default_value = qdev_propinfo_set_default_value_uint,
};
/* --- public helpers --- */
@@ -1401,7 +1403,7 @@ const PropertyInfo qdev_prop_size = {
.name = "size",
.get = get_size,
.set = set_size,
- .set_default_value = set_default_value_uint,
+ .set_default_value = qdev_propinfo_set_default_value_uint,
};
/* --- object link property --- */
--
2.26.2
- [PULL 00/21] machine + QOM queue, 2020-10-05, Eduardo Habkost, 2020/10/05
- [PULL 01/21] numa: hmat: require parent cache description before the next level one, Eduardo Habkost, 2020/10/05
- [PULL 03/21] hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr(), Eduardo Habkost, 2020/10/05
- [PULL 02/21] hw/core/qdev-properties: Use qemu_strtol() in set_mac() handler, Eduardo Habkost, 2020/10/05
- [PULL 04/21] hw/core/qdev-properties: Fix code style, Eduardo Habkost, 2020/10/05
- [PULL 05/21] hw/core/qdev-properties: Export enum-related functions, Eduardo Habkost, 2020/10/05
- [PULL 06/21] hw/core/qdev-properties: Export qdev_prop_enum, Eduardo Habkost, 2020/10/05
- [PULL 07/21] hw/core/qdev-properties: Export some integer-related functions,
Eduardo Habkost <=
- [PULL 09/21] hw/core/cpu: Add missing 'exec/cpu-common.h' include, Eduardo Habkost, 2020/10/05
- [PULL 11/21] qom: Fix DECLARE_*CHECKER documentation, Eduardo Habkost, 2020/10/05
- [PULL 08/21] hw/core/qdev-properties: Extract system-mode specific properties, Eduardo Habkost, 2020/10/05
- [PULL 13/21] docs/devel/qom: Fix indentation of code blocks, Eduardo Habkost, 2020/10/05
- [PULL 10/21] qom: Improve error message displayed with missing object properties, Eduardo Habkost, 2020/10/05
- [PULL 12/21] docs/devel/qom: Fix indentation of bulleted list, Eduardo Habkost, 2020/10/05
- [PULL 15/21] docs/devel/qom: Remove usage of <code>, Eduardo Habkost, 2020/10/05
- [PULL 17/21] kernel-doc: Handle function typedefs that return pointers, Eduardo Habkost, 2020/10/05
- [PULL 16/21] docs/devel/qom: Avoid long lines, Eduardo Habkost, 2020/10/05
- [PULL 20/21] memory: Explicitly tag doc comments for structs, Eduardo Habkost, 2020/10/05