From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vnh2F-00028m-Nq for qemu-devel@nongnu.org; Mon, 02 Dec 2013 22:52:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vnh27-0002Lq-KN for qemu-devel@nongnu.org; Mon, 02 Dec 2013 22:52:31 -0500 Received: from mail-pd0-f179.google.com ([209.85.192.179]:42217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vnh27-0002LX-FB for qemu-devel@nongnu.org; Mon, 02 Dec 2013 22:52:23 -0500 Received: by mail-pd0-f179.google.com with SMTP id r10so19421224pdi.38 for ; Mon, 02 Dec 2013 19:52:22 -0800 (PST) Message-ID: <529D5570.8060205@ozlabs.ru> Date: Tue, 03 Dec 2013 14:52:16 +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> <529429AA.1000403@ozlabs.ru> In-Reply-To: <529429AA.1000403@ozlabs.ru> Content-Type: text/plain; charset=UTF-8 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 , Paolo Bonzini , qemu-ppc@nongnu.org, =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= On 11/26/2013 03:55 PM, Alexey Kardashevskiy wrote: > 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; >> +} >> + Anyone, please? The only easy fix for this I can think of would be this: extern QEMUMachine *current_machine __attribute__((weak)); But I suspect this is disgusting? :) >> 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