[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom v4 12/13] qdev: gpio: Define qdev_pass_gpios()
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH qom v4 12/13] qdev: gpio: Define qdev_pass_gpios() |
Date: |
Fri, 17 Oct 2014 18:24:54 +0200 |
From: Peter Crosthwaite <address@hidden>
Allows a container to take ownership of GPIOs in a contained
device and automatically connect them as GPIOs to the container.
This prepares for deprecation of the SYSBUS IRQ functionality, which
has this feature. We push it up to the device level instead of sysbus
level. There's nothing sysbus specific about passing GPIOs to
containers so its a legitimate device-level generic feature.
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/core/qdev.c | 26 ++++++++++++++++++++++++++
include/hw/qdev-core.h | 3 +++
2 files changed, 29 insertions(+)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index c143cd0..0ff8039 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -446,6 +446,32 @@ void qdev_connect_gpio_out(DeviceState * dev, int n,
qemu_irq pin)
qdev_connect_gpio_out_named(dev, NULL, n, pin);
}
+void qdev_pass_gpios(DeviceState *dev, DeviceState *container,
+ const char *name)
+{
+ int i;
+ NamedGPIOList *ngl = qdev_get_named_gpio_list(dev, name);
+
+ for (i = 0; i < ngl->num_in; i++) {
+ const char *nm = ngl->name ? ngl->name : "unnamed-gpio-in";
+ char *propname = g_strdup_printf("%s[%d]", nm, i);
+
+ object_property_add_alias(OBJECT(container), propname,
+ OBJECT(dev), propname,
+ &error_abort);
+ }
+ for (i = 0; i < ngl->num_out; i++) {
+ const char *nm = ngl->name ? ngl->name : "unnamed-gpio-out";
+ char *propname = g_strdup_printf("%s[%d]", nm, i);
+
+ object_property_add_alias(OBJECT(container), propname,
+ OBJECT(dev), propname,
+ &error_abort);
+ }
+ QLIST_REMOVE(ngl, node);
+ QLIST_INSERT_HEAD(&container->gpios, ngl, node);
+}
+
BusState *qdev_get_child_bus(DeviceState *dev, const char *name)
{
BusState *bus;
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index eac603b..77b193b 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -289,6 +289,9 @@ void qdev_init_gpio_in_named(DeviceState *dev,
qemu_irq_handler handler,
void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins,
const char *name, int n);
+void qdev_pass_gpios(DeviceState *dev, DeviceState *container,
+ const char *name);
+
BusState *qdev_get_parent_bus(DeviceState *dev);
/*** BUS API. ***/
--
2.1.0
- [Qemu-devel] [PATCH qom v4 03/13] qdev: gpio: Register GPIO outputs as QOM links, (continued)
- [Qemu-devel] [PATCH qom v4 03/13] qdev: gpio: Register GPIO outputs as QOM links, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 01/13] qdev: gpio: Don't allow name share between I and O, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 04/13] qom: Allow clearing of a Link property, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 05/13] qom: Demote already-has-a-parent to a regular error, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 06/13] qdev: gpio: Re-implement qdev_connect_gpio QOM style, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 07/13] qdev: gpio: Add API for intercepting a GPIO, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 08/13] qtest/irq: Rework IRQ interception, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 09/13] irq: Remove qemu_irq_intercept_out, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 10/13] qdev: gpio: delete NamedGPIOList::out, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 11/13] qdev: gpio: Remove qdev_init_gpio_out x1 restriction, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 12/13] qdev: gpio: Define qdev_pass_gpios(),
Paolo Bonzini <=
- [Qemu-devel] [PATCH qom v4 13/13] sysbus: Use TYPE_DEVICE GPIO functionality, Paolo Bonzini, 2014/10/17
- Re: [Qemu-devel] [PATCH qom v4 00/13] GPIO/IRQ QOMification: Phase 2 - Getting rid of SYSBUS IRQs, Peter Crosthwaite, 2014/10/19