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

Merge remote-tracking branch 'remotes/stsquad/tags/pull-fixes-for-rc2-270720-1' into staging 



Various fixes for rc2:

  - get shippable working again
  - semihosting bug fixes
  - tweak tb-size handling for low memory machines
  - i386 compound literal float fix
  - linux-user MAP_FIXED->MAP_NOREPLACE on fallback
  - docker binfmt_misc fixes
  - linux-user nanosleep fix
  - tests/vm drain console fixes

# gpg: Signature made Mon 27 Jul 2020 09:45:31 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-fixes-for-rc2-270720-1:
  tests/vm: add shutdown timeout in basevm.py
  python/qemu: Change ConsoleSocket to optionally drain socket.
  python/qemu: Cleanup changes to ConsoleSocket
  linux-user, ppc: fix clock_nanosleep() for linux-user-ppc
  linux-user: fix clock_nanosleep()
  tests/docker: add support for DEB_KEYRING
  tests/docker: fix binfmt_misc image building
  tests/docker: fix update command due to python3 str/bytes distinction
  linux-user: don't use MAP_FIXED in pgd_find_hole_fallback
  target/i386: floatx80: avoid compound literals in static initializers
  accel/tcg: better handle memory constrained systems
  util/oslib-win32: add qemu_get_host_physmem implementation
  util: add qemu_get_host_physmem utility function
  semihosting: don't send the trailing '\0'
  semihosting: defer connect_chardevs a little more to use serialx
  shippable: add one more qemu to registry url

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4215d341 4a70232b

.shippable.yml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ env: 
      TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user

build:

  pre_ci_boot:

    image_name: registry.gitlab.com/qemu-project/qemu/${IMAGE}

    image_name: registry.gitlab.com/qemu-project/qemu/qemu/${IMAGE}

    image_tag: latest

    pull: true

    options: "-e HOME=/root"

accel/tcg/translate-all.c

+6 −1
Original line number Diff line number Diff line
@@ -976,7 +976,12 @@ static inline size_t size_code_gen_buffer(size_t tb_size) 
{

    /* Size the buffer.  */

    if (tb_size == 0) {

        size_t phys_mem = qemu_get_host_physmem();

        if (phys_mem == 0) {

            tb_size = DEFAULT_CODE_GEN_BUFFER_SIZE;

        } else {

            tb_size = MIN(DEFAULT_CODE_GEN_BUFFER_SIZE, phys_mem / 8);

        }

    }

    if (tb_size < MIN_CODE_GEN_BUFFER_SIZE) {

        tb_size = MIN_CODE_GEN_BUFFER_SIZE;

hw/semihosting/console.c

+3 −1
Original line number Diff line number Diff line
@@ -52,7 +52,9 @@ static GString *copy_user_string(CPUArchState *env, target_ulong addr) 


    do {

        if (cpu_memory_rw_debug(cpu, addr++, &c, 1, 0) == 0) {

            if (c) {

                s = g_string_append_c(s, c);

            }

        } else {

            qemu_log_mask(LOG_GUEST_ERROR,

                          "%s: passed inaccessible address " TARGET_FMT_lx,

include/fpu/softfloat.h

+1 −0
Original line number Diff line number Diff line
@@ -822,6 +822,7 @@ static inline bool floatx80_invalid_encoding(floatx80 a) 
}



#define floatx80_zero make_floatx80(0x0000, 0x0000000000000000LL)

#define floatx80_zero_init make_floatx80_init(0x0000, 0x0000000000000000LL)

#define floatx80_one make_floatx80(0x3fff, 0x8000000000000000LL)

#define floatx80_ln2 make_floatx80(0x3ffe, 0xb17217f7d1cf79acLL)

#define floatx80_pi make_floatx80(0x4000, 0xc90fdaa22168c235LL)

include/qemu/osdep.h

+15 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ extern int daemon(int, int); 
#ifndef MAP_ANONYMOUS

#define MAP_ANONYMOUS MAP_ANON

#endif

#ifndef MAP_FIXED_NOREPLACE

#define MAP_FIXED_NOREPLACE 0

#endif

#ifndef ENOMEDIUM

#define ENOMEDIUM ENODEV

#endif
@@ -668,4 +671,16 @@ static inline void qemu_reset_optind(void) 
 */

char *qemu_get_host_name(Error **errp);



/**

 * qemu_get_host_physmem:

 *

 * Operating system agnostic way of querying host memory.

 *

 * Returns amount of physical memory on the system. This is purely

 * advisery and may return 0 if we can't work it out. At the other

 * end we saturate to SIZE_MAX if you are lucky enough to have that

 * much memory.

 */

size_t qemu_get_host_physmem(void);



#endif