[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/17] kvm: Drop smp_cpus argument from init func
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 15/17] kvm: Drop smp_cpus argument from init functions |
Date: |
Mon, 3 Jan 2011 09:33:05 +0100 |
From: Jan Kiszka <address@hidden>
No longer used.
Signed-off-by: Jan Kiszka <address@hidden>
---
kvm-all.c | 4 ++--
kvm-stub.c | 2 +-
kvm.h | 4 ++--
target-i386/kvm.c | 2 +-
target-ppc/kvm.c | 2 +-
target-s390x/kvm.c | 2 +-
vl.c | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index d8820c7..190fcdf 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -584,7 +584,7 @@ static CPUPhysMemoryClient kvm_cpu_phys_memory_client = {
.migration_log = kvm_client_migration_log,
};
-int kvm_init(int smp_cpus)
+int kvm_init(void)
{
static const char upgrade_note[] =
"Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n"
@@ -687,7 +687,7 @@ int kvm_init(int smp_cpus)
kvm_state.xcrs = kvm_check_extension(KVM_CAP_XCRS);
#endif
- ret = kvm_arch_init(smp_cpus);
+ ret = kvm_arch_init();
if (ret < 0) {
goto err;
}
diff --git a/kvm-stub.c b/kvm-stub.c
index 3a058ad..e00d7df 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -58,7 +58,7 @@ int kvm_check_extension(unsigned int extension)
return 0;
}
-int kvm_init(int smp_cpus)
+int kvm_init(void)
{
return -ENOSYS;
}
diff --git a/kvm.h b/kvm.h
index 26ca8c1..31d9f21 100644
--- a/kvm.h
+++ b/kvm.h
@@ -34,7 +34,7 @@ struct kvm_run;
/* external API */
-int kvm_init(int smp_cpus);
+int kvm_init(void);
int kvm_has_sync_mmu(void);
int kvm_has_vcpu_events(void);
@@ -101,7 +101,7 @@ int kvm_arch_get_registers(CPUState *env);
int kvm_arch_put_registers(CPUState *env, int level);
-int kvm_arch_init(int smp_cpus);
+int kvm_arch_init(void);
int kvm_arch_init_vcpu(CPUState *env);
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index c4b6813..6d31dde 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -594,7 +594,7 @@ static int kvm_init_identity_map_page(void)
return 0;
}
-int kvm_arch_init(int smp_cpus)
+int kvm_arch_init(void)
{
int ret;
struct utsname utsname;
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 56d30cc..72f2f94 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -56,7 +56,7 @@ static void kvm_kick_env(void *env)
qemu_cpu_kick(env);
}
-int kvm_arch_init(int smp_cpus)
+int kvm_arch_init(void)
{
#ifdef KVM_CAP_PPC_UNSET_IRQ
cap_interrupt_unset = kvm_check_extension(KVM_CAP_PPC_UNSET_IRQ);
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 927a37e..4f9075c 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -70,7 +70,7 @@
#define SCLP_CMDW_READ_SCP_INFO 0x00020001
#define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001
-int kvm_arch_init(int smp_cpus)
+int kvm_arch_init(void)
{
return 0;
}
diff --git a/vl.c b/vl.c
index 768dbf4..abe4af8 100644
--- a/vl.c
+++ b/vl.c
@@ -2834,7 +2834,7 @@ int main(int argc, char **argv, char **envp)
}
if (kvm_allowed) {
- int ret = kvm_init(smp_cpus);
+ int ret = kvm_init();
if (ret < 0) {
if (!kvm_available()) {
printf("KVM not supported for this target\n");
--
1.7.1
- [Qemu-devel] Re: [PATCH v2 14/17] kvm: x86: Introduce kvmclock device to save/restore its state, (continued)
[Qemu-devel] [PATCH v2 15/17] kvm: Drop smp_cpus argument from init functions,
Jan Kiszka <=
[Qemu-devel] [PATCH v2 11/17] kvm: x86: Reset paravirtual MSRs, Jan Kiszka, 2011/01/03
[Qemu-devel] [PATCH v2 13/17] kvm: Eliminate KVMState arguments, Jan Kiszka, 2011/01/03
[Qemu-devel] [PATCH v2 06/17] kvm: x86: Align kvm_arch_put_registers code with comment, Jan Kiszka, 2011/01/03
[Qemu-devel] [PATCH v2 10/17] kvm: x86: Refactor msr_star/hsave_pa setup and checks, Jan Kiszka, 2011/01/03
[Qemu-devel] [PATCH v2 17/17] kvm: Drop dependencies on very old capabilities, Jan Kiszka, 2011/01/03