[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/36] qdev: Make qdev_find_global_prop() get Object* argument
From: |
Eduardo Habkost |
Subject: |
[PATCH 10/36] qdev: Make qdev_find_global_prop() get Object* argument |
Date: |
Thu, 29 Oct 2020 18:02:20 -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
---
include/hw/qdev-properties.h | 2 +-
hw/core/qdev-properties-system.c | 2 +-
hw/core/qdev-properties.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
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);
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index c8c73c371b..af1339e562 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;
}
--
2.28.0
- [PATCH 04/36] qdev: Check dev->realized at set_size(), (continued)
- [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, 2020/10/29
- [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 <=
- [PATCH 09/36] qdev: Make qdev_get_prop_ptr() get Object* arg, Eduardo Habkost, 2020/10/29
[PATCH 11/36] qdev: Make check_prop_still_unset() get Object* argument, Eduardo Habkost, 2020/10/29