From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vkqaj-0001oy-KJ for qemu-devel@nongnu.org; Mon, 25 Nov 2013 02:28:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vkqab-00053Y-BG for qemu-devel@nongnu.org; Mon, 25 Nov 2013 02:28:21 -0500 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:56461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkqaY-000521-J2 for qemu-devel@nongnu.org; Mon, 25 Nov 2013 02:28:13 -0500 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 25 Nov 2013 17:27:55 +1000 From: Alexey Kardashevskiy Date: Mon, 25 Nov 2013 18:27:37 +1100 Message-Id: <1385364460-24332-3-git-send-email-aik@ozlabs.ru> In-Reply-To: <1385364460-24332-1-git-send-email-aik@ozlabs.ru> References: <1385364460-24332-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH 2/5] machine: introduce get_fw_dev_path() callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, Paul Mackerras , Nikunj A Dadhania QEMU supports firmware names for all devices in the QEMU tree but sometime the exact format differs from what sPAPR platform uses. This introduces a callback to let a machine fix device tree path names. Signed-off-by: Alexey Kardashevskiy --- hw/core/qdev.c | 15 ++++++++++++++- include/hw/boards.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index e374a93..7347483 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -26,6 +26,7 @@ this API directly. */ #include "hw/qdev.h" +#include "hw/boards.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" @@ -497,6 +498,15 @@ static char *bus_get_fw_dev_path(BusState *bus, DeviceState *dev) return NULL; } +static char *machine_get_fw_dev_path(BusState *bus, DeviceState *dev) +{ + if (current_machine->get_fw_dev_path) { + return current_machine->get_fw_dev_path(bus, dev); + } + + return NULL; +} + static int qdev_get_fw_dev_path_helper(DeviceState *dev, char *p, int size) { int l = 0; @@ -504,7 +514,10 @@ static int qdev_get_fw_dev_path_helper(DeviceState *dev, char *p, int size) if (dev && dev->parent_bus) { char *d; l = qdev_get_fw_dev_path_helper(dev->parent_bus->parent, p, size); - d = bus_get_fw_dev_path(dev->parent_bus, dev); + d = machine_get_fw_dev_path(dev->parent_bus, dev); + if (!d) { + d = bus_get_fw_dev_path(dev->parent_bus, dev); + } if (d) { l += snprintf(p + l, size - l, "%s", d); g_free(d); diff --git a/include/hw/boards.h b/include/hw/boards.h index 5a7ae9f..50ff24a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -43,6 +43,7 @@ typedef struct QEMUMachine { GlobalProperty *compat_props; struct QEMUMachine *next; const char *hw_version; + char *(*get_fw_dev_path)(BusState *bus, DeviceState *dev); } QEMUMachine; int qemu_register_machine(QEMUMachine *m); -- 1.8.4.rc4