On Thu, 11 Feb 2021 at 10:44, Peter Maydell <peter.mayd...@linaro.org> wrote:
>
> On Wed, 10 Feb 2021 at 00:02, Richard Henderson
> <richard.hender...@linaro.org> wrote:
> >
> > Changes for v6:
> > * Drop the change to probe_access. The cpu_untagged_addr function
> > isn't correct, since that's specifically for syscalls. The uses
> > of probe_access in target/arm/ are already done with clean addresses.
> > * Move unlock_user comparison change from p19 to p18.
> >
> > The only unreviewed patch is 19.
> Applied to target-arm.next, thanks.
...dropped again, it breaks bsd-user:
NetBSD:
In file included from ../src/bsd-user/strace.c:25:0:
../src/bsd-user/qemu.h: In function 'lock_user':
../src/bsd-user/qemu.h:365:16: warning: passing argument 1 of 'g2h'
makes pointer from integer without a cast [-Wint-conversion]
return g2h(guest_addr);
^~~~~~~~~~
In file included from ../src/bsd-user/qemu.h:22:0,
from ../src/bsd-user/strace.c:25:
/home/qemu/qemu-test.aZ6xMm/src/include/exec/cpu_ldst.h:85:21: note:
expected 'CPUState * {aka struct CPUState *}' but argument is of type
'abi_ulong {aka unsigned int}'
static inline void *g2h(CPUState *cs, abi_ptr x)
^~~
In file included from ../src/bsd-user/strace.c:25:0:
../src/bsd-user/qemu.h:365:12: error: too few arguments to function 'g2h'
return g2h(guest_addr);
^~~
In file included from ../src/bsd-user/qemu.h:22:0,
from ../src/bsd-user/strace.c:25:
/home/qemu/qemu-test.aZ6xMm/src/include/exec/cpu_ldst.h:85:21: note:
declared here
static inline void *g2h(CPUState *cs, abi_ptr x)
^~~
In file included from ../src/bsd-user/strace.c:25:0:
../src/bsd-user/qemu.h:367:1: warning: control reaches end of non-void
function [-Wreturn-type]
}
^
FreeBSD:
In file included from ../src/bsd-user/main.c:29:
../src/bsd-user/qemu.h:365:26: error: too few arguments to function
call, expected 2, have 1
return g2h(guest_addr);
~~~ ^
/usr/home/qemu/qemu-test.FJ7zNo/src/include/exec/cpu_ldst.h:85:1:
note: 'g2h' declared here
static inline void *g2h(CPUState *cs, abi_ptr x)
^
../src/bsd-user/main.c:1058:34: error: too few arguments to function
call, expected 2, have 1
idt_table = g2h(env->idt.base);
~~~ ^
/usr/home/qemu/qemu-test.FJ7zNo/src/include/exec/cpu_ldst.h:85:1:
note: 'g2h' declared here
static inline void *g2h(CPUState *cs, abi_ptr x)
^
../src/bsd-user/main.c:1088:38: error: too few arguments to function
call, expected 2, have 1
gdt_table = g2h(env->gdt.base);
~~~ ^
/usr/home/qemu/qemu-test.FJ7zNo/src/include/exec/cpu_ldst.h:85:1:
note: 'g2h' declared here
static inline void *g2h(CPUState *cs, abi_ptr x)
^
And also
../src/accel/tcg/translate-all.c:2812:41: warning: shift count >=
width of type [-Wshift-count-overflow]
assert(start < ((target_ulong)1 << L1_MAP_ADDR_SPACE_BITS));
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/assert.h:56:21: note: expanded from macro 'assert'
#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \
^
OpenBSD:
In file included from ../src/cpu.c:30:
../src/bsd-user/qemu.h:365:26: error: too few arguments to function
call, expected 2, have 1
return g2h(guest_addr);
~~~ ^
/home/qemu/qemu-test.UlUP2w/src/include/exec/cpu_ldst.h:85:1: note:
'g2h' declared here
static inline void *g2h(CPUState *cs, abi_ptr x)
^
thanks
-- PMM
