Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging"

This reverts commit b8a173b25c, reversing
changes made to 5de090464f.

(I applied this pull request when I should not have done so, and
am now immediately reverting it.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-03-03 00:29:17 +00:00
parent b8a173b25c
commit 0856579cac
9 changed files with 111 additions and 101 deletions

View file

@ -3453,17 +3453,10 @@ CPUArchState *cpu_copy(CPUArchState *env)
{
CPUState *cpu = ENV_GET_CPU(env);
CPUArchState *new_env = cpu_init(cpu_model);
CPUState *new_cpu;
CPUState *new_cpu = ENV_GET_CPU(new_env);
CPUBreakpoint *bp;
CPUWatchpoint *wp;
if (!new_env) {
fprintf(stderr, "cpu_copy: Failed to create new CPU\n");
exit(1);
}
new_cpu = ENV_GET_CPU(new_env);
/* Reset non arch specific state */
cpu_reset(new_cpu);