[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom v4 07/13] qdev: gpio: Add API for intercepting a
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH qom v4 07/13] qdev: gpio: Add API for intercepting a GPIO |
Date: |
Fri, 17 Oct 2014 18:24:49 +0200 |
From: Peter Crosthwaite <address@hidden>
To replace the old qemu_irq intercept API (which had users reaching
into qdev private state for GPIOs).
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/core/qdev.c | 25 +++++++++++++++++++++++++
include/hw/qdev-core.h | 2 ++
2 files changed, 27 insertions(+)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 121a40b..2a88768 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -418,6 +418,31 @@ void qdev_connect_gpio_out_named(DeviceState *dev, const
char *name, int n,
g_free(propname);
}
+/* disconnect a GPIO ouput, returning the disconnected input (if any) */
+
+static qemu_irq qdev_disconnect_gpio_out_named(DeviceState *dev,
+ const char *name, int n)
+{
+ char *propname = g_strdup_printf("%s[%d]",
+ name ? name : "unnamed-gpio-out", n);
+
+ qemu_irq ret = (qemu_irq)object_property_get_link(OBJECT(dev), propname,
+ NULL);
+ if (ret) {
+ object_property_set_link(OBJECT(dev), NULL, propname, NULL);
+ }
+ g_free(propname);
+ return ret;
+}
+
+qemu_irq qdev_intercept_gpio_out(DeviceState *dev, qemu_irq icpt,
+ const char *name, int n)
+{
+ qemu_irq disconnected = qdev_disconnect_gpio_out_named(dev, name, n);
+ qdev_connect_gpio_out_named(dev, name, n, icpt);
+ return disconnected;
+}
+
void qdev_connect_gpio_out(DeviceState * dev, int n, qemu_irq pin)
{
qdev_connect_gpio_out_named(dev, NULL, n, pin);
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 178fee2..31301e5 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -274,6 +274,8 @@ qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const
char *name, int n);
void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin);
void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n,
qemu_irq pin);
+qemu_irq qdev_intercept_gpio_out(DeviceState *dev, qemu_irq icpt,
+ const char *name, int n);
BusState *qdev_get_child_bus(DeviceState *dev, const char *name);
--
2.1.0
- [Qemu-devel] [PATCH qom v4 00/13] GPIO/IRQ QOMification: Phase 2 - Getting rid of SYSBUS IRQs, Paolo Bonzini, 2014/10/17
- [Qemu-devel] [PATCH qom v4 02/13] qdev: gpio: Register GPIO inputs as child objects, Paolo Bonzini, 2014/10/17
- [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 <=
- [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, 2014/10/17
- [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