[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/24] qdev: gpio: Add API for intercepting a GPIO
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 08/24] qdev: gpio: Add API for intercepting a GPIO |
Date: |
Thu, 23 Oct 2014 15:33:56 +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 fc7860f..92f88f6 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -455,6 +455,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 1fca75c..cf27e65 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -273,6 +273,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);
--
1.8.3.1
- [Qemu-devel] [PULL 00/24] SCSI, maintainers and more - 2014-10-17, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 01/24] virtio-scsi-dataplane: Add op blocker, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 06/24] qom: Demote already-has-a-parent to a regular error, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 02/24] virtio-scsi: dataplane: print why starting failed, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 05/24] qom: Allow clearing of a Link property, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 07/24] qdev: gpio: Re-implement qdev_connect_gpio QOM style, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 03/24] virtio-scsi: dataplane: fail setup gracefully, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 08/24] qdev: gpio: Add API for intercepting a GPIO,
Paolo Bonzini <=
- [Qemu-devel] [PULL 09/24] qtest/irq: Rework IRQ interception, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 10/24] irq: Remove qemu_irq_intercept_out, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 04/24] virtio-scsi: dataplane: stop trying on notifier error, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 11/24] qdev: gpio: delete NamedGPIOList::out, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 12/24] qdev: gpio: Remove qdev_init_gpio_out x1 restriction, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 13/24] qdev: gpio: Define qdev_pass_gpios(), Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 14/24] sysbus: Use TYPE_DEVICE GPIO functionality, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 16/24] MAINTAINERS: grab more files from Anthony's pile, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 17/24] MAINTAINERS: add Samuel Thibault as usb-serial.c and baum.c maintainer, Paolo Bonzini, 2014/10/23
- [Qemu-devel] [PULL 18/24] MAINTAINERS: add myself for X86, Paolo Bonzini, 2014/10/23