[Qemu-commits] [qemu/qemu] 1dcb3c: qemu-common.h: Update copyright string for 2019

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1dcb3c3b7d084427a816a608ebf92ab7b76e2b48
      
https://github.com/qemu/qemu/commit/1dcb3c3b7d084427a816a608ebf92ab7b76e2b48
  Author: Peter Maydell <address@hidden>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M include/qemu-common.h

  Log Message:
  -----------
  qemu-common.h: Update copyright string for 2019

Update the copyright string we use in version/help output,
since we're well into the new year now.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 70c9483a3041a4db9741d23ff75380e08216c3c6
      
https://github.com/qemu/qemu/commit/70c9483a3041a4db9741d23ff75380e08216c3c6
  Author: Thomas Huth <address@hidden>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M target/moxie/cpu.c
    M target/moxie/cpu.h
    M target/moxie/helper.c
    M target/moxie/mmu.c
    M target/moxie/translate.c

  Log Message:
  -----------
  target/moxie: Fix LGPL information in the file headers

It's either "GNU *Library* General Public License version 2" or "GNU
Lesser General Public License version *2.1*", but there was no "version
2.0" of the "Lesser" license. So assume that version 2.1 is meant here.
Also the files mentioned the GPL instead of the LGPL after declaring
that the files are licensed under the LGPL, so change these spots to
use LGPL, too.

Signed-off-by: Thomas Huth <address@hidden>
Acked-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: e633a5c6619feab5323f71b5c37c3602e3818687
      
https://github.com/qemu/qemu/commit/e633a5c6619feab5323f71b5c37c3602e3818687
  Author: Eric Blake <address@hidden>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Avoid non-portable 'test -o/-a'

POSIX says that it is better to use &&/|| and two separate test
invocations than it is to try and use -a and -o (in fact, there
are some tests that are inherently ambiguous to parse if the
user passes in corner-case input like "(").

Since we cannot guarantee which shell runs configure, we cannot
rely on -o/-a always following bash's parser rules.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: d5b661e6763ab69eb7e7bb3a16ede5497790a811
      
https://github.com/qemu/qemu/commit/d5b661e6763ab69eb7e7bb3a16ede5497790a811
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h"

In 47973a2dbf we split the last generic chipset out of the PC
board, but forgot to remove the include of "hw/i386/pc.h".
Since it is now unused, remove it.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 4a1335e8df72481023d67c0294c06eb425c08e40
      
https://github.com/qemu/qemu/commit/4a1335e8df72481023d67c0294c06eb425c08e40
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M hw/unicore32/puv3.c

  Log Message:
  -----------
  hw/unicore32/puv3: Drop useless inclusion of "hw/i386/pc.h"

In 47973a2dbf we split the last generic chipset out of the PC
board, but forgot to remove the include of "hw/i386/pc.h".
Since it is now unused, remove it.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: dab864dc7644448fd1f037a627c4ea2adb731901
      
https://github.com/qemu/qemu/commit/dab864dc7644448fd1f037a627c4ea2adb731901
  Author: Thomas Huth <address@hidden>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M hw/cpu/cluster.c

  Log Message:
  -----------
  hw/cpu/cluster: Mark the cpu-cluster device with user_creatable = false

The device can not be instantiated by the user and QEMU currently
aborts when you try to use it:

$ x86_64-softmmu/qemu-system-x86_64 -device cpu-cluster
qemu-system-x86_64: hw/cpu/cluster.c:73: cpu_cluster_realize:
 Assertion `cbdata.cpu_count > 0' failed.
Aborted (core dumped)

Since this is an internal device only, mark it with user_creatable = false.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Luc Michel <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: e67e91b4b55331973f783ca89790ee9f7861ced1
      
https://github.com/qemu/qemu/commit/e67e91b4b55331973f783ca89790ee9f7861ced1
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M hw/input/tsc210x.c

  Log Message:
  -----------
  hw/input/tsc210x: Fix building with no verbosity

When building with TSC_VERBOSE not defined, we get:
      CC      arm-softmmu/hw/input/tsc210x.o
    hw/input/tsc210x.c: In function ‘tsc2102_data_register_write’:
    hw/input/tsc210x.c:554:5: error: label at end of compound statement
         default:
         ^~~~~~~
    hw/input/tsc210x.c: In function ‘tsc2102_control_register_write’:
    hw/input/tsc210x.c:638:5: error: label at end of compound statement
         bad_reg:
         ^~~~~~~
    hw/input/tsc210x.c: In function ‘tsc2102_audio_register_write’:
    hw/input/tsc210x.c:766:5: error: label at end of compound statement
         default:
         ^~~~~~~
    make[1]: *** [rules.mak:69: hw/input/tsc210x.o] Error 1

Fix this by replacing the culprit fprintf(stderr) calls by a more
recent API: qemu_log_mask(LOG_GUEST_ERROR). Other fprintf() calls
are left untouched.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 4f0444fc6807d08620ac8eea7d7043d3d2a6ae6a
      
https://github.com/qemu/qemu/commit/4f0444fc6807d08620ac8eea7d7043d3d2a6ae6a
  Author: Peter Maydell <address@hidden>
  Date:   2019-02-07 (Thu, 07 Feb 2019)

  Changed paths:
    M configure
    M hw/cpu/cluster.c
    M hw/input/tsc210x.c
    M hw/sparc64/sun4u.c
    M hw/unicore32/puv3.c
    M include/qemu-common.h
    M target/moxie/cpu.c
    M target/moxie/cpu.h
    M target/moxie/helper.c
    M target/moxie/mmu.c
    M target/moxie/translate.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/vivier2/tags/trivial-patches-pull-request' into staging

Trivial patches:
* Update copyright
* Fix LGPL in target/moxie
* configure portability fix
* Drop useless inclusion of "hw/i386/pc.h"
* Mark the cpu-cluster device with user_creatable = false
* tsc210x: Fix building with no verbosity

# gpg: Signature made Wed 06 Feb 2019 15:27:35 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <address@hidden>" [full]
# gpg:                 aka "Laurent Vivier <address@hidden>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <address@hidden>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-patches-pull-request:
  hw/input/tsc210x: Fix building with no verbosity
  hw/cpu/cluster: Mark the cpu-cluster device with user_creatable = false
  hw/unicore32/puv3: Drop useless inclusion of "hw/i386/pc.h"
  hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h"
  configure: Avoid non-portable 'test -o/-a'
  target/moxie: Fix LGPL information in the file headers
  qemu-common.h: Update copyright string for 2019

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


Compare: https://github.com/qemu/qemu/compare/632351e0e1a8...4f0444fc6807