From 0856579cac2f1dacecd847cfcd89680d26ff78f5 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 3 Mar 2015 00:29:17 +0000 Subject: Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging" This reverts commit b8a173b25c887a606681fc35a46702c164d5b2d0, reversing changes made to 5de090464f1ec5360c4f30faa01d8a9f8826cd58. (I applied this pull request when I should not have done so, and am now immediately reverting it.) Signed-off-by: Peter Maydell --- linux-user/main.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'linux-user') diff --git a/linux-user/main.c b/linux-user/main.c index 111c1ff..d92702a 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -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); -- cgit v1.1