Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging

This commit is contained in:
Anthony Liguori 2011-12-14 07:59:21 -06:00
commit 9423a2e8dd
94 changed files with 228 additions and 533 deletions

2
cpus.c
View file

@ -89,7 +89,7 @@ TimersState timers_state;
int64_t cpu_get_icount(void)
{
int64_t icount;
CPUState *env = cpu_single_env;;
CPUState *env = cpu_single_env;
icount = qemu_icount;
if (env) {