david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev: gpio: Re-implement qdev_connect_gpio QOM style

Browse Source 
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.

Reviewed-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Crosthwaite 2014-09-25 22:20:25 -07:00 committed by Paolo Bonzini
parent 8faa2f8571
commit 02757df2ad
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/core/qdev.c
View File

@ -440,10 +440,19 @@ qemu_irq qdev_get_gpio_in(DeviceState *dev, int n)
void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n,
qemu_irq pin) qemu_irq pin)
{ {
NamedGPIOList *gpio_list = qdev_get_named_gpio_list(dev, name); char *propname = g_strdup_printf("%s[%d]",
name ? name : "unnamed-gpio-out", n);
assert(n >= 0 && n < gpio_list->num_out); if (pin) {
gpio_list->out[n] = pin; /* We need a name for object_property_set_link to work. If the
* object has a parent, object_property_add_child will come back
* with an error without doing anything. If it has none, it will
* never fail. So we can just call it with a NULL Error pointer.
*/
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) void qdev_connect_gpio_out(DeviceState * dev, int n, qemu_irq pin)