From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XobPh-0007xx-Ki for qemu-devel@nongnu.org; Wed, 12 Nov 2014 12:09:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XobPb-0004yz-C7 for qemu-devel@nongnu.org; Wed, 12 Nov 2014 12:09:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53966) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XobPb-0004yL-58 for qemu-devel@nongnu.org; Wed, 12 Nov 2014 12:08:55 -0500 From: Markus Armbruster Date: Wed, 12 Nov 2014 18:08:49 +0100 Message-Id: <1415812130-2592-4-git-send-email-armbru@redhat.com> In-Reply-To: <1415812130-2592-1-git-send-email-armbru@redhat.com> References: <1415812130-2592-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] qdev: Use object_gen_new_property_name() instead of "arrayification" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, peter.crosthwaite@xilinx.com, afaerber@suse.de Signed-off-by: Markus Armbruster --- hw/core/qdev.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 413b413..53d1e25 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -376,17 +376,19 @@ void qdev_init_gpio_in_named(DeviceState *dev, qemu_irq_handler handler, { int i; NamedGPIOList *gpio_list = qdev_get_named_gpio_list(dev, name); - char *propname = g_strdup_printf("%s[*]", name ? name : "unnamed-gpio-in"); + char *propname; assert(gpio_list->num_out == 0 || !name); gpio_list->in = qemu_extend_irqs(gpio_list->in, gpio_list->num_in, handler, dev, n); for (i = gpio_list->num_in; i < gpio_list->num_in + n; i++) { + propname = object_gen_new_property_name(OBJECT(dev), + name ?: "unnamed-gpio-in"); object_property_add_child(OBJECT(dev), propname, OBJECT(gpio_list->in[i]), &error_abort); + g_free(propname); } - g_free(propname); gpio_list->num_in += n; } @@ -401,20 +403,22 @@ void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins, { int i; NamedGPIOList *gpio_list = qdev_get_named_gpio_list(dev, name); - char *propname = g_strdup_printf("%s[*]", name ? name : "unnamed-gpio-out"); + char *propname; assert(gpio_list->num_in == 0 || !name); gpio_list->num_out += n; for (i = 0; i < n; ++i) { + propname = object_gen_new_property_name(OBJECT(dev), + name ?: "unnamed-gpio-out"); memset(&pins[i], 0, sizeof(*pins)); object_property_add_link(OBJECT(dev), propname, TYPE_IRQ, (Object **)&pins[i], object_property_allow_set_link, OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); + g_free(propname); } - g_free(propname); } void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n) @@ -446,8 +450,10 @@ void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, * 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 *owner = qdev_get_machine(); + char *pname = object_gen_new_property_name(owner, "non-qdev-gpio"); + object_property_add_child(owner, pname, OBJECT(pin), NULL); + g_free(pname); } object_property_set_link(OBJECT(dev), OBJECT(pin), propname, &error_abort); g_free(propname); -- 1.9.3