On 05/11/2015 15:00, Peter Maydell wrote: > On 5 November 2015 at 12:13, Paolo Bonzini <pbonz...@redhat.com> wrote: >> The following changes since commit 6c5f30cad290c745f910481d0e890b3f4fad1f00: >> >> Merge remote-tracking branch >> 'remotes/juanquintela/tags/migration/20151104' into staging (2015-11-05 >> 10:10:57 +0000) >> >> are available in the git repository at: >> >> >> git://github.com/bonzini/qemu.git tags/for-upstream-replay >> >> for you to fetch changes up to 88dcb341cd6163a47346de83d4206591da6a9959: >> >> replay: recording of the user input (2015-11-05 12:40:48 +0100) >> >> ---------------------------------------------------------------- >> So here it is, let's see what happens. > > Hi. This got through most of the merge tests, but running linux-user > tests failed: > > /home/petmay01/linaro/qemu-for-merges/build/all-linux-static/i386-linux-user/qemu-i386 > -L ./gnemul/qemu-i386 i386/ls -l dummyfile > qemu-i386: /home/petmay01/linaro/qemu-for-merges/translate-all.c:146: > tb_unlock: Assertion `have_tb_lock' failed. > > Seems to assert the first time we call tb_unlock(). Here's a backtrace: > Program received signal SIGABRT, Aborted. > 0x00000000601fa5d9 in raise () > (gdb) bt > #0 0x00000000601fa5d9 in raise () > #1 0x000000006019a608 in abort () > #2 0x0000000060194584 in __assert_fail_base () > #3 0x00000000601945de in __assert_fail () > #4 0x0000000060003d5b in tb_unlock () at > /home/petmay01/linaro/qemu-for-merges/translate-all.c:146 > #5 0x00000000600073fa in tb_find_slow (cpu=0x62605710, pc=4135504272, > cs_base=0, flags=4194483) > at /home/petmay01/linaro/qemu-for-merges/cpu-exec.c:279 > #6 0x0000000060007581 in tb_find_fast (cpu=0x62605710) at > /home/petmay01/linaro/qemu-for-merges/cpu-exec.c:316 > #7 0x0000000060007868 in cpu_x86_exec (cpu=0x62605710) at > /home/petmay01/linaro/qemu-for-merges/cpu-exec.c:423 > #8 0x00000000600372b6 in cpu_loop (env=0x6260d990) at > /home/petmay01/linaro/qemu-for-merges/linux-user/main.c:281 > #9 0x0000000060039370 in main (argc=6, argv=0x7fffffffe438, > envp=0x7fffffffe470) > at /home/petmay01/linaro/qemu-for-merges/linux-user/main.c:4666 > > thanks > -- PMM >
Pavel, can you look at it? I'll take care of squashing the change. You can get the tree I sent to Peter from github. Paolo
