qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 203d65: hw/timer/imx_*: fix TIMER_MAX clash w

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 203d65: hw/timer/imx_*: fix TIMER_MAX clash with system sy...
Date: Fri, 15 Aug 2014 07:00:06 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 203d65a4706be345c209f3408d3a011a3e48f0c9
      
https://github.com/qemu/qemu/commit/203d65a4706be345c209f3408d3a011a3e48f0c9
  Author: Michael Tokarev <address@hidden>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    M hw/timer/imx_epit.c
    M hw/timer/imx_gpt.c

  Log Message:
  -----------
  hw/timer/imx_*: fix TIMER_MAX clash with system symbol

The symbol TIMER_MAX used in imx_epit.c and imx_gpt.c
clashes with system symbol with the same name.  Because
all qemu source files includes qemu-common.h which, in
turn, includes limits.h, which is not unusual to define
it.  Rename local symbol to have a reasonable prefix.

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


  Commit: bff6cb72961f1bd2c766efe85ff5850fd8d7e77d
      
https://github.com/qemu/qemu/commit/bff6cb72961f1bd2c766efe85ff5850fd8d7e77d
  Author: Michael Tokarev <address@hidden>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    M configure

  Log Message:
  -----------
  l2tpv3 (configure): it is linux-specific

Some non-linux systems, for example a system with
FreeBSD kernel and glibc, may declare struct mmsghdr
(in glibc) but may not have linux-specific header
file linux/ip.h.  The actual implementation in qemu
includes this linux-specific header file unconditionally,
so compilation fails if it is not present.  Include
this header in the configure test too.

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


  Commit: 5bb4c35dcac527be2e174aacf8aad909620bc5e7
      
https://github.com/qemu/qemu/commit/5bb4c35dcac527be2e174aacf8aad909620bc5e7
  Author: chenfan <address@hidden>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386/cpu.c: Fix two error output indentation

Signed-off-by: Chen Fan <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: a3f1f040d2454b5328178393843656c8bbd0429c
      
https://github.com/qemu/qemu/commit/a3f1f040d2454b5328178393843656c8bbd0429c
  Author: Alex Bligh <address@hidden>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  Show length mismatch error is hex

When live migrate fails due to a section length mismatch we currently
see an error message like:

Length mismatch: 0000:00:03.0/virtio-net-pci.rom: 10000 in != 20000

The section lengths are in fact in hex, so this should read

Length mismatch: 0000:00:03.0/virtio-net-pci.rom: 0x10000 in != 0x20000

Correct the error string to reflect this.

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


  Commit: 0f03fb6094743b50d403b9f6181aced9ded98883
      
https://github.com/qemu/qemu/commit/0f03fb6094743b50d403b9f6181aced9ded98883
  Author: Stefan Weil <address@hidden>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    M hw/virtio/vhost-backend.c
    M include/hw/virtio/vhost-backend.h

  Log Message:
  -----------
  virtio: Move extern declaration to header file

This fixes a warning from smatch (static code analyser).

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


  Commit: f13bef9592ab1b03e715487a1a1b3f317f27463f
      
https://github.com/qemu/qemu/commit/f13bef9592ab1b03e715487a1a1b3f317f27463f
  Author: Stefan Weil <address@hidden>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    M hw/timer/tusb6010.c
    M include/hw/usb.h

  Log Message:
  -----------
  hw/timer: Move extern declaration from .c to .h file

This fixes a warning from smatch (static code analyser).

Fix also the comment with the renamed source file name.

Signed-off-by: Stefan Weil <address@hidden>

 hw/timer/tusb6010.c |    3 ---
 include/hw/usb.h    |    7 ++++++-
 2 files changed, 6 insertions(+), 4 deletions(-)
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: fdcf6e65bce1f8972030fed7af5e8aa5f6ae92c6
      
https://github.com/qemu/qemu/commit/fdcf6e65bce1f8972030fed7af5e8aa5f6ae92c6
  Author: Chen Gang <address@hidden>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Check getchar() return value in read_password() for WIN32

getchar() is a standard c library function which may return with failure
(e.g. -1), so like another platforms, also need check it under WIN32.

And make the related code match current qemu code styles, too.

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


  Commit: 90bda0823a77ca54f27731ef5cb8dc46ecc7a40d
      
https://github.com/qemu/qemu/commit/90bda0823a77ca54f27731ef5cb8dc46ecc7a40d
  Author: Fam Zheng <address@hidden>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    A po/zh_CN.po

  Log Message:
  -----------
  po: Add Chinese translation

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Amos Kong <address@hidden>
Reviewed-by: Dongsheng Song <address@hidden>
Reviewed-by: Wei Huang <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 169a24aea4f287739797a8b15565b9b5e59e53be
      
https://github.com/qemu/qemu/commit/169a24aea4f287739797a8b15565b9b5e59e53be
  Author: Fam Zheng <address@hidden>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    M Makefile
    M Makefile.objs
    M tests/Makefile

  Log Message:
  -----------
  build-sys: Move qapi-{types, visit, event}.o into util-obj-y

These three objects are repeated in multiple times in Makefiles. Let's
just add them to libqemuutil.a, and don't list explicitly elsewhere.

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


  Commit: f083201667fddd51055c2ac67f67221e82298a35
      
https://github.com/qemu/qemu/commit/f083201667fddd51055c2ac67f67221e82298a35
  Author: Peter Maydell <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M Makefile
    M Makefile.objs
    M arch_init.c
    M configure
    M hw/timer/imx_epit.c
    M hw/timer/imx_gpt.c
    M hw/timer/tusb6010.c
    M hw/virtio/vhost-backend.c
    M include/hw/usb.h
    M include/hw/virtio/vhost-backend.h
    A po/zh_CN.po
    M qemu-img.c
    M target-i386/cpu.c
    M tests/Makefile

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-08-09' 
into staging

trivial patches for 2014-08-09

# gpg: Signature made Fri 08 Aug 2014 21:36:44 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514  66A7 BEE5 9D74 A4C3 D7DB

* remotes/mjt/tags/trivial-patches-2014-08-09:
  build-sys: Move qapi-{types, visit, event}.o into util-obj-y
  po: Add Chinese translation
  qemu-img: Check getchar() return value in read_password() for WIN32
  hw/timer: Move extern declaration from .c to .h file
  virtio: Move extern declaration to header file
  Show length mismatch error is hex
  target-i386/cpu.c: Fix two error output indentation
  l2tpv3 (configure): it is linux-specific
  hw/timer/imx_*: fix TIMER_MAX clash with system symbol

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/2d591ce2aeeb...f083201667fd
reply via email to
[Prev in Thread] Current Thread [Next in Thread]