From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2yTx-0005zL-00 for qemu-devel@nongnu.org; Thu, 11 Jun 2015 05:09:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2yTs-0003gR-QF for qemu-devel@nongnu.org; Thu, 11 Jun 2015 05:09:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48065) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2yTs-0003gD-LZ for qemu-devel@nongnu.org; Thu, 11 Jun 2015 05:09:00 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id DCB0F3582DA for ; Thu, 11 Jun 2015 09:08:59 +0000 (UTC) Message-ID: <55795028.2020009@redhat.com> Date: Thu, 11 Jun 2015 12:08:56 +0300 From: Marcel Apfelbaum MIME-Version: 1.0 References: <1433983083-4636-1-git-send-email-lersek@redhat.com> <1433983083-4636-5-git-send-email-lersek@redhat.com> In-Reply-To: <1433983083-4636-5-git-send-email-lersek@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 4/6] 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: Laszlo Ersek , qemu-devel@nongnu.org Cc: Markus Armbruster , "Michael S. Tsirkin" On 06/11/2015 03:38 AM, Laszlo Ersek wrote: > Cc: Markus Armbruster > Cc: Marcel Apfelbaum > Cc: Michael S. Tsirkin > Signed-off-by: Laszlo Ersek > --- > > Notes: > 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, > Reviewed-by: Marcel Apfelbaum