[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/41] qdev: wrap default property value in an union
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 16/41] qdev: wrap default property value in an union |
Date: |
Fri, 9 Jun 2017 15:47:00 +0200 |
From: Marc-André Lureau <address@hidden>
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>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/core/qdev-properties.c | 6 +++---
include/hw/qdev-core.h | 4 +++-
include/hw/qdev-properties.h | 8 ++++----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index c5e028a..f3f682c 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 = {
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 9523339..784971b 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 0560380..34524d0 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-"
--
2.7.5
- [Qemu-devel] [PULL 00/41] QAPI patches for 2017-06-09, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 02/41] object: fix potential leak in getters, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 05/41] qapi: Clean up qobject_input_type_number() control flow, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 03/41] tests: Remove test cases for alternates of 'number' and 'int', Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 01/41] qdev: remove PropertyInfo.qtype field, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 09/41] qnum: add uint type, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 10/41] json: learn to parse uint64 numbers, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 12/41] object: add uint property setter/getter, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 11/41] qapi: update the qobject visitor to use QNUM_U64, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 20/41] isa: use get_uint() for "io-base", Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 16/41] qdev: wrap default property value in an union,
Markus Armbruster <=
- [Qemu-devel] [PULL 04/41] tests: add more int/number ranges checks, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 35/41] auxbus: use get_uint() for "addr" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 24/41] aspeed: use {set, get}_uint() for "ram-size" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 29/41] acpi: use get_uint() for "pci-hole*" properties, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 15/41] qdev: Rename DEFINE_PROP_DEFAULT() to DEFINE_PROP_SIGNED(), Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 33/41] xen: use get_uint() for "max-ram-below-4g" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 40/41] console: use get_uint() for "head" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 26/41] platform-bus: use get_uint() for "addr" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 30/41] pc: use get_uint() for "iobase" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 36/41] pvpanic: use get_uint() for "ioport" property, Markus Armbruster, 2017/06/09