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

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* thread-safe tb_flush (Fred, Alex, Sergey, me, Richard, Emilio,... :-)
* license clarification for compiler.h (Felipe)
* glib cflags improvement (Marc-André)
* checkpatch silencing (Paolo)
* SMRAM migration fix (Paolo)
* Replay improvements (Pavel)
* IOMMU notifier improvements (Peter)
* IOAPIC now defaults to version 0x20 (Peter)

# gpg: Signature made Tue 27 Sep 2016 10:57:40 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (28 commits)
  replay: allow replay stopping and restarting
  replay: vmstate for replay module
  replay: move internal data to the structure
  cpus-common: lock-free fast path for cpu_exec_start/end
  tcg: Make tb_flush() thread safe
  cpus-common: Introduce async_safe_run_on_cpu()
  cpus-common: simplify locking for start_exclusive/end_exclusive
  cpus-common: remove redundant call to exclusive_idle()
  cpus-common: always defer async_run_on_cpu work items
  docs: include formal model for TCG exclusive sections
  cpus-common: move exclusive work infrastructure from linux-user
  cpus-common: fix uninitialized variable use in run_on_cpu
  cpus-common: move CPU work item management to common code
  cpus-common: move CPU list management to common code
  linux-user: Add qemu_cpu_is_self() and qemu_cpu_kick()
  linux-user: Use QemuMutex and QemuCond
  cpus: Rename flush_queued_work()
  cpus: Move common code out of {async_, }run_on_cpu()
  cpus: pass CPUState to run_on_cpu helpers
  build-sys: put glib_cflags in QEMU_CFLAGS
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bc63afaf 6d0ceb80

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ endif 


#######################################################################

# Target-independent parts used in system and user emulation

common-obj-y += tcg-runtime.o

common-obj-y += tcg-runtime.o cpus-common.o

common-obj-y += hw/

common-obj-y += qom/

common-obj-y += disas/

block/blkreplay.c

+5 −10
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ typedef struct Request { 
    QEMUBH *bh;

} Request;



/* Next request id.

   This counter is global, because requests from different

   block devices should not get overlapping ids. */

static uint64_t request_id;



static int blkreplay_open(BlockDriverState *bs, QDict *options, int flags,

                          Error **errp)

{
@@ -84,7 +79,7 @@ static void block_request_create(uint64_t reqid, BlockDriverState *bs, 
static int coroutine_fn blkreplay_co_preadv(BlockDriverState *bs,

    uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags)

{

    uint64_t reqid = request_id++;

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_preadv(bs->file, offset, bytes, qiov, flags);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();
@@ -95,7 +90,7 @@ static int coroutine_fn blkreplay_co_preadv(BlockDriverState *bs, 
static int coroutine_fn blkreplay_co_pwritev(BlockDriverState *bs,

    uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags)

{

    uint64_t reqid = request_id++;

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_pwritev(bs->file, offset, bytes, qiov, flags);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();
@@ -106,7 +101,7 @@ static int coroutine_fn blkreplay_co_pwritev(BlockDriverState *bs, 
static int coroutine_fn blkreplay_co_pwrite_zeroes(BlockDriverState *bs,

    int64_t offset, int count, BdrvRequestFlags flags)

{

    uint64_t reqid = request_id++;

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_pwrite_zeroes(bs->file, offset, count, flags);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();
@@ -117,7 +112,7 @@ static int coroutine_fn blkreplay_co_pwrite_zeroes(BlockDriverState *bs, 
static int coroutine_fn blkreplay_co_pdiscard(BlockDriverState *bs,

                                              int64_t offset, int count)

{

    uint64_t reqid = request_id++;

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_pdiscard(bs->file->bs, offset, count);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();
@@ -127,7 +122,7 @@ static int coroutine_fn blkreplay_co_pdiscard(BlockDriverState *bs, 


static int coroutine_fn blkreplay_co_flush(BlockDriverState *bs)

{

    uint64_t reqid = request_id++;

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_flush(bs->file->bs);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();

bsd-user/main.c

+8 −25
Original line number Diff line number Diff line
@@ -67,23 +67,6 @@ int cpu_get_pic_interrupt(CPUX86State *env) 
}

#endif



/* These are no-ops because we are not threadsafe.  */

static inline void cpu_exec_start(CPUArchState *env)

{

}



static inline void cpu_exec_end(CPUArchState *env)

{

}



static inline void start_exclusive(void)

{

}



static inline void end_exclusive(void)

{

}



void fork_start(void)

{

}
@@ -95,14 +78,6 @@ void fork_end(int child) 
    }

}



void cpu_list_lock(void)

{

}



void cpu_list_unlock(void)

{

}



#ifdef TARGET_I386

/***********************************************************/

/* CPUX86 core interface */
@@ -172,7 +147,11 @@ void cpu_loop(CPUX86State *env) 
    //target_siginfo_t info;



    for(;;) {

        cpu_exec_start(cs);

        trapnr = cpu_exec(cs);

        cpu_exec_end(cs);

        process_queued_cpu_work(cs);



        switch(trapnr) {

        case 0x80:

            /* syscall from int $0x80 */
@@ -513,7 +492,10 @@ void cpu_loop(CPUSPARCState *env) 
    //target_siginfo_t info;



    while (1) {

        cpu_exec_start(cs);

        trapnr = cpu_exec(cs);

        cpu_exec_end(cs);

        process_queued_cpu_work(cs);



        switch (trapnr) {

#ifndef TARGET_SPARC64
@@ -748,6 +730,7 @@ int main(int argc, char **argv) 
    if (argc <= 1)

        usage();



    qemu_init_cpu_list();

    module_call_init(MODULE_INIT_QOM);



    if ((envlist = envlist_create()) == NULL) {

configure

+1 −2
Original line number Diff line number Diff line
@@ -2988,7 +2988,7 @@ for i in $glib_modules; do 
    if $pkg_config --atleast-version=$glib_req_ver $i; then

        glib_cflags=$($pkg_config --cflags $i)

        glib_libs=$($pkg_config --libs $i)

        CFLAGS="$glib_cflags $CFLAGS"

        QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"

        LIBS="$glib_libs $LIBS"

        libs_qga="$glib_libs $libs_qga"

    else
@@ -5195,7 +5195,6 @@ fi 
if test "$glib_subprocess" = "yes" ; then

  echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=y" >> $config_host_mak

fi

echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak

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

  echo "CONFIG_GTK=y" >> $config_host_mak

  echo "CONFIG_GTKABI=$gtkabi" >> $config_host_mak

cpu-exec.c

+2 −10
Original line number Diff line number Diff line
@@ -204,20 +204,16 @@ static void cpu_exec_nocache(CPUState *cpu, int max_cycles, 
                             TranslationBlock *orig_tb, bool ignore_icount)

{

    TranslationBlock *tb;

    bool old_tb_flushed;



    /* Should never happen.

       We only end up here when an existing TB is too long.  */

    if (max_cycles > CF_COUNT_MASK)

        max_cycles = CF_COUNT_MASK;



    old_tb_flushed = cpu->tb_flushed;

    cpu->tb_flushed = false;

    tb = tb_gen_code(cpu, orig_tb->pc, orig_tb->cs_base, orig_tb->flags,

                     max_cycles | CF_NOCACHE

                         | (ignore_icount ? CF_IGNORE_ICOUNT : 0));

    tb->orig_tb = cpu->tb_flushed ? NULL : orig_tb;

    cpu->tb_flushed |= old_tb_flushed;

    tb->orig_tb = orig_tb;

    /* execute the generated code */

    trace_exec_tb_nocache(tb, tb->pc);

    cpu_tb_exec(cpu, tb);
@@ -338,10 +334,7 @@ static inline TranslationBlock *tb_find(CPUState *cpu, 
            tb_lock();

            have_tb_lock = true;

        }

        /* Check if translation buffer has been flushed */

        if (cpu->tb_flushed) {

            cpu->tb_flushed = false;

        } else if (!tb->invalid) {

        if (!tb->invalid) {

            tb_add_jump(last_tb, tb_exit, tb);

        }

    }
@@ -606,7 +599,6 @@ int cpu_exec(CPUState *cpu) 
                break;

            }



            atomic_mb_set(&cpu->tb_flushed, false); /* reset before first TB lookup */

            for(;;) {

                cpu_handle_interrupt(cpu, &last_tb);

                tb = tb_find(cpu, last_tb, tb_exit);