diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2011-02-02 19:11:35 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-02-02 19:11:35 -0200 |
| commit | 774dce1308b01518571795825e46d6f4104ee251 (patch) | |
| tree | 9251832fc823cb562c81b81b0c7535723ed12735 /kvm.h | |
| parent | b13181147c92a61768ed7dd030830c35585456eb (diff) | |
| parent | cad1e2827b616487e3574300f2eaeea13a355197 (diff) | |
Merge commit 'cad1e2827b616487e3574300f2eaeea13a355197' into upstream-merge
* commit 'cad1e2827b616487e3574300f2eaeea13a355197':
kvm: Drop smp_cpus argument from init functions
kvm: x86: Fix !CONFIG_KVM_PARA build
kvm: x86: Reset paravirtual MSRs
Conflicts:
kvm-all.c
kvm.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'kvm.h')
| -rw-r--r-- | kvm.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -38,7 +38,7 @@ struct kvm_run; /* external API */ -int kvm_init(int smp_cpus); +int kvm_init(void); #endif /* OBSOLETE_KVM_IMPL */ int kvm_has_sync_mmu(void); @@ -113,7 +113,7 @@ int kvm_arch_get_registers(CPUState *env); int kvm_arch_put_registers(CPUState *env, int level); -int kvm_arch_init(KVMState *s, int smp_cpus); +int kvm_arch_init(KVMState *s); int kvm_arch_init_vcpu(CPUState *env); |