mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-03 11:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'icount-update' into HEAD

Browse Source 
Merge the original development branch due to breakage caused by the
MTTCG merge.

Conflicts:
	cpu-exec.c
	translate-common.c

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
2017-03-03 16:39:18 +01:00
parent 508e038a5d 55ac0a9bf4
commit 30f3dda24b
7 changed files with 79 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
translate-all.c
View File

@@ -1930,7 +1930,7 @@ void cpu_interrupt(CPUState *cpu, int mask)
{
g_assert(qemu_mutex_iothread_locked());
cpu->interrupt_request |= mask;
cpu->tcg_exit_req = 1;
cpu->icount_decr.u16.high = -1;
}
/*