[Qemu-commits] [qemu/qemu] e7c2d7: misc: Fixes MAINTAINERS's path .github/workflows/l...

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: e7c2d7436e85ae6d1d72b7479c1137faa86f4f58
      
https://github.com/qemu/qemu/commit/e7c2d7436e85ae6d1d72b7479c1137faa86f4f58
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2022-04-01 (Fri, 01 Apr 2022)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  misc: Fixes MAINTAINERS's path .github/workflows/lockdown.yml

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20220323080755.156-4-luoyonggang@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 5a2e67a691501bc4dd81c46c81b8f1881c8bd5df
      
https://github.com/qemu/qemu/commit/5a2e67a691501bc4dd81c46c81b8f1881c8bd5df
  Author: Bruno Haible <bruno@clisp.org>
  Date:   2022-04-01 (Fri, 01 Apr 2022)

  Changed paths:
    M target/s390x/tcg/cc_helper.c

  Log Message:
  -----------
  target/s390x: Fix determination of overflow condition code after addition

This program currently prints different results when run with TCG instead
of running on real s390x hardware:

 #include <stdio.h>

 int overflow_32 (int x, int y)
 {
   int sum;
   return ! __builtin_add_overflow (x, y, &sum);
 }

 int overflow_64 (long long x, long long y)
 {
   long sum;
   return ! __builtin_add_overflow (x, y, &sum);
 }

 int a1 = -2147483648;
 int b1 = -2147483648;
 long long a2 = -9223372036854775808L;
 long long b2 = -9223372036854775808L;

 int main ()
 {
   {
     int a = a1;
     int b = b1;
     printf ("a = 0x%x, b = 0x%x\n", a, b);
     printf ("no_overflow = %d\n", overflow_32 (a, b));
   }
   {
     long long a = a2;
     long long b = b2;
     printf ("a = 0x%llx, b = 0x%llx\n", a, b);
     printf ("no_overflow = %d\n", overflow_64 (a, b));
   }
 }

Signed-off-by: Bruno Haible <bruno@clisp.org>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/616
Message-Id: <20220323162621.139313-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: fc6e0d0f2db5126592bb4066d484fcdfc14ccf36
      
https://github.com/qemu/qemu/commit/fc6e0d0f2db5126592bb4066d484fcdfc14ccf36
  Author: Bruno Haible <bruno@clisp.org>
  Date:   2022-04-01 (Fri, 01 Apr 2022)

  Changed paths:
    M target/s390x/tcg/cc_helper.c

  Log Message:
  -----------
  target/s390x: Fix determination of overflow condition code after subtraction

Reported by Paul Eggert in
https://lists.gnu.org/archive/html/bug-gnulib/2021-09/msg00050.html

This program currently prints different results when run with TCG instead
of running on real s390x hardware:

 #include <stdio.h>

 int overflow_32 (int x, int y)
 {
   int sum;
   return __builtin_sub_overflow (x, y, &sum);
 }

 int overflow_64 (long long x, long long y)
 {
   long sum;
   return __builtin_sub_overflow (x, y, &sum);
 }

 int a1 = 0;
 int b1 = -2147483648;
 long long a2 = 0L;
 long long b2 = -9223372036854775808L;

 int main ()
 {
   {
     int a = a1;
     int b = b1;
     printf ("a = 0x%x, b = 0x%x\n", a, b);
     printf ("no_overflow = %d\n", ! overflow_32 (a, b));
   }
   {
     long long a = a2;
     long long b = b2;
     printf ("a = 0x%llx, b = 0x%llx\n", a, b);
     printf ("no_overflow = %d\n", ! overflow_64 (a, b));
   }
 }

Signed-off-by: Bruno Haible <bruno@clisp.org>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/618
Message-Id: <20220323162621.139313-3-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 54c9b19421895eddac19444c1de705ef0ddbfe95
      
https://github.com/qemu/qemu/commit/54c9b19421895eddac19444c1de705ef0ddbfe95
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-04-01 (Fri, 01 Apr 2022)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson.build: Fix dependency of page-vary-common.c to config-poison.h

Before compiling page-vary-common.c, we have to make sure that
config-poison.h has been generated (which is in the "genh" list).

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/948
Message-Id: <20220330114808.942933-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: a136d17590a03ad4cf4fabeffe49d246b9130103
      
https://github.com/qemu/qemu/commit/a136d17590a03ad4cf4fabeffe49d246b9130103
  Author: Will Cohen <wwcohen@gmail.com>
  Date:   2022-04-01 (Fri, 01 Apr 2022)

  Changed paths:
    M hw/9pfs/9p.c
    M hw/9pfs/9p.h

  Log Message:
  -----------
  9p: move P9_XATTR_SIZE_MAX from 9p.h to 9p.c

The patch set adding 9p functionality to darwin introduced an issue
where limits.h, which defines XATTR_SIZE_MAX, is included in 9p.c,
though the referenced constant is needed in 9p.h. This commit fixes that
issue by moving the definition of P9_XATTR_SIZE_MAX, which uses
XATTR_SIZE_MAX, to also be in 9p.c.

Additionally, this commit moves the location of the system headers
include in 9p.c to occur before the project headers (except osdep.h).

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/950
Fixes: 38d7fd68b0 ("9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX")
Signed-off-by: Will Cohen <wwcohen@gmail.com>
Message-Id: <20220331182651.887-1-wwcohen@gmail.com>
[thuth: Adjusted placement of osdep.h]
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: e32aaa5a19e24233180042f84a0235a209de71cc
      
https://github.com/qemu/qemu/commit/e32aaa5a19e24233180042f84a0235a209de71cc
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-04-01 (Fri, 01 Apr 2022)

  Changed paths:
    M meson.build
    M scripts/tracetool/format/ust_events_h.py

  Log Message:
  -----------
  trace: fix compilation with lttng-ust >= 2.13

On Fedora 36, with lttng-ust 2.13.1, compilation fails with:

In file included from trace/trace-ust-all.h:49085,
                 from trace/trace-ust-all.c:13:
/usr/include/lttng/tracepoint-event.h:67:10: error: #include expects "FILENAME" 
or <FILENAME>
   67 | #include LTTNG_UST_TRACEPOINT_INCLUDE
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

In lttng-ust commit 41858e2b6e8 ("Fix: don't do macro expansion in
tracepoint file name") from 2012, starting from lttng-ust 2.1, the API
was changed to expect TRACEPOINT_INCLUDE to be defined as a string.

In lttng-ust commit d2966b4b0b2 ("Remove TRACEPOINT_INCLUDE_FILE
macro"), in 2021, the compatibility macro was removed.

Use the "new" API from 2012, and bump the version requirement to 2.1 to
fix compilation with >= 2.13.

According to repology, all distributions we support have >= 2.1 (centos
8 has oldest with 2.8.1 afaict)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20220328084717.367993-2-marcandre.lureau@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: bc6ec396d471d9e4aae7e2ff8b72e11da9a97665
      
https://github.com/qemu/qemu/commit/bc6ec396d471d9e4aae7e2ff8b72e11da9a97665
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-04-02 (Sat, 02 Apr 2022)

  Changed paths:
    M MAINTAINERS
    M hw/9pfs/9p.c
    M hw/9pfs/9p.h
    M meson.build
    M scripts/tracetool/format/ust_events_h.py
    M target/s390x/tcg/cc_helper.c

  Log Message:
  -----------
  Merge tag 'pull-request-2022-04-01' of https://gitlab.com/thuth/qemu into 
staging

* Fix some compilation issues
* Fix overflow calculation in s390x emulation
* Update location of lockdown.yml in MAINTAINERS file

# gpg: Signature made Fri 01 Apr 2022 12:27:38 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2022-04-01' of https://gitlab.com/thuth/qemu:
  trace: fix compilation with lttng-ust >= 2.13
  9p: move P9_XATTR_SIZE_MAX from 9p.h to 9p.c
  meson.build: Fix dependency of page-vary-common.c to config-poison.h
  target/s390x: Fix determination of overflow condition code after subtraction
  target/s390x: Fix determination of overflow condition code after addition
  misc: Fixes MAINTAINERS's path .github/workflows/lockdown.yml

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


Compare: https://github.com/qemu/qemu/compare/ea72ac9bc8fc...bc6ec396d471