[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/25] linux-user: Avoid redundant ENV_GET_CPU()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 01/25] linux-user: Avoid redundant ENV_GET_CPU() |
Date: |
Sat, 27 Jul 2013 00:05:26 +0200 |
This fixes a mismerge in 874ec3c5b3821bb964f9f37b2f930f2a9ce51652.
Acked-by: Riku Voipio <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
linux-user/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index 5dc0947..5309117 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3637,7 +3637,7 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
cpu = ENV_GET_CPU(env);
- cpu_reset(ENV_GET_CPU(env));
+ cpu_reset(cpu);
thread_cpu = cpu;
--
1.8.1.4
- [Qemu-devel] [PULL 00/25] QOM CPUState patch queue 2013-07-26, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 01/25] linux-user: Avoid redundant ENV_GET_CPU(),
Andreas Färber <=
- [Qemu-devel] [PULL 03/25] target-s390x: Fix CPUState rework fallout, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 02/25] kvm: Change prototype of kvm_update_guest_debug(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 04/25] target-xtensa: Introduce XtensaCPU subclasses, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 06/25] gdbstub: Drop dead code in cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 09/25] target-ppc: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 05/25] gdbstub: Fix cpu_gdb_{read, write}_register() Coding Style, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 12/25] target-m68k: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 08/25] target-i386: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 11/25] target-arm: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 07/25] cpu: Introduce CPUState::gdb_num_regs and CPUClass::gdb_num_core_regs, Andreas Färber, 2013/07/26