From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Date: Fri, 26 Sep 2014 05:23:09 +0000 (-0700)
Subject: qdev: gpio: Remove qdev_init_gpio_out x1 restriction
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=aef0869e8ed83ec201488020a9a1cc44d85d72bf;p=qemu.git

qdev: gpio: Remove qdev_init_gpio_out x1 restriction

Previously this was restricted to a single call per-dev/per-name. With
the conversion of the GPIO output state to QOM the implementation can
now handle repeated calls. Remove the restriction.

Reviewed-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index efbaa99117..31014e8769 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -404,8 +404,7 @@ void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins,
     char *propname = g_strdup_printf("%s[*]", name ? name : "unnamed-gpio-out");
 
     assert(gpio_list->num_in == 0 || !name);
-    assert(gpio_list->num_out == 0);
-    gpio_list->num_out = n;
+    gpio_list->num_out += n;
 
     for (i = 0; i < n; ++i) {
         memset(&pins[i], 0, sizeof(*pins));