[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH][RESEND] kvm: x86: Fix merge artifact of f8d926e9 ab
|
From: |
Jan Kiszka |
|
Subject: |
[Qemu-devel] [PATCH][RESEND] kvm: x86: Fix merge artifact of f8d926e9 about mp_state |
|
Date: |
Wed, 25 Nov 2009 00:31:03 +0100 |
|
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>
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index d6bc23a..89fd7a5 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -717,12 +717,8 @@ int kvm_arch_put_registers(CPUState *env)
ret = kvm_put_mp_state(env);
if (ret < 0)
return ret;
- ret = kvm_get_mp_state(env);
- if (ret < 0)
- return ret;
-
return 0;
}
int kvm_arch_get_registers(CPUState *env)
@@ -744,8 +740,12 @@ int kvm_arch_get_registers(CPUState *env)
ret = kvm_get_msrs(env);
if (ret < 0)
return ret;
+ ret = kvm_get_mp_state(env);
+ if (ret < 0)
+ return ret;
+
return 0;
}
int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
--
1.6.0.2
signature.asc
Description: OpenPGP digital signature
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH][RESEND] kvm: x86: Fix merge artifact of f8d926e9 about mp_state,
Jan Kiszka <=