[PULL,0/5] linux-user patches for 2.2

Message ID cover.1412604631.git.riku.voipio@linaro.org
State New
Headers show

Pull-request

git://git.linaro.org/people/riku.voipio/qemu.git tags/pull-linux-user-20141006

Message

Riku Voipio Oct. 6, 2014, 2:34 p.m.
From: Riku Voipio <riku.voipio@linaro.org>

The following changes since commit 1831e150606a221898bf46ffaf0453e9952cbbc4:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-09-30 16:45:35 +0100)

are available in the git repository at:

  git://git.linaro.org/people/riku.voipio/qemu.git tags/pull-linux-user-20141006

for you to fetch changes up to 88555b7dfa79d7d21100d0b90730bf43d25d735b:

  translate-all.c: memory walker initial address miscalculation (2014-10-01 16:16:14 +0300)

----------------------------------------------------------------
linux-user pull for 2.2

Clearest linux-user patches sent to the list since august,
Apart from Mikhails patch, the rest are quite trivial.

----------------------------------------------------------------
Alexander Graf (2):
      linux-user: Convert blkpg to use a special subop handler
      linux-user: Simplify timerid checks on g_posix_timers range

Mikhail Ilyin (1):
      translate-all.c: memory walker initial address miscalculation

Peter Maydell (1):
      linux-user: Enable epoll_pwait syscall for ARM

Riku Voipio (1):
      linux-user: don't include timerfd if not needed

 include/exec/cpu-all.h      |  4 ++--
 linux-user/arm/syscall_nr.h |  2 +-
 linux-user/elfload.c        | 18 +++++++++---------
 linux-user/ioctls.h         |  3 ++-
 linux-user/syscall.c        | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 linux-user/syscall_types.h  |  2 +-
 translate-all.c             | 33 ++++++++++++++++-----------------
 7 files changed, 103 insertions(+), 44 deletions(-)

Comments

Peter Maydell Oct. 6, 2014, 2:59 p.m. | #1
On 6 October 2014 15:34,  <riku.voipio@linaro.org> wrote:
> From: Riku Voipio <riku.voipio@linaro.org>
>
> The following changes since commit 1831e150606a221898bf46ffaf0453e9952cbbc4:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-09-30 16:45:35 +0100)
>
> are available in the git repository at:
>
>   git://git.linaro.org/people/riku.voipio/qemu.git tags/pull-linux-user-20141006
>
> for you to fetch changes up to 88555b7dfa79d7d21100d0b90730bf43d25d735b:
>
>   translate-all.c: memory walker initial address miscalculation (2014-10-01 16:16:14 +0300)
>
> ----------------------------------------------------------------
> linux-user pull for 2.2
>
> Clearest linux-user patches sent to the list since august,
> Apart from Mikhails patch, the rest are quite trivial.
>
> ----------------------------------------------------------------
> Alexander Graf (2):
>       linux-user: Convert blkpg to use a special subop handler
>       linux-user: Simplify timerid checks on g_posix_timers range
>
> Mikhail Ilyin (1):
>       translate-all.c: memory walker initial address miscalculation
>
> Peter Maydell (1):
>       linux-user: Enable epoll_pwait syscall for ARM
>
> Riku Voipio (1):
>       linux-user: don't include timerfd if not needed

Hi. I'm afraid this doesn't compile on my ARM box:

/root/qemu/linux-user/syscall.c: In function ‘do_syscall’:
/root/qemu/linux-user/syscall.c:9695:9: error: implicit declaration of
function ‘timerfd_create’ [-Werror=implicit-function-declaration]
/root/qemu/linux-user/syscall.c:9695:9: error: nested extern
declaration of ‘timerfd_create’ [-Werror=nested-externs]
/root/qemu/linux-user/syscall.c:9705:13: error: implicit declaration
of function ‘timerfd_gettime’ [-Werror=implicit-function-declaration]
/root/qemu/linux-user/syscall.c:9705:13: error: nested extern
declaration of ‘timerfd_gettime’ [-Werror=nested-externs]
/root/qemu/linux-user/syscall.c:9728:13: error: implicit declaration
of function ‘timerfd_settime’ [-Werror=implicit-function-declaration]
/root/qemu/linux-user/syscall.c:9728:13: error: nested extern
declaration of ‘timerfd_settime’ [-Werror=nested-externs]
cc1: all warnings being treated as errors

thanks
-- PMM
Peter Maydell Oct. 6, 2014, 4:49 p.m. | #2
On 6 October 2014 15:59, Peter Maydell <peter.maydell@linaro.org> wrote:
> Hi. I'm afraid this doesn't compile on my ARM box:
>
> /root/qemu/linux-user/syscall.c: In function ‘do_syscall’:
> /root/qemu/linux-user/syscall.c:9695:9: error: implicit declaration of
> function ‘timerfd_create’ [-Werror=implicit-function-declaration]
> /root/qemu/linux-user/syscall.c:9695:9: error: nested extern
> declaration of ‘timerfd_create’ [-Werror=nested-externs]
> /root/qemu/linux-user/syscall.c:9705:13: error: implicit declaration
> of function ‘timerfd_gettime’ [-Werror=implicit-function-declaration]
> /root/qemu/linux-user/syscall.c:9705:13: error: nested extern
> declaration of ‘timerfd_gettime’ [-Werror=nested-externs]
> /root/qemu/linux-user/syscall.c:9728:13: error: implicit declaration
> of function ‘timerfd_settime’ [-Werror=implicit-function-declaration]
> /root/qemu/linux-user/syscall.c:9728:13: error: nested extern
> declaration of ‘timerfd_settime’ [-Werror=nested-externs]
> cc1: all warnings being treated as errors

Specifically, this is because of the patch which adds
#ifdef CONFIG_TIMERFD ... #endif -- it is doing so
earlier in the file than the include of "qemu-common.h"
which pulls in the file defining the CONFIG_* macros,
so sys/timerfd.h is now never included.

-- PMM
Riku Voipio Oct. 6, 2014, 7:05 p.m. | #3
On Mon, Oct 06, 2014 at 05:49:14PM +0100, Peter Maydell wrote:
> On 6 October 2014 15:59, Peter Maydell <peter.maydell@linaro.org> wrote:
> > Hi. I'm afraid this doesn't compile on my ARM box:
> >
> > /root/qemu/linux-user/syscall.c: In function ‘do_syscall’:
> > /root/qemu/linux-user/syscall.c:9695:9: error: implicit declaration of
> > function ‘timerfd_create’ [-Werror=implicit-function-declaration]
> > /root/qemu/linux-user/syscall.c:9695:9: error: nested extern
> > declaration of ‘timerfd_create’ [-Werror=nested-externs]
> > /root/qemu/linux-user/syscall.c:9705:13: error: implicit declaration
> > of function ‘timerfd_gettime’ [-Werror=implicit-function-declaration]
> > /root/qemu/linux-user/syscall.c:9705:13: error: nested extern
> > declaration of ‘timerfd_gettime’ [-Werror=nested-externs]
> > /root/qemu/linux-user/syscall.c:9728:13: error: implicit declaration
> > of function ‘timerfd_settime’ [-Werror=implicit-function-declaration]
> > /root/qemu/linux-user/syscall.c:9728:13: error: nested extern
> > declaration of ‘timerfd_settime’ [-Werror=nested-externs]
> > cc1: all warnings being treated as errors
 
> Specifically, this is because of the patch which adds
> #ifdef CONFIG_TIMERFD ... #endif -- it is doing so
> earlier in the file than the include of "qemu-common.h"
> which pulls in the file defining the CONFIG_* macros,
> so sys/timerfd.h is now never included.

Sorry, will fix it quickly.

Riku