[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/36] qdev: Make bit_prop_set() get Object* argument
From: |
Eduardo Habkost |
Subject: |
[PATCH 08/36] qdev: Make bit_prop_set() get Object* argument |
Date: |
Thu, 29 Oct 2020 18:02:18 -0400 |
Make the code more generic and not specific to TYPE_DEVICE.
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
---
hw/core/qdev-properties.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index b6cf53e929..3a4638f4de 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -92,8 +92,9 @@ static uint32_t qdev_get_prop_mask(Property *prop)
return 0x1 << prop->bitnr;
}
-static void bit_prop_set(DeviceState *dev, Property *props, bool val)
+static void bit_prop_set(Object *obj, Property *props, bool val)
{
+ DeviceState *dev = DEVICE(obj);
uint32_t *p = qdev_get_prop_ptr(dev, props);
uint32_t mask = qdev_get_prop_mask(props);
if (val) {
@@ -129,7 +130,7 @@ static void prop_set_bit(Object *obj, Visitor *v, const
char *name,
if (!visit_type_bool(v, name, &value, errp)) {
return;
}
- bit_prop_set(dev, prop, value);
+ bit_prop_set(obj, prop, value);
}
static void set_default_value_bool(ObjectProperty *op, const Property *prop)
@@ -153,8 +154,9 @@ static uint64_t qdev_get_prop_mask64(Property *prop)
return 0x1ull << prop->bitnr;
}
-static void bit64_prop_set(DeviceState *dev, Property *props, bool val)
+static void bit64_prop_set(Object *obj, Property *props, bool val)
{
+ DeviceState *dev = DEVICE(obj);
uint64_t *p = qdev_get_prop_ptr(dev, props);
uint64_t mask = qdev_get_prop_mask64(props);
if (val) {
@@ -190,7 +192,7 @@ static void prop_set_bit64(Object *obj, Visitor *v, const
char *name,
if (!visit_type_bool(v, name, &value, errp)) {
return;
}
- bit64_prop_set(dev, prop, value);
+ bit64_prop_set(obj, prop, value);
}
const PropertyInfo qdev_prop_bit64 = {
--
2.28.0
- [PATCH 02/36] cpu: Move cpu_common_props to hw/core/cpu.c, (continued)
- [PATCH 02/36] cpu: Move cpu_common_props to hw/core/cpu.c, Eduardo Habkost, 2020/10/29
- [PATCH 03/36] qdev: Move property code to qdev-properties.[ch], Eduardo Habkost, 2020/10/29
- [PATCH 04/36] qdev: Check dev->realized at set_size(), Eduardo Habkost, 2020/10/29
- [PATCH 06/36] qdev: Don't use dev->id on set_size32() error message, Eduardo Habkost, 2020/10/29
- [PATCH 07/36] qdev: Make PropertyInfo.print method get Object* argument, Eduardo Habkost, 2020/10/29
- [PATCH 08/36] qdev: Make bit_prop_set() get Object* argument,
Eduardo Habkost <=
- [PATCH 05/36] sparc: Check dev->realized at sparc_set_nwindows(), Eduardo Habkost, 2020/10/29
- [PATCH 10/36] qdev: Make qdev_find_global_prop() get Object* argument, Eduardo Habkost, 2020/10/29
- [PATCH 09/36] qdev: Make qdev_get_prop_ptr() get Object* arg, Eduardo Habkost, 2020/10/29