Commit e715f7b7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-misc-fixes-070420-1' into staging 



Various fixes:

  - add .github repo lockdown config
  - better handle missing symbols in elf-ops
  - protect fcntl64 with #ifdef
  - remove unused macros from test
  - fix handling of /proc/self/maps
  - avoid BAD_SHIFT in x80 softfloat
  - properly terminate on .hex EOF
  - fix configure probe on windows cross build
  - fix %r12 guest_base initialization

# gpg: Signature made Tue 07 Apr 2020 16:31:14 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-misc-fixes-070420-1:
  tcg/i386: Fix %r12 guest_base initialization
  configure: Add -Werror to PIE probe
  hw/core: properly terminate loading .hex on EOF record
  linux-user: clean-up padding on /proc/self/maps
  linux-user: factor out reading of /proc/self/maps
  softfloat: Fix BAD_SHIFT from normalizeFloatx80Subnormal
  gdbstub: fix compiler complaining
  target/xtensa: add FIXME for translation memory leak
  linux-user: more debug for init_guest_space
  tests/tcg: remove extraneous pasting macros
  linux-user: protect fcntl64 with an #ifdef
  elf-ops: bail out if we have no function symbols
  .github: Enable repo-lockdown bot to refuse GitHub pull requests

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3f1082e5 cce743ab

.github/lockdown.yml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
# Configuration for Repo Lockdown - https://github.com/dessant/repo-lockdown



# Close issues and pull requests

close: true



# Lock issues and pull requests

lock: true



issues:

  comment: |

    Thank you for your interest in the QEMU project.



    This repository is a read-only mirror of the project's master

    repostories hosted on https://git.qemu.org/git/qemu.git.

    The project does not process issues filed on GitHub.



    The project issues are tracked on Launchpad:

    https://bugs.launchpad.net/qemu



    QEMU welcomes bug report contributions. You can file new ones on:

    https://bugs.launchpad.net/qemu/+filebug



pulls:

  comment: |

    Thank you for your interest in the QEMU project.



    This repository is a read-only mirror of the project's master

    repostories hosted on https://git.qemu.org/git/qemu.git.

    The project does not process merge requests filed on GitHub.



    QEMU welcomes contributions of code (either fixing bugs or adding new

    functionality). However, we get a lot of patches, and so we have some

    guidelines about contributing on the project website:

    https://www.qemu.org/contribute/

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2834,6 +2834,7 @@ M: Alex Bennée <alex.bennee@linaro.org> 
M: Fam Zheng <fam@euphon.net>

R: Philippe Mathieu-Daudé <philmd@redhat.com>

S: Maintained

F: .github/lockdown.yml

F: .travis.yml

F: scripts/travis/

F: .shippable.yml

configure

+2 −2
Original line number Diff line number Diff line
@@ -2119,7 +2119,7 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then 
fi



if test "$static" = "yes"; then

  if test "$pie" != "no" && compile_prog "-fPIE -DPIE" "-static-pie"; then

  if test "$pie" != "no" && compile_prog "-Werror -fPIE -DPIE" "-static-pie"; then

    QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"

    QEMU_LDFLAGS="-static-pie $QEMU_LDFLAGS"

    pie="yes"
@@ -2132,7 +2132,7 @@ if test "$static" = "yes"; then 
elif test "$pie" = "no"; then

  QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"

  QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS"

elif compile_prog "-fPIE -DPIE" "-pie"; then

elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then

  QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"

  QEMU_LDFLAGS="-pie $QEMU_LDFLAGS"

  pie="yes"

fpu/softfloat.c

+3 −0
Original line number Diff line number Diff line
@@ -5856,6 +5856,9 @@ static floatx80 addFloatx80Sigs(floatx80 a, floatx80 b, flag zSign, 
        zSig1 = 0;

        zSig0 = aSig + bSig;

        if ( aExp == 0 ) {

            if (zSig0 == 0) {

                return packFloatx80(zSign, 0, 0);

            }

            normalizeFloatx80Subnormal( zSig0, &zExp, &zSig0 );

            goto roundAndPack;

        }

gdbstub.c

+2 −2
Original line number Diff line number Diff line
@@ -2060,8 +2060,8 @@ static void handle_query_thread_extra(GdbCmdContext *gdb_ctx, void *user_ctx) 
        /* Print the CPU model and name in multiprocess mode */

        ObjectClass *oc = object_get_class(OBJECT(cpu));

        const char *cpu_model = object_class_get_name(oc);

        g_autofree char *cpu_name;

        cpu_name  = object_get_canonical_path_component(OBJECT(cpu));

        g_autofree char *cpu_name =

            object_get_canonical_path_component(OBJECT(cpu));

        g_string_printf(rs, "%s %s [%s]", cpu_model, cpu_name,

                        cpu->halted ? "halted " : "running");

    } else {