diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-03 00:29:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-03 00:29:17 +0000 |
| commit | 0856579cac2f1dacecd847cfcd89680d26ff78f5 (patch) | |
| tree | 6ab14c4d57029b50bf6ec08b4b881bfad0625217 /linux-user | |
| parent | b8a173b25c887a606681fc35a46702c164d5b2d0 (diff) | |
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 <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index 111c1ffafc..d92702a734 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); |