Revision cad1e282
b/kvm-all.c | ||
---|---|---|
636 | 636 |
.migration_log = kvm_client_migration_log, |
637 | 637 |
}; |
638 | 638 |
|
639 |
int kvm_init(int smp_cpus)
|
|
639 |
int kvm_init(void)
|
|
640 | 640 |
{ |
641 | 641 |
static const char upgrade_note[] = |
642 | 642 |
"Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n" |
... | ... | |
749 | 749 |
s->xcrs = kvm_check_extension(s, KVM_CAP_XCRS); |
750 | 750 |
#endif |
751 | 751 |
|
752 |
ret = kvm_arch_init(s, smp_cpus);
|
|
752 |
ret = kvm_arch_init(s); |
|
753 | 753 |
if (ret < 0) { |
754 | 754 |
goto err; |
755 | 755 |
} |
b/kvm-stub.c | ||
---|---|---|
58 | 58 |
return 0; |
59 | 59 |
} |
60 | 60 |
|
61 |
int kvm_init(int smp_cpus)
|
|
61 |
int kvm_init(void)
|
|
62 | 62 |
{ |
63 | 63 |
return -ENOSYS; |
64 | 64 |
} |
b/kvm.h | ||
---|---|---|
34 | 34 |
|
35 | 35 |
/* external API */ |
36 | 36 |
|
37 |
int kvm_init(int smp_cpus);
|
|
37 |
int kvm_init(void);
|
|
38 | 38 |
|
39 | 39 |
int kvm_has_sync_mmu(void); |
40 | 40 |
int kvm_has_vcpu_events(void); |
... | ... | |
105 | 105 |
|
106 | 106 |
int kvm_arch_put_registers(CPUState *env, int level); |
107 | 107 |
|
108 |
int kvm_arch_init(KVMState *s, int smp_cpus);
|
|
108 |
int kvm_arch_init(KVMState *s); |
|
109 | 109 |
|
110 | 110 |
int kvm_arch_init_vcpu(CPUState *env); |
111 | 111 |
|
b/target-i386/kvm.c | ||
---|---|---|
527 | 527 |
return 0; |
528 | 528 |
} |
529 | 529 |
|
530 |
int kvm_arch_init(KVMState *s, int smp_cpus)
|
|
530 |
int kvm_arch_init(KVMState *s) |
|
531 | 531 |
{ |
532 | 532 |
int ret; |
533 | 533 |
struct utsname utsname; |
b/target-ppc/kvm.c | ||
---|---|---|
56 | 56 |
qemu_cpu_kick(env); |
57 | 57 |
} |
58 | 58 |
|
59 |
int kvm_arch_init(KVMState *s, int smp_cpus)
|
|
59 |
int kvm_arch_init(KVMState *s) |
|
60 | 60 |
{ |
61 | 61 |
#ifdef KVM_CAP_PPC_UNSET_IRQ |
62 | 62 |
cap_interrupt_unset = kvm_check_extension(s, KVM_CAP_PPC_UNSET_IRQ); |
b/target-s390x/kvm.c | ||
---|---|---|
70 | 70 |
#define SCLP_CMDW_READ_SCP_INFO 0x00020001 |
71 | 71 |
#define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001 |
72 | 72 |
|
73 |
int kvm_arch_init(KVMState *s, int smp_cpus)
|
|
73 |
int kvm_arch_init(KVMState *s) |
|
74 | 74 |
{ |
75 | 75 |
return 0; |
76 | 76 |
} |
b/vl.c | ||
---|---|---|
2836 | 2836 |
} |
2837 | 2837 |
|
2838 | 2838 |
if (kvm_allowed) { |
2839 |
int ret = kvm_init(smp_cpus);
|
|
2839 |
int ret = kvm_init(); |
|
2840 | 2840 |
if (ret < 0) { |
2841 | 2841 |
if (!kvm_available()) { |
2842 | 2842 |
printf("KVM not supported for this target\n"); |
Also available in: Unified diff