[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 07/16] qdev: gpio: Re-impement qdev_connect_gpio
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH v1 07/16] qdev: gpio: Re-impement qdev_connect_gpio QOM style |
Date: |
Sun, 3 Aug 2014 18:55:19 -0700 |
Re-implement as a link setter. This should allow the QOM framework to
keep track of ref counts properly etc.
We need to add a default parent for the connecting input incase it's
coming from a non-qdev source. We simply parent the IRQ to the machine
in this case.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/core/qdev.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 5f55709..e6b2231 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -402,10 +402,14 @@ qemu_irq qdev_get_gpio_in(DeviceState *dev, int n)
void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n,
qemu_irq pin)
{
- NamedGPIOList *gpio_list = qdev_get_named_gpio_list(dev, name);
-
- assert(n >= 0 && n < gpio_list->num_out);
- gpio_list->out[n] = pin;
+ char *propname = g_strdup_printf("%s[%d]",
+ name ? name : "unnamed-gpio-out", n);
+ if (pin) {
+ object_property_add_child(qdev_get_machine(), "non-qdev-gpio[*]",
+ OBJECT(pin), NULL);
+ }
+ object_property_set_link(OBJECT(dev), OBJECT(pin), propname, &error_abort);
+ g_free(propname);
}
void qdev_connect_gpio_out(DeviceState * dev, int n, qemu_irq pin)
--
2.0.1.1.gfbfc394
- [Qemu-devel] [PATCH v1 00/16] GPIO/IRQ QOMification: Phase 2 - Getting rid of SYSBUS IRQs, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 01/16] qdev: gpio: Don't allow name share between I and O, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 02/16] qdev: gpio: Register GPIO inputs as child objects, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 03/16] qdev: gpio: Register GPIO outputs as QOM links, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 04/16] qmp: qstring: Handle NULL strings, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 05/16] qom: Allow clearing of a Link property, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 06/16] qom: Demote already-has-a-parent to a regular error, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 07/16] qdev: gpio: Re-impement qdev_connect_gpio QOM style,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH v1 08/16] qdev: gpio: Add API for intercepting an IRQ, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 09/16] qtest/irq: Rework IRQ interception, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 10/16] irq: Remove qemu_irq_intercept_out, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 11/16] qdev: gpio: delete NamedGPIOList::out, Peter Crosthwaite, 2014/08/03
- [Qemu-devel] [PATCH v1 12/16] qdev: gpio: Remove qdev_init_gpio_out x1 restriction, Peter Crosthwaite, 2014/08/03