[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] kvm: x86: Fix merge artifact of f8d926e9 about mp_s
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH] kvm: x86: Fix merge artifact of f8d926e9 about mp_state |
Date: |
Tue, 13 Oct 2009 13:04:03 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
Signed-off-by: Jan Kiszka <address@hidden>
---
target-i386/kvm.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7010999..aa90eff 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -683,10 +683,6 @@ int kvm_arch_put_registers(CPUState *env)
if (ret < 0)
return ret;
- ret = kvm_get_mp_state(env);
- if (ret < 0)
- return ret;
-
return 0;
}
@@ -710,6 +706,10 @@ int kvm_arch_get_registers(CPUState *env)
if (ret < 0)
return ret;
+ ret = kvm_get_mp_state(env);
+ if (ret < 0)
+ return ret;
+
return 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH] kvm: x86: Fix merge artifact of f8d926e9 about mp_state,
Jan Kiszka <=