Re: [Qemu-devel] [PULL 18/18] linux-user: remove useless macros GUEST_BASE and RESERVED_VA

[Laurent Vivier]

Le 28/08/2015 10:21, Cornelia Huck a écrit :
> On Mon, 24 Aug 2015 12:37:06 -0700
> Richard Henderson <address@hidden> wrote:
> 
>> From: Laurent Vivier <address@hidden>
>>
>> As we have removed CONFIG_USE_GUEST_BASE, we always use a guest base
>> and the macros GUEST_BASE and RESERVED_VA become useless: replace
>> them by their values.
>>
>> Reviewed-by: Alexander Graf <address@hidden>
>> Signed-off-by: Laurent Vivier <address@hidden>
>> Message-Id: <address@hidden>
>> Signed-off-by: Richard Henderson <address@hidden>
>> ---
>>  include/exec/cpu-all.h   |  4 +---
>>  include/exec/cpu_ldst.h  |  8 ++++----
>>  linux-user/mmap.c        | 20 ++++++++++----------
>>  tcg/aarch64/tcg-target.c | 10 +++++-----
>>  tcg/arm/tcg-target.c     |  8 ++++----
>>  tcg/i386/tcg-target.c    | 22 +++++++++++-----------
>>  tcg/ia64/tcg-target.c    | 21 +++++++++------------
>>  tcg/mips/tcg-target.c    | 16 ++++++++--------
>>  tcg/ppc/tcg-target.c     | 12 ++++--------
>>  tcg/s390/tcg-target.c    | 13 ++++---------
>>  tcg/sparc/tcg-target.c   |  8 ++++----
>>  11 files changed, 64 insertions(+), 78 deletions(-)
> 
> This seems to break compilation on s390 for me:
> 
> In file included from /home/cohuck/git/qemu/tcg/tcg.c:258:0:
> /home/cohuck/git/qemu/tcg/s390/tcg-target.c: In function 
> ‘tcg_target_qemu_prologue’:
> /home/cohuck/git/qemu/tcg/s390/tcg-target.c:2347:9: error: ‘guest_base’ 
> undeclared (first use in this function)
>      if (guest_base >= 0x80000) {
>          ^
> (once for each of the softmmu subdirs I build)
> 
> config.log says:
> 
> # Configured with: '/home/cohuck/git/qemu/build/../configure' 
> '--target-list=s390x-softmmu s390x-linux-user aarch64-softmmu arm-softmmu 
> mips-softmmu ppc-softmmu ppc64-softmmu' '--enable-kvm' '--enable-vhost-net' 
> '--enable-virtio-blk-data-plane' '--enable-linux-aio'

I've tested the compilation for all targets but only on x86_64... :(

The use of guest_base must be surrounded by "#ifndef CONFIG_SOFTMMU", it
is not the case for s390 (see other host tcg).

Can you fix this or do you want I write a patch ?

Laurent