diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2011-02-03 06:57:46 -0200 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2011-02-07 16:30:01 +0200 |
| commit | 185fc528a10d61cf17bbe50a198a8f466a732aa0 (patch) | |
| tree | c1b2887d3a80c003f0ad1779ef4dbf247e25460d | |
| parent | d428135c04be807e2d6619ef73f3ad430dde009e (diff) | |
qemu-kvm-x86: initialize has_msr_star/has_msr_hsave_pa
Fixes 64-bit guest migration.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | qemu-kvm-x86.c | 6 | ||||
| -rw-r--r-- | target-i386/kvm.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 2f1a0909b..4be5e329e 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -509,6 +509,12 @@ int kvm_arch_qemu_create_context(void) kvm_set_shadow_pages(kvm_context, kvm_shadow_memory); } + /* initialize has_msr_star/has_msr_hsave_pa */ + r = kvm_get_supported_msrs(kvm_state); + if (r < 0) { + return r; + } + kvm_msr_list = kvm_get_msr_list(); if (!kvm_msr_list) { return -1; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 5e0865a83..f389b85b1 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -472,7 +472,6 @@ void kvm_arch_reset_vcpu(CPUState *env) } } -#ifdef OBSOLETE_KVM_IMPL static int kvm_get_supported_msrs(KVMState *s) { @@ -521,6 +520,8 @@ static int kvm_get_supported_msrs(KVMState *s) return ret; } +#ifdef OBSOLETE_KVM_IMPL + int kvm_arch_init(KVMState *s) { uint64_t identity_base = 0xfffbc000; |