From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3lrO-0007c7-2x for qemu-devel@nongnu.org; Sat, 13 Jun 2015 09:52:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3lrM-0002aU-Eq for qemu-devel@nongnu.org; Sat, 13 Jun 2015 09:52:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58172) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3lrM-0002aQ-9I for qemu-devel@nongnu.org; Sat, 13 Jun 2015 09:52:32 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id C8A8A3B701 for ; Sat, 13 Jun 2015 13:52:31 +0000 (UTC) From: Laszlo Ersek Date: Sat, 13 Jun 2015 15:52:16 +0200 Message-Id: <1434203538-8075-3-git-send-email-lersek@redhat.com> In-Reply-To: <1434203538-8075-1-git-send-email-lersek@redhat.com> References: <557C32AC.7030903@redhat.com> <1434203538-8075-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH v4 2/4] hw/core: rebase sysbus_get_fw_dev_path() to g_strdup_printf() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, lersek@redhat.com Cc: Marcel Apfelbaum , Markus Armbruster , "Michael S. Tsirkin" Cc: Markus Armbruster Cc: Marcel Apfelbaum Cc: Michael S. Tsirkin Signed-off-by: Laszlo Ersek --- Notes: v4: - unchanged v3: - new in v3 hw/core/sysbus.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index b53c351..0ebb4e2 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -281,19 +281,15 @@ static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent) static char *sysbus_get_fw_dev_path(DeviceState *dev) { SysBusDevice *s = SYS_BUS_DEVICE(dev); - char path[40]; - int off; - - off = snprintf(path, sizeof(path), "%s", qdev_fw_name(dev)); if (s->num_mmio) { - snprintf(path + off, sizeof(path) - off, "@"TARGET_FMT_plx, - s->mmio[0].addr); - } else if (s->num_pio) { - snprintf(path + off, sizeof(path) - off, "@i%04x", s->pio[0]); + return g_strdup_printf("%s@"TARGET_FMT_plx, qdev_fw_name(dev), + s->mmio[0].addr); } - - return g_strdup(path); + if (s->num_pio) { + return g_strdup_printf("%s@i%04x", qdev_fw_name(dev), s->pio[0]); + } + return g_strdup(qdev_fw_name(dev)); } void sysbus_add_io(SysBusDevice *dev, hwaddr addr, -- 1.8.3.1