[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/36] qdev: Make PropertyInfo.print method get Object* argument
From: |
Eduardo Habkost |
Subject: |
[PATCH 07/36] qdev: Make PropertyInfo.print method get Object* argument |
Date: |
Thu, 29 Oct 2020 18:02:17 -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 | 3 ++-
hw/core/qdev-properties.c | 3 +--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index db7ce51dd5..0ea822e6a7 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -32,7 +32,7 @@ struct PropertyInfo {
const char *name;
const char *description;
const QEnumLookup *enum_table;
- int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len);
+ int (*print)(Object *obj, Property *prop, char *dest, size_t len);
void (*set_default_value)(ObjectProperty *op, const Property *prop);
void (*create)(ObjectClass *oc, Property *prop);
ObjectPropertyAccessor *get;
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index b81a4e8d14..d0fb063a49 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -801,9 +801,10 @@ invalid:
g_free(str);
}
-static int print_pci_devfn(DeviceState *dev, Property *prop, char *dest,
+static int print_pci_devfn(Object *obj, Property *prop, char *dest,
size_t len)
{
+ DeviceState *dev = DEVICE(obj);
int32_t *ptr = qdev_get_prop_ptr(dev, prop);
if (*ptr == -1) {
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index daf844c2d3..b6cf53e929 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -988,13 +988,12 @@ static void qdev_get_legacy_property(Object *obj, Visitor
*v,
const char *name, void *opaque,
Error **errp)
{
- DeviceState *dev = DEVICE(obj);
Property *prop = opaque;
char buffer[1024];
char *ptr = buffer;
- prop->info->print(dev, prop, buffer, sizeof(buffer));
+ prop->info->print(obj, prop, buffer, sizeof(buffer));
visit_type_str(v, name, &ptr, errp);
}
--
2.28.0
- [PATCH 01/36] cs4231: Get rid of empty property array, (continued)
- [PATCH 01/36] cs4231: Get rid of empty property array, Eduardo Habkost, 2020/10/29
- [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 <=
- [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, 2020/10/29
- [PATCH 09/36] qdev: Make qdev_get_prop_ptr() get Object* arg, Eduardo Habkost, 2020/10/29