Commit 0491c221 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-mttcg-fixups-for-rc2-280317-1' into staging 



MTTCG regression fixes for rc2

# gpg: Signature made Tue 28 Mar 2017 10:54:38 BST
# gpg:                using RSA key 0xFBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-mttcg-fixups-for-rc2-280317-1:
  replay/replay.c: bump REPLAY_VERSION
  tcg: Add a new line after incompatibility warning
  ui/console: use exclusive mechanism directly
  ui/console: ensure do_safe_dpy_refresh holds BQL
  bsd-user: align use of mmap_lock to that of linux-user
  user-exec: handle synchronous signals from QEMU gracefully

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 142b9ca5 5b12c163

bsd-user/mmap.c

+1 −12
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ 


//#define DEBUG_MMAP



#if defined(CONFIG_USE_NPTL)

pthread_mutex_t mmap_mutex;

static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;

static int __thread mmap_lock_count;



void mmap_lock(void)
@@ -62,16 +61,6 @@ void mmap_fork_end(int child) 
    else

        pthread_mutex_unlock(&mmap_mutex);

}

#else

/* We aren't threadsafe to start with, so no need to worry about locking.  */

void mmap_lock(void)

{

}



void mmap_unlock(void)

{

}

#endif



/* NOTE: all the constants are the HOST ones, but addresses are target. */

int target_mprotect(abi_ulong start, abi_ulong len, int prot)

bsd-user/qemu.h

+0 −2
Original line number Diff line number Diff line
@@ -209,10 +209,8 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, 
                       abi_ulong new_addr);

int target_msync(abi_ulong start, abi_ulong len, int flags);

extern unsigned long last_brk;

#if defined(CONFIG_USE_NPTL)

void mmap_fork_start(void);

void mmap_fork_end(int child);

#endif



/* main.c */

extern unsigned long x86_stack_size;

cpu-exec-common.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ void cpu_loop_exit_noexc(CPUState *cpu) 
#if defined(CONFIG_SOFTMMU)

void cpu_reloading_memory_map(void)

{

    if (qemu_in_vcpu_thread()) {

    if (qemu_in_vcpu_thread() && current_cpu->running) {

        /* The guest can in theory prolong the RCU critical section as long

         * as it feels like. The major problem with this is that because it

         * can do multiple reconfigurations of the memory map within the

cpus.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ void qemu_tcg_configure(QemuOpts *opts, Error **errp) 
                if (!check_tcg_memory_orders_compatible()) {

                    error_report("Guest expects a stronger memory ordering "

                                 "than the host provides");

                    error_printf("This may cause strange/hard to debug errors");

                    error_printf("This may cause strange/hard to debug errors\n");

                }

                mttcg_enabled = true;

            }

replay/replay.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


/* Current version of the replay mechanism.

   Increase it when file format changes. */

#define REPLAY_VERSION              0xe02005

#define REPLAY_VERSION              0xe02006

/* Size of replay log header */

#define HEADER_SIZE                 (sizeof(uint32_t) + sizeof(uint64_t))