qdev: gpio: Re-implement qdev_connect_gpio QOM style
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:
parent
8faa2f8571
commit
02757df2ad
@ -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,
|
||||
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) {
|
||||
/* 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)
|
||||
|
Loading…
Reference in New Issue
Block a user