From patchwork Wed Jul 25 00:19:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 173085 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F3FB52C0090 for ; Wed, 25 Jul 2012 10:19:03 +1000 (EST) Received: from localhost ([::1]:57351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StpJd-00048P-Vt for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 20:19:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StpJQ-0003zM-II for qemu-devel@nongnu.org; Tue, 24 Jul 2012 20:18:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StpJP-0005v7-5a for qemu-devel@nongnu.org; Tue, 24 Jul 2012 20:18:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StpJO-0005ux-T2 for qemu-devel@nongnu.org; Tue, 24 Jul 2012 20:18:47 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6P0Ij4T025752 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 24 Jul 2012 20:18:45 -0400 Received: from lacos-laptop.usersys.redhat.com (vpn1-7-226.ams2.redhat.com [10.36.7.226]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6P0IgSu023993; Tue, 24 Jul 2012 20:18:44 -0400 From: Laszlo Ersek To: qemu-devel@nongnu.org, armbru@redhat.com, peter.maydell@linaro.org, lersek@redhat.com Date: Wed, 25 Jul 2012 02:19:54 +0200 Message-Id: <1343175595-7944-2-git-send-email-lersek@redhat.com> In-Reply-To: <87r4s25vs8.fsf@blackfin.pond.sub.org> References: <87r4s25vs8.fsf@blackfin.pond.sub.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/2] accomodate OpenFirmware device paths in sufficient storage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Laszlo Ersek Reviewed-by: Markus Armbruster --- hw/qdev.c | 54 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 43 insertions(+), 11 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index af54467..59cc0c2 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -25,6 +25,8 @@ inherit from a particular bus (e.g. PCI or I2C) rather than this API directly. */ +#include + #include "net.h" #include "qdev.h" #include "sysemu.h" @@ -495,36 +497,66 @@ static char *bus_get_fw_dev_path(BusState *bus, DeviceState *dev) return NULL; } +static int snprintf_helper(char *p, int size, int len, const char *format, ...) +{ + char *target; + int free_sz; + va_list args; + int ret; + + if (len < size) { + target = p + len; + free_sz = size - len; + } + else { + target = NULL; + free_sz = 0; + } + + va_start(args, format); + ret = vsnprintf(target, free_sz, format, args); + va_end(args); + + assert(ret >= 0); + return ret; +} + + static int qdev_get_fw_dev_path_helper(DeviceState *dev, char *p, int size) { - int l = 0; + int len = 0; if (dev && dev->parent_bus) { char *d; - l = qdev_get_fw_dev_path_helper(dev->parent_bus->parent, p, size); + len = qdev_get_fw_dev_path_helper(dev->parent_bus->parent, p, size); d = bus_get_fw_dev_path(dev->parent_bus, dev); if (d) { - l += snprintf(p + l, size - l, "%s", d); + len += snprintf_helper(p, size, len, "%s", d); g_free(d); } else { - l += snprintf(p + l, size - l, "%s", object_get_typename(OBJECT(dev))); + len += snprintf_helper(p, size, len, "%s", + object_get_typename(OBJECT(dev))); } } - l += snprintf(p + l , size - l, "/"); + len += snprintf_helper(p, size, len, "/"); - return l; + return len; } char* qdev_get_fw_dev_path(DeviceState *dev) { - char path[128]; - int l; + int len, len2; + char *path; - l = qdev_get_fw_dev_path_helper(dev, path, 128); + len = qdev_get_fw_dev_path_helper(dev, NULL, 0); + path = g_malloc(len + 1); - path[l-1] = '\0'; + len2 = qdev_get_fw_dev_path_helper(dev, path, len + 1); + assert(len2 == len); - return strdup(path); + assert(len > 0); + path[len - 1] = '\0'; + return path; } char *qdev_get_dev_path(DeviceState *dev)