mirror of https://github.com/xqemu/xqemu.git
kvm: Drop smp_cpus argument from init functions
No longer used. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
parent
521f0798d7
commit
cad1e2827b
|
@ -636,7 +636,7 @@ static CPUPhysMemoryClient kvm_cpu_phys_memory_client = {
|
||||||
.migration_log = kvm_client_migration_log,
|
.migration_log = kvm_client_migration_log,
|
||||||
};
|
};
|
||||||
|
|
||||||
int kvm_init(int smp_cpus)
|
int kvm_init(void)
|
||||||
{
|
{
|
||||||
static const char upgrade_note[] =
|
static const char upgrade_note[] =
|
||||||
"Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n"
|
"Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n"
|
||||||
|
@ -749,7 +749,7 @@ int kvm_init(int smp_cpus)
|
||||||
s->xcrs = kvm_check_extension(s, KVM_CAP_XCRS);
|
s->xcrs = kvm_check_extension(s, KVM_CAP_XCRS);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ret = kvm_arch_init(s, smp_cpus);
|
ret = kvm_arch_init(s);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,7 +58,7 @@ int kvm_check_extension(KVMState *s, unsigned int extension)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_init(int smp_cpus)
|
int kvm_init(void)
|
||||||
{
|
{
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
}
|
}
|
||||||
|
|
4
kvm.h
4
kvm.h
|
@ -34,7 +34,7 @@ struct kvm_run;
|
||||||
|
|
||||||
/* external API */
|
/* external API */
|
||||||
|
|
||||||
int kvm_init(int smp_cpus);
|
int kvm_init(void);
|
||||||
|
|
||||||
int kvm_has_sync_mmu(void);
|
int kvm_has_sync_mmu(void);
|
||||||
int kvm_has_vcpu_events(void);
|
int kvm_has_vcpu_events(void);
|
||||||
|
@ -105,7 +105,7 @@ int kvm_arch_get_registers(CPUState *env);
|
||||||
|
|
||||||
int kvm_arch_put_registers(CPUState *env, int level);
|
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);
|
int kvm_arch_init_vcpu(CPUState *env);
|
||||||
|
|
||||||
|
|
|
@ -527,7 +527,7 @@ static int kvm_init_identity_map_page(KVMState *s)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_arch_init(KVMState *s, int smp_cpus)
|
int kvm_arch_init(KVMState *s)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
struct utsname utsname;
|
struct utsname utsname;
|
||||||
|
|
|
@ -56,7 +56,7 @@ static void kvm_kick_env(void *env)
|
||||||
qemu_cpu_kick(env);
|
qemu_cpu_kick(env);
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_arch_init(KVMState *s, int smp_cpus)
|
int kvm_arch_init(KVMState *s)
|
||||||
{
|
{
|
||||||
#ifdef KVM_CAP_PPC_UNSET_IRQ
|
#ifdef KVM_CAP_PPC_UNSET_IRQ
|
||||||
cap_interrupt_unset = kvm_check_extension(s, KVM_CAP_PPC_UNSET_IRQ);
|
cap_interrupt_unset = kvm_check_extension(s, KVM_CAP_PPC_UNSET_IRQ);
|
||||||
|
|
|
@ -70,7 +70,7 @@
|
||||||
#define SCLP_CMDW_READ_SCP_INFO 0x00020001
|
#define SCLP_CMDW_READ_SCP_INFO 0x00020001
|
||||||
#define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001
|
#define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001
|
||||||
|
|
||||||
int kvm_arch_init(KVMState *s, int smp_cpus)
|
int kvm_arch_init(KVMState *s)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
2
vl.c
2
vl.c
|
@ -2836,7 +2836,7 @@ int main(int argc, char **argv, char **envp)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (kvm_allowed) {
|
if (kvm_allowed) {
|
||||||
int ret = kvm_init(smp_cpus);
|
int ret = kvm_init();
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
if (!kvm_available()) {
|
if (!kvm_available()) {
|
||||||
printf("KVM not supported for this target\n");
|
printf("KVM not supported for this target\n");
|
||||||
|
|
Loading…
Reference in New Issue