[Qemu-commits] [qemu/qemu] e24fed: fix /proc/self/maps output

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e24fed4ed4cb006c76924dacb1274f71477b9e3c
      
https://github.com/qemu/qemu/commit/e24fed4ed4cb006c76924dacb1274f71477b9e3c
  Author: Christophe Lyon <address@hidden>
  Date:   2013-05-18 (Sat, 18 May 2013)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  fix /proc/self/maps output

Add a space at end of line when there is no filename to print, to
conform to linux kernel format (see show_map_vma() in
fs/proc/task_mmu.c).

Signed-off-by: Christophe Lyon <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: ce3a4718fe8edbe56b485778a76e9393e4f27c0e
      
https://github.com/qemu/qemu/commit/ce3a4718fe8edbe56b485778a76e9393e4f27c0e
  Author: Qiao Nuohan <address@hidden>
  Date:   2013-05-18 (Sat, 18 May 2013)

  Changed paths:
    M block/win32-aio.c

  Log Message:
  -----------
  Remove twice include of qemu-common.h

This patch is used to remove twice include of "qemu-common.h" in
block/win32-aio.c

Signed-off-by: Qiao Nuohan <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 7bc9315d3a6a3c7d437e1c3d0e826121a035444a
      
https://github.com/qemu/qemu/commit/7bc9315d3a6a3c7d437e1c3d0e826121a035444a
  Author: liguang <address@hidden>
  Date:   2013-05-18 (Sat, 18 May 2013)

  Changed paths:
    M translate-all.c

  Log Message:
  -----------
  translate: remove redundantly included qemu/timer.h

Signed-off-by: liguang <address@hidden>
Reviewed-By: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 997aba8e257d183e978e9b08a26aceb4e905378d
      
https://github.com/qemu/qemu/commit/997aba8e257d183e978e9b08a26aceb4e905378d
  Author: Michael Tokarev <address@hidden>
  Date:   2013-05-18 (Sat, 18 May 2013)

  Changed paths:
    M audio/audio_win_int.c
    M hw/arm/highbank.c
    M hw/audio/marvell_88w8618.c
    M hw/mips/mips_malta.c
    M hw/misc/lm32_sys.c
    M hw/ppc/spapr.c
    M hw/ppc/spapr_hcall.c
    M hw/timer/exynos4210_rtc.c
    M include/hw/i386/pc.h
    M include/qapi/qmp/qlist.h
    M include/qemu/config-file.h
    M monitor.c
    M page_cache.c
    M slirp/misc.c
    M target-ppc/kvm.c
    M tests/tcg/linux-test.c

  Log Message:
  -----------
  remove some double-includes

Some source files #include the same header more than
once for no good reason.  Remove second #includes in
such cases.

Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 3a8ae21bd07e8a02e6e2eb4896790a62f979acda
      
https://github.com/qemu/qemu/commit/3a8ae21bd07e8a02e6e2eb4896790a62f979acda
  Author: Ed Maste <address@hidden>
  Date:   2013-05-18 (Sat, 18 May 2013)

  Changed paths:
    M hw/dma/pl330.c
    M include/qemu-common.h
    M util/hexdump.c
    M util/iov.c

  Log Message:
  -----------
  Rename hexdump to avoid FreeBSD libutil conflict

On FreeBSD libutil is used for openpty(), but it also provides a hexdump()
which conflicts with QEMU's.

Signed-off-by: Ed Maste <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: d2ad50210b35c2685640f7df931a0fccb49334f7
      
https://github.com/qemu/qemu/commit/d2ad50210b35c2685640f7df931a0fccb49334f7
  Author: Hu Tao <address@hidden>
  Date:   2013-05-18 (Sat, 18 May 2013)

  Changed paths:
    M target-moxie/helper.c

  Log Message:
  -----------
  target-moxie: replace target_phys_addr_t with hwaddr

target_phys_addr_t has been already replaced by hwaddr, but this
one is introduced after.

Signed-off-by: Hu Tao <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 95de21a430f7bc4166a153b1f69b1425c8a99c7b
      
https://github.com/qemu/qemu/commit/95de21a430f7bc4166a153b1f69b1425c8a99c7b
  Author: Anthony Liguori <address@hidden>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M audio/audio_win_int.c
    M block/win32-aio.c
    M hw/arm/highbank.c
    M hw/audio/marvell_88w8618.c
    M hw/mips/mips_malta.c
    M hw/misc/lm32_sys.c
    M hw/ppc/spapr.c
    M hw/ppc/spapr_hcall.c
    M hw/timer/exynos4210_rtc.c
    M include/hw/i386/pc.h
    M include/qapi/qmp/qlist.h
    M include/qemu/config-file.h
    M linux-user/syscall.c
    M monitor.c
    M page_cache.c
    M slirp/misc.c
    M target-moxie/helper.c
    M target-ppc/kvm.c
    M tests/tcg/linux-test.c
    M translate-all.c

  Log Message:
  -----------
  Merge remote-tracking branch 'mjt/trivial-patches' into staging

# By Christophe Lyon (1) and others
# Via Michael Tokarev
* mjt/trivial-patches:
  target-moxie: replace target_phys_addr_t with hwaddr
  Rename hexdump to avoid FreeBSD libutil conflict
  remove some double-includes
  translate: remove redundantly included qemu/timer.h
  Remove twice include of qemu-common.h
  fix /proc/self/maps output

Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/3459f01b2d96...95de21a430f7