From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlAgE-0007Hx-Ii for qemu-devel@nongnu.org; Mon, 25 Nov 2013 23:55:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlAg6-0005eM-Tb for qemu-devel@nongnu.org; Mon, 25 Nov 2013 23:55:22 -0500 Received: from mail-pb0-f43.google.com ([209.85.160.43]:55445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlAg6-0005eB-NJ for qemu-devel@nongnu.org; Mon, 25 Nov 2013 23:55:14 -0500 Received: by mail-pb0-f43.google.com with SMTP id rq2so7252000pbb.2 for ; Mon, 25 Nov 2013 20:55:13 -0800 (PST) Message-ID: <529429AA.1000403@ozlabs.ru> Date: Tue, 26 Nov 2013 15:55:06 +1100 From: Alexey Kardashevskiy MIME-Version: 1.0 References: <1385364460-24332-1-git-send-email-aik@ozlabs.ru> <1385364460-24332-3-git-send-email-aik@ozlabs.ru> In-Reply-To: <1385364460-24332-3-git-send-email-aik@ozlabs.ru> Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit Subject: Re: [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 Hi! btw there is a problem with this patch - it does not compile for "linux-user" as there is no current-machine global variable defined in vl.c which is not compiled for linux-user. How to solve this problem correctly? On 11/25/2013 06:27 PM, Alexey Kardashevskiy wrote: > 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); > -- Alexey