| Message ID | 20180124195843.dk7efcmdwoba2jtw@kentang.home |
|---|---|
| State | New |
| Headers | show |
| Series | [PULL] qemu-sparc updates | expand |
On 24 January 2018 at 19:58, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> wrote: > Hi Peter, > > Here are the latest updates for SPARC. Please pull. > > > ATB, > > Mark. > > > The following changes since commit 52483b067cce4a88ffbf8fbeea26de7549d2ad23: > > Merge remote-tracking branch 'remotes/huth/tags/pull-request-2018-01-22' into staging (2018-01-23 10:15:09 +0000) > > are available in the git repository at: > > https://github.com/mcayland/qemu.git tags/qemu-sparc-signed > > for you to fetch changes up to 9a323c89102f741e3a91a42906c26186a43f379e: > > sun4u: implement power device (2018-01-24 19:46:10 +0000) > > ---------------------------------------------------------------- > qemu-sparc update > Hi; I'm afraid this has format-string issues: In file included from hw/sparc64/trace.h:69:0, from hw/sparc64/trace.c:4: hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_set_count': hw/sparc64/trace.h:466:23: error: format '%lx' expects argument of type 'long unsigned int', but argument 6 has type 'uint64_t {aka long long unsigned int}' [-Werror=format=] "%d@%zd.%06zd:sparc64_cpu_tick_set_count " "%s set_count count=0x%016lx (npt %s) p=%p" "\n", ^ /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition of macro 'qemu_log_mask' qemu_log(FMT, ## __VA_ARGS__); \ ^ hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_get_count': hw/sparc64/trace.h:490:23: error: format '%lx' expects argument of type 'long unsigned int', but argument 6 has type 'uint64_t {aka long long unsigned int}' [-Werror=format=] "%d@%zd.%06zd:sparc64_cpu_tick_get_count " "%s get_count count=0x%016lx (npt %s) p=%p" "\n", ^ /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition of macro 'qemu_log_mask' qemu_log(FMT, ## __VA_ARGS__); \ ^ hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_set_limit': hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of type 'long unsigned int', but argument 6 has type 'uint64_t {aka long long unsigned int}' [-Werror=format=] "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at 0x%016lx (delta=0x%016lx)" "\n", ^ /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition of macro 'qemu_log_mask' qemu_log(FMT, ## __VA_ARGS__); \ ^ hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of type 'long unsigned int', but argument 9 has type 'uint64_t {aka long long unsigned int}' [-Werror=format=] "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at 0x%016lx (delta=0x%016lx)" "\n", ^ /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition of macro 'qemu_log_mask' qemu_log(FMT, ## __VA_ARGS__); \ ^ hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of type 'long unsigned int', but argument 10 has type 'uint64_t {aka long long unsigned int}' [-Werror=format=] "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at 0x%016lx (delta=0x%016lx)" "\n", ^ /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition of macro 'qemu_log_mask' qemu_log(FMT, ## __VA_ARGS__); \ ^ hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of type 'long unsigned int', but argument 11 has type 'uint64_t {aka long long unsigned int}' [-Werror=format=] "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at 0x%016lx (delta=0x%016lx)" "\n", ^ /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition of macro 'qemu_log_mask' qemu_log(FMT, ## __VA_ARGS__); \ ^ Printing uint64_t requires the PRIx64 macros. thanks -- PMM
On 25/01/18 12:51, Peter Maydell wrote: > On 24 January 2018 at 19:58, Mark Cave-Ayland > <mark.cave-ayland@ilande.co.uk> wrote: >> Hi Peter, >> >> Here are the latest updates for SPARC. Please pull. >> >> >> ATB, >> >> Mark. >> >> >> The following changes since commit 52483b067cce4a88ffbf8fbeea26de7549d2ad23: >> >> Merge remote-tracking branch 'remotes/huth/tags/pull-request-2018-01-22' into staging (2018-01-23 10:15:09 +0000) >> >> are available in the git repository at: >> >> https://github.com/mcayland/qemu.git tags/qemu-sparc-signed >> >> for you to fetch changes up to 9a323c89102f741e3a91a42906c26186a43f379e: >> >> sun4u: implement power device (2018-01-24 19:46:10 +0000) >> >> ---------------------------------------------------------------- >> qemu-sparc update >> > > Hi; I'm afraid this has format-string issues: > > In file included from hw/sparc64/trace.h:69:0, > from hw/sparc64/trace.c:4: > hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_set_count': > hw/sparc64/trace.h:466:23: error: format '%lx' expects argument of > type 'long unsigned int', but argument 6 has type 'uint64_t {aka long > long unsigned int}' [-Werror=format=] > "%d@%zd.%06zd:sparc64_cpu_tick_set_count " "%s > set_count count=0x%016lx (npt %s) p=%p" "\n", > ^ > /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition > of macro 'qemu_log_mask' > qemu_log(FMT, ## __VA_ARGS__); \ > ^ > hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_get_count': > hw/sparc64/trace.h:490:23: error: format '%lx' expects argument of > type 'long unsigned int', but argument 6 has type 'uint64_t {aka long > long unsigned int}' [-Werror=format=] > "%d@%zd.%06zd:sparc64_cpu_tick_get_count " "%s > get_count count=0x%016lx (npt %s) p=%p" "\n", > ^ > /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition > of macro 'qemu_log_mask' > qemu_log(FMT, ## __VA_ARGS__); \ > ^ > hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_set_limit': > hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of > type 'long unsigned int', but argument 6 has type 'uint64_t {aka long > long unsigned int}' [-Werror=format=] > "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s > set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at > 0x%016lx (delta=0x%016lx)" "\n", > ^ > /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition > of macro 'qemu_log_mask' > qemu_log(FMT, ## __VA_ARGS__); \ > ^ > hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of > type 'long unsigned int', but argument 9 has type 'uint64_t {aka long > long unsigned int}' [-Werror=format=] > "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s > set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at > 0x%016lx (delta=0x%016lx)" "\n", > ^ > /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition > of macro 'qemu_log_mask' > qemu_log(FMT, ## __VA_ARGS__); \ > ^ > hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of > type 'long unsigned int', but argument 10 has type 'uint64_t {aka long > long unsigned int}' [-Werror=format=] > "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s > set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at > 0x%016lx (delta=0x%016lx)" "\n", > ^ > /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition > of macro 'qemu_log_mask' > qemu_log(FMT, ## __VA_ARGS__); \ > ^ > hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of > type 'long unsigned int', but argument 11 has type 'uint64_t {aka long > long unsigned int}' [-Werror=format=] > "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s > set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at > 0x%016lx (delta=0x%016lx)" "\n", > ^ > /home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition > of macro 'qemu_log_mask' > qemu_log(FMT, ## __VA_ARGS__); \ > ^ > > Printing uint64_t requires the PRIx64 macros. Sorry yes, those format strings were taken from some very old code so I should have paid a bit more attention. I've fixed up these events and re-pushed the qemu-sparc-signed tag to github which should resolve the issue. ATB, Mark.
On 25 January 2018 at 13:48, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> wrote: > Sorry yes, those format strings were taken from some very old code so I > should have paid a bit more attention. > > I've fixed up these events and re-pushed the qemu-sparc-signed tag to github > which should resolve the issue. Thanks, applied the updated version. -- PMM
Hi Peter, Here are the latest updates for SPARC. Please pull. ATB, Mark. The following changes since commit 52483b067cce4a88ffbf8fbeea26de7549d2ad23: Merge remote-tracking branch 'remotes/huth/tags/pull-request-2018-01-22' into staging (2018-01-23 10:15:09 +0000) are available in the git repository at: https://github.com/mcayland/qemu.git tags/qemu-sparc-signed for you to fetch changes up to 9a323c89102f741e3a91a42906c26186a43f379e: sun4u: implement power device (2018-01-24 19:46:10 +0000) ---------------------------------------------------------------- qemu-sparc update ---------------------------------------------------------------- Jean-Christophe Dubois (1): sparc/leon3 irqmp: fix IRQ software ack Mark Cave-Ayland (11): apb: split simba PCI bridge into hw/pci-bridge/simba.c simba: rename PBMPCIBridge and QOM types to reflect simba naming apb: rename APB functions to use sabre prefix apb: change pbm_pci_host prefix functions to use sabre_pci prefix apb: QOMify sabre PCI host bridge apb: rename QOM type from TYPE_APB to TYPE_SABRE sun4u: rename apb variables and constants apb: rename apb.c to sabre.c sabre: convert from SABRE_DPRINTF macro to trace-events sparc64: convert hw/sparc64/sparc64.c from DPRINTF macros to trace events sun4u: implement power device Makefile.objs | 1 + default-configs/sparc64-softmmu.mak | 3 +- hw/intc/grlib_irqmp.c | 17 ++- hw/pci-bridge/Makefile.objs | 2 + hw/pci-bridge/simba.c | 101 ++++++++++++ hw/pci-host/Makefile.objs | 2 +- hw/pci-host/{apb.c => sabre.c} | 270 ++++++++++++--------------------- hw/pci-host/trace-events | 11 ++ hw/sparc64/sparc64.c | 85 +++++------ hw/sparc64/sun4u.c | 109 ++++++++++--- hw/sparc64/trace-events | 18 +++ include/hw/pci-bridge/simba.h | 38 +++++ include/hw/pci-host/{apb.h => sabre.h} | 26 ++-- 13 files changed, 416 insertions(+), 267 deletions(-) create mode 100644 hw/pci-bridge/simba.c rename hw/pci-host/{apb.c => sabre.c} (62%) create mode 100644 hw/pci-host/trace-events create mode 100644 include/hw/pci-bridge/simba.h rename include/hw/pci-host/{apb.h => sabre.h} (69%)