haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hw/core/qdev-properties: Export some integer-related functions

Browse source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2020-09-30 18:49:45 +02:00 committed by Eduardo Habkost
parent 79bdf29c08
commit 93e163e4ef
2 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hw/core/qdev-prop-internal.h
View file

@ -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

46
hw/core/qdev-properties.c
View file

@ -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 --- */