[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 16/43] qdev: wrap default property value in an un
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 16/43] qdev: wrap default property value in an union |
Date: |
Wed, 7 Jun 2017 20:36:08 +0400 |
Wrap the Property default value (an int64_t) in a union, to prepare
for the next patch adding a uint64_t.
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/hw/qdev-core.h | 4 +++-
include/hw/qdev-properties.h | 8 ++++----
hw/core/qdev-properties.c | 6 +++---
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 9523339762..784971b8d8 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -226,7 +226,9 @@ struct Property {
PropertyInfo *info;
ptrdiff_t offset;
uint8_t bitnr;
- int64_t defval;
+ union {
+ int64_t i;
+ } defval;
int arrayoffset;
PropertyInfo *arrayinfo;
int arrayfieldsize;
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index 05603805cb..34524d0bfe 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -42,7 +42,7 @@ extern PropertyInfo qdev_prop_arraylen;
.info = &(_prop), \
.offset = offsetof(_state, _field) \
+ type_check(_type,typeof_field(_state, _field)), \
- .defval = (_type)_defval, \
+ .defval.i = (_type)_defval, \
}
#define DEFINE_PROP_BIT(_name, _state, _field, _bit, _defval) { \
.name = (_name), \
@@ -50,7 +50,7 @@ extern PropertyInfo qdev_prop_arraylen;
.bitnr = (_bit), \
.offset = offsetof(_state, _field) \
+ type_check(uint32_t,typeof_field(_state, _field)), \
- .defval = (bool)_defval, \
+ .defval.i = (bool)_defval, \
}
#define DEFINE_PROP_BIT64(_name, _state, _field, _bit, _defval) { \
.name = (_name), \
@@ -58,7 +58,7 @@ extern PropertyInfo qdev_prop_arraylen;
.bitnr = (_bit), \
.offset = offsetof(_state, _field) \
+ type_check(uint64_t, typeof_field(_state, _field)), \
- .defval = (bool)_defval, \
+ .defval.i = (bool)_defval, \
}
#define DEFINE_PROP_BOOL(_name, _state, _field, _defval) { \
@@ -66,7 +66,7 @@ extern PropertyInfo qdev_prop_arraylen;
.info = &(qdev_prop_bool), \
.offset = offsetof(_state, _field) \
+ type_check(bool, typeof_field(_state, _field)), \
- .defval = (bool)_defval, \
+ .defval.i = (bool)_defval, \
}
#define PROP_ARRAY_LEN_PREFIX "len-"
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index c5e028a45e..f3f682c611 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -71,7 +71,7 @@ static void set_enum(Object *obj, Visitor *v, const char
*name, void *opaque,
static void set_default_value_enum(Object *obj, const Property *prop)
{
- object_property_set_str(obj, prop->info->enum_table[prop->defval],
+ object_property_set_str(obj, prop->info->enum_table[prop->defval.i],
prop->name, &error_abort);
}
@@ -128,7 +128,7 @@ static void prop_set_bit(Object *obj, Visitor *v, const
char *name,
static void set_default_value_bool(Object *obj, const Property *prop)
{
- object_property_set_bool(obj, prop->defval, prop->name, &error_abort);
+ object_property_set_bool(obj, prop->defval.i, prop->name, &error_abort);
}
PropertyInfo qdev_prop_bit = {
@@ -261,7 +261,7 @@ static void set_uint8(Object *obj, Visitor *v, const char
*name, void *opaque,
static void set_default_value_int(Object *obj, const Property *prop)
{
- object_property_set_int(obj, prop->defval, prop->name, &error_abort);
+ object_property_set_int(obj, prop->defval.i, prop->name, &error_abort);
}
PropertyInfo qdev_prop_uint8 = {
--
2.13.0.91.g00982b8dd
- [Qemu-devel] [PATCH v3 10/43] json: learn to parse uint64 numbers, (continued)
- [Qemu-devel] [PATCH v3 10/43] json: learn to parse uint64 numbers, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 11/43] qapi: update the qobject visitor to use QNUM_U64, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 12/43] object: add uint property setter/getter, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 13/43] q35: fix get_mmcfg_size to use uint64 visitor, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 14/43] object: use more specific property type names, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 15/43] qdev: rename DEFINE_PROP_DEFAULT() to DEFINE_PROP_SIGNED(), Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 16/43] qdev: wrap default property value in an union,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v3 17/43] qdev: avoid type casts between signed and unsigned, Marc-André Lureau, 2017/06/07
[Qemu-devel] [PATCH v3 18/43] apic-common: make "id" property a uint32, Marc-André Lureau, 2017/06/07
[Qemu-devel] [PATCH v3 19/43] qdev: use appropriate getter/setters type, Marc-André Lureau, 2017/06/07
[Qemu-devel] [PATCH v3 20/43] isa: use get_uint() for "io-base", Marc-André Lureau, 2017/06/07
[Qemu-devel] [PATCH v3 21/43] pc-dimm: use get_uint() for dimm properties, Marc-André Lureau, 2017/06/07