| Message ID | 20230916193235.169988-1-deller@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Please take a look at the following CI failure and resend when you
have fixed the error:
mipsel-linux-gnu-gcc -Ilibqemu-hppa-softmmu.fa.p -I. -I..
-Itarget/hppa -I../target/hppa -Iqapi -Itrace -Iui -Iui/shader
-I/usr/include/pixman-1 -I/usr/include/capstone
-I/usr/include/spice-server -I/usr/include/spice-1
-I/usr/include/glib-2.0 -I/usr/lib/mipsel-linux-gnu/glib-2.0/include
-fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g
-fstack-protector-strong -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wundef
-Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes
-Wredundant-decls -Wold-style-declaration -Wold-style-definition
-Wtype-limits -Wformat-security -Wformat-y2k -Winit-self
-Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels
-Wexpansion-to-defined -Wimplicit-fallthrough=2
-Wmissing-format-attribute -Wno-missing-include-dirs
-Wno-shift-negative-value -Wno-psabi -isystem
/builds/qemu-project/qemu/linux-headers -isystem linux-headers -iquote
. -iquote /builds/qemu-project/qemu -iquote
/builds/qemu-project/qemu/include -iquote
/builds/qemu-project/qemu/host/include/generic -iquote
/builds/qemu-project/qemu/tcg/mips -pthread -D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-strict-aliasing
-fno-common -fwrapv -fPIE -isystem../linux-headers
-isystemlinux-headers -DNEED_CPU_H
'-DCONFIG_TARGET="hppa-softmmu-config-target.h"'
'-DCONFIG_DEVICES="hppa-softmmu-config-devices.h"' -MD -MQ
libqemu-hppa-softmmu.fa.p/target_hppa_mem_helper.c.o -MF
libqemu-hppa-softmmu.fa.p/target_hppa_mem_helper.c.o.d -o
libqemu-hppa-softmmu.fa.p/target_hppa_mem_helper.c.o -c
../target/hppa/mem_helper.c
In file included from ../target/hppa/mem_helper.c:21:
../target/hppa/mem_helper.c: In function ‘helper_diag_btlb’:
../target/hppa/mem_helper.c:461:36: error: format ‘%lx’ expects
argument of type ‘long unsigned int’, but argument 4 has type
‘uint64_t’ {aka ‘long long unsigned int’} [-Werror=format=]
461 | qemu_log_mask(CPU_LOG_MMU, "PDC_BLOCK_TLB: PDC_BTLB_INSERT "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
466 | virt_page, phys_page, len, slot);
| ~~~~~~~~~
| |
| uint64_t {aka long long unsigned int}
../include/qemu/log.h:55:22: note: in definition of macro ‘qemu_log_mask’
55 | qemu_log(FMT, ## __VA_ARGS__); \
| ^~~
cc1: all warnings being treated as errors
Thanks,
Stefan
On Sat, 16 Sept 2023 at 15:33, <deller@kernel.org> wrote:
>
> From: Helge Deller <deller@gmx.de>
>
> The following changes since commit 9ef497755afc252fb8e060c9ea6b0987abfd20b6:
>
> Merge tag 'pull-vfio-20230911' of https://github.com/legoater/qemu into staging (2023-09-11 09:13:08 -0400)
>
> are available in the Git repository at:
>
> https://github.com/hdeller/qemu-hppa.git tags/hppa-btlb-pull-request
>
> for you to fetch changes up to 303b1febe3dcd519314d6ed80d97a706cdd21f64:
>
> linux-user/hppa: lock both words of function descriptor (2023-09-16 21:13:08 +0200)
>
> ----------------------------------------------------------------
> Block-TLB support and linux-user fixes for hppa target
>
> All 32-bit hppa CPUs allow a fixed number of TLB entries to have a
> different page size than the default 4k.
> Those are called "Block-TLBs" and are created at startup by the
> operating system and managed by the firmware of hppa machines
> through the firmware PDC_BLOCK_TLB call.
>
> This patchset adds the necessary glue to SeaBIOS-hppa and
> qemu to allow up to 16 BTLB entries in the emulation.
>
> Two patches from Mikulas Patocka fix signal delivery issues
> in linux-user on hppa.
>
> ----------------------------------------------------------------
>
> Helge Deller (6):
> target/hppa: Update to SeaBIOS-hppa version 9
> target/hppa: Allow up to 16 BTLB entries
> target/hppa: Report and clear BTLBs via fw_cfg at startup
> target/hppa: Add BTLB support to hppa TLB functions
> target/hppa: Extract diagnose immediate value
> target/hppa: Wire up diag instruction to support BTLB
>
> Mikulas Patocka (2):
> linux-user/hppa: clear the PSW 'N' bit when delivering signals
> linux-user/hppa: lock both words of function descriptor
>
> hw/hppa/machine.c | 10 +--
> linux-user/hppa/signal.c | 6 +-
> pc-bios/hppa-firmware.img | Bin 720216 -> 732376 bytes
> roms/seabios-hppa | 2 +-
> target/hppa/cpu.h | 11 ++-
> target/hppa/helper.h | 1 +
> target/hppa/insns.decode | 2 +-
> target/hppa/int_helper.c | 2 +-
> target/hppa/mem_helper.c | 179 ++++++++++++++++++++++++++++++++------
> target/hppa/op_helper.c | 3 +-
> target/hppa/translate.c | 15 +++-
> 11 files changed, 188 insertions(+), 43 deletions(-)
>
> --
> 2.41.0
>
>
Hi Stefan, On 9/19/23 19:18, Stefan Hajnoczi wrote: > Please take a look at the following CI failure and resend when you > have fixed the error: > ... > In file included from ../target/hppa/mem_helper.c:21: > ../target/hppa/mem_helper.c: In function ‘helper_diag_btlb’: > ../target/hppa/mem_helper.c:461:36: error: format ‘%lx’ expects > argument of type ‘long unsigned int’, but argument 4 has type > ‘uint64_t’ {aka ‘long long unsigned int’} [-Werror=format=] I just send out a v2 pull request with this fixed. Thanks! Helge
From: Helge Deller <deller@gmx.de> The following changes since commit 9ef497755afc252fb8e060c9ea6b0987abfd20b6: Merge tag 'pull-vfio-20230911' of https://github.com/legoater/qemu into staging (2023-09-11 09:13:08 -0400) are available in the Git repository at: https://github.com/hdeller/qemu-hppa.git tags/hppa-btlb-pull-request for you to fetch changes up to 303b1febe3dcd519314d6ed80d97a706cdd21f64: linux-user/hppa: lock both words of function descriptor (2023-09-16 21:13:08 +0200) ---------------------------------------------------------------- Block-TLB support and linux-user fixes for hppa target All 32-bit hppa CPUs allow a fixed number of TLB entries to have a different page size than the default 4k. Those are called "Block-TLBs" and are created at startup by the operating system and managed by the firmware of hppa machines through the firmware PDC_BLOCK_TLB call. This patchset adds the necessary glue to SeaBIOS-hppa and qemu to allow up to 16 BTLB entries in the emulation. Two patches from Mikulas Patocka fix signal delivery issues in linux-user on hppa. ---------------------------------------------------------------- Helge Deller (6): target/hppa: Update to SeaBIOS-hppa version 9 target/hppa: Allow up to 16 BTLB entries target/hppa: Report and clear BTLBs via fw_cfg at startup target/hppa: Add BTLB support to hppa TLB functions target/hppa: Extract diagnose immediate value target/hppa: Wire up diag instruction to support BTLB Mikulas Patocka (2): linux-user/hppa: clear the PSW 'N' bit when delivering signals linux-user/hppa: lock both words of function descriptor hw/hppa/machine.c | 10 +-- linux-user/hppa/signal.c | 6 +- pc-bios/hppa-firmware.img | Bin 720216 -> 732376 bytes roms/seabios-hppa | 2 +- target/hppa/cpu.h | 11 ++- target/hppa/helper.h | 1 + target/hppa/insns.decode | 2 +- target/hppa/int_helper.c | 2 +- target/hppa/mem_helper.c | 179 ++++++++++++++++++++++++++++++++------ target/hppa/op_helper.c | 3 +- target/hppa/translate.c | 15 +++- 11 files changed, 188 insertions(+), 43 deletions(-)