[Qemu-commits] [qemu/qemu] b1f4b9: linux-user/sh4/termbits: Silence warning about TIO...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b1f4b9b83269e614b0e68203e92ccbde958ddde2
      
https://github.com/qemu/qemu/commit/b1f4b9b83269e614b0e68203e92ccbde958ddde2
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-03-31 (Thu, 31 Mar 2022)

  Changed paths:
    M linux-user/sh4/termbits.h

  Log Message:
  -----------
  linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition

Seen while compiling on Alpine:

 In file included from ../linux-user/strace.c:17:
 In file included from ../linux-user/qemu.h:11:
 In file included from ../linux-user/syscall_defs.h:1247:
 ../linux-user/sh4/termbits.h:276:10: warning: 'TIOCSER_TEMT' macro redefined
  [-Wmacro-redefined]
 # define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
          ^
 /usr/include/sys/ioctl.h:50:9: note: previous definition is here
 #define TIOCSER_TEMT 1
         ^
 1 warning generated.

Add the TARGET_ prefix here, too, like we do it on the other architectures.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Message-Id: <20220330134302.979686-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: b49202151ca77e61a828d8b81f5ba7a017a41581
      
https://github.com/qemu/qemu/commit/b49202151ca77e61a828d8b81f5ba7a017a41581
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-03-31 (Thu, 31 Mar 2022)

  Changed paths:
    R target/sh4/README.sh4

  Log Message:
  -----------
  target/sh4: Remove old README.sh4 file

This file didn't have any non-trivial update since it was initially
added in 2006, and looking at the content, it seems incredibly outdated,
saying e.g. "The sh4 target is not ready at all yet for integration in
qemu" or "A sh4 user-mode has also somewhat started but will be worked
on afterwards"... Sounds like nobody is interested in this README file
anymore, so let's simply remove it now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Message-Id: <20220329151955.472306-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: ef4ff56cf3335b4d7ad4384c5583439ed5babfa6
      
https://github.com/qemu/qemu/commit/ef4ff56cf3335b4d7ad4384c5583439ed5babfa6
  Author: Stefano Garzarella <sgarzare@redhat.com>
  Date:   2022-03-31 (Thu, 31 Mar 2022)

  Changed paths:
    M hw/virtio/vhost-vdpa.c

  Log Message:
  -----------
  vhost-vdpa: fix typo in a comment

Replace vpda with vdpa.

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220328152022.73245-1-sgarzare@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 04cca669b237337cc8734788c3ad968aa8e0b57f
      
https://github.com/qemu/qemu/commit/04cca669b237337cc8734788c3ad968aa8e0b57f
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-03-31 (Thu, 31 Mar 2022)

  Changed paths:
    M tests/lcitool/Makefile.include
    M tests/lcitool/refresh

  Log Message:
  -----------
  tests/lcitool: Do not use a hard-coded /usr/bin/python3 as python interpreter

When running "make lcitool-refresh", this currently uses the hard-coded
/usr/bin/python3 from the script's shebang line for running Python.
That's bad, since neither /usr/bin/python3 is guaranteed to exist, nor
does it honor the python interpreter that the user might have chosen
while running the "configure" script. Thus let's rather use $(PYTHON)
in the Makefile, and improve the shebang line in the script in case
someone runs this directly.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220329063958.262669-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 9b617b1bb4056e60b39be4c33be20c10928a6a5c
      
https://github.com/qemu/qemu/commit/9b617b1bb4056e60b39be4c33be20c10928a6a5c
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-04-01 (Fri, 01 Apr 2022)

  Changed paths:
    M hw/virtio/vhost-vdpa.c
    M linux-user/sh4/termbits.h
    R target/sh4/README.sh4
    M tests/lcitool/Makefile.include
    M tests/lcitool/refresh

  Log Message:
  -----------
  Merge tag 'trivial-branch-for-7.0-pull-request' of 
https://gitlab.com/laurent_vivier/qemu into staging

Trivial branch pull request 20220401

Fix sh4 linux-user build on Alpine
and some trivial updates

# gpg: Signature made Thu 31 Mar 2022 23:18:21 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" 
[full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* tag 'trivial-branch-for-7.0-pull-request' of 
https://gitlab.com/laurent_vivier/qemu:
  tests/lcitool: Do not use a hard-coded /usr/bin/python3 as python interpreter
  vhost-vdpa: fix typo in a comment
  target/sh4: Remove old README.sh4 file
  linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/d5341e09135b...9b617b1bb405