[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/25] qdev: Make qdev_find_global_prop() get Object* argument
From: |
Eduardo Habkost |
Subject: |
[PULL 20/25] qdev: Make qdev_find_global_prop() get Object* argument |
Date: |
Tue, 15 Dec 2020 10:19:37 -0500 |
Make the code more generic and not specific to TYPE_DEVICE.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201211220529.2290218-11-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/core/qdev-properties-system.c | 2 +-
hw/core/qdev-properties.c | 4 ++--
include/hw/qdev-properties.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 9ac9b95852..57e63c6949 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -36,7 +36,7 @@ static bool check_prop_still_unset(DeviceState *dev, const
char *name,
const void *old_val, const char *new_val,
Error **errp)
{
- const GlobalProperty *prop = qdev_find_global_prop(dev, name);
+ const GlobalProperty *prop = qdev_find_global_prop(OBJECT(dev), name);
if (!old_val) {
return true;
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 0a54a922c8..41482d83d1 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -818,7 +818,7 @@ void qdev_prop_register_global(GlobalProperty *prop)
g_ptr_array_add(global_props(), prop);
}
-const GlobalProperty *qdev_find_global_prop(DeviceState *dev,
+const GlobalProperty *qdev_find_global_prop(Object *obj,
const char *name)
{
GPtrArray *props = global_props();
@@ -827,7 +827,7 @@ const GlobalProperty *qdev_find_global_prop(DeviceState
*dev,
for (i = 0; i < props->len; i++) {
p = g_ptr_array_index(props, i);
- if (object_dynamic_cast(OBJECT(dev), p->driver)
+ if (object_dynamic_cast(obj, p->driver)
&& !strcmp(p->property, name)) {
return p;
}
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index 0b92cfc761..7620095fed 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -305,7 +305,7 @@ void qdev_prop_set_enum(DeviceState *dev, const char *name,
int value);
void *qdev_get_prop_ptr(Object *obj, Property *prop);
void qdev_prop_register_global(GlobalProperty *prop);
-const GlobalProperty *qdev_find_global_prop(DeviceState *dev,
+const GlobalProperty *qdev_find_global_prop(Object *obj,
const char *name);
int qdev_prop_check_globals(void);
void qdev_prop_set_globals(DeviceState *dev);
--
2.28.0
- [PULL 01/25] vexpress: Register "secure" as class property, (continued)
- [PULL 01/25] vexpress: Register "secure" as class property, Eduardo Habkost, 2020/12/15
- [PULL 16/25] qdev: Don't use dev->id on set_size32() error message, Eduardo Habkost, 2020/12/15
- [PULL 11/25] cs4231: Get rid of empty property array, Eduardo Habkost, 2020/12/15
- [PULL 07/25] arm/cpu64: Register "aarch64" as class property, Eduardo Habkost, 2020/12/15
- [PULL 04/25] i386: Register feature bit properties as class properties, Eduardo Habkost, 2020/12/15
- [PULL 13/25] qdev: Move property code to qdev-properties.[ch], Eduardo Habkost, 2020/12/15
- [PULL 12/25] cpu: Move cpu_common_props to hw/core/cpu.c, Eduardo Habkost, 2020/12/15
- [PULL 08/25] can_host: Use class properties, Eduardo Habkost, 2020/12/15
- [PULL 25/25] MAINTAINERS: Update my git repository URLs, Eduardo Habkost, 2020/12/15
- [PULL 17/25] qdev: Make PropertyInfo.print method get Object* argument, Eduardo Habkost, 2020/12/15
- [PULL 20/25] qdev: Make qdev_find_global_prop() get Object* argument,
Eduardo Habkost <=
- [PULL 23/25] qdev: Make qdev_propinfo_get_uint16() static, Eduardo Habkost, 2020/12/15
- [PULL 19/25] qdev: Make qdev_get_prop_ptr() get Object* arg, Eduardo Habkost, 2020/12/15
- [PULL 24/25] qdev: Move UUID property to qdev-properties-system.c, Eduardo Habkost, 2020/12/15
- [PULL 06/25] virt: Register "its" as class property, Eduardo Habkost, 2020/12/15
- Re: [PULL 00/25] Machine queue, 2020-12-15, Peter Maydell, 2020/12/15