[PATCH 1/3] qdev: pass the check callback to qdev_init_gpio_out_named

Eric Auger
2015-04-28T09:09:46Z

qdev_init_gpio_out_named takes a new argument corresponding to the
check callback passed to object_property_add_link. In qdev_init_gpio_out
this callback is set to the dummy object_property_allow_set_link.

This will allow qdev_init_gpio_out_named callers to specialize this
callback, typically sysbus.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
hw/core/qdev.c | 8 +++++---
include/hw/qdev-core.h | 3 ++-
include/qom/object.h | 3 +++
3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 7fa58be..dc82df4 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -452,7 +452,8 @@ void qdev_init_gpio_in(DeviceState *dev, qemu_irq_handler handler, int n)
}

void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins,
- const char *name, int n)
+ const char *name, int n,
+ object_property_set_link_t check_cb)
{
int i;
NamedGPIOList *gpio_list = qdev_get_named_gpio_list(dev, name);
@@ -465,7 +466,7 @@ void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins,
memset(&pins[i], 0, sizeof(*pins));
object_property_add_link(OBJECT(dev), propname, TYPE_IRQ,
(Object **)&pins[i],
- object_property_allow_set_link,
+ check_cb,
OBJ_PROP_LINK_UNREF_ON_RELEASE,
&error_abort);
}
@@ -474,7 +475,8 @@ void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins,

void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n)
{
- qdev_init_gpio_out_named(dev, pins, NULL, n);
+ qdev_init_gpio_out_named(dev, pins, NULL, n,
+ object_property_allow_set_link);
}

qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const char *name, int n)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 24c973d..9d500a3 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -294,7 +294,8 @@ void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n);
void qdev_init_gpio_in_named(DeviceState *dev, qemu_irq_handler handler,
const char *name, int n);
void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins,
- const char *name, int n);
+ const char *name, int n,
+ object_property_set_link_t fn);

void qdev_pass_gpios(DeviceState *dev, DeviceState *container,
const char *name);
diff --git a/include/qom/object.h b/include/qom/object.h
index d2d7748..4687fa1 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -33,6 +33,9 @@ typedef struct TypeInfo TypeInfo;
typedef struct InterfaceClass InterfaceClass;
typedef struct InterfaceInfo InterfaceInfo;

+typedef void (*object_property_set_link_t)(Object *, const char *,
+ Object *, Error **);
+
#define TYPE_OBJECT "object"

/**
--
1.8.3.2