[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/31] kvm: Drop smp_cpus argument from init functio
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 25/31] kvm: Drop smp_cpus argument from init functions |
Date: |
Mon, 24 Jan 2011 07:02:34 -0200 |
From: Jan Kiszka <address@hidden>
No longer used.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Marcelo Tosatti <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 41decde..8053f92 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -636,7 +636,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"
@@ -749,7 +749,7 @@ int kvm_init(int smp_cpus)
s->xcrs = kvm_check_extension(s, KVM_CAP_XCRS);
#endif
- ret = kvm_arch_init(s, smp_cpus);
+ ret = kvm_arch_init(s);
if (ret < 0) {
goto err;
}
diff --git a/kvm-stub.c b/kvm-stub.c
index 33d4476..88682f2 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -58,7 +58,7 @@ int kvm_check_extension(KVMState *s, 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 ce08d42..a971752 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);
@@ -105,7 +105,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);
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index feaf33d..016b67d 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -527,7 +527,7 @@ static int kvm_init_identity_map_page(KVMState *s)
return 0;
}
-int kvm_arch_init(KVMState *s, int smp_cpus)
+int kvm_arch_init(KVMState *s)
{
int ret;
struct utsname utsname;
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 849b404..3c05630 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(KVMState *s, int smp_cpus)
+int kvm_arch_init(KVMState *s)
{
#ifdef KVM_CAP_PPC_UNSET_IRQ
cap_interrupt_unset = kvm_check_extension(s, KVM_CAP_PPC_UNSET_IRQ);
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index adf4a9e..b177e10 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(KVMState *s, int smp_cpus)
+int kvm_arch_init(KVMState *s)
{
return 0;
}
diff --git a/vl.c b/vl.c
index 0292184..33f844f 100644
--- a/vl.c
+++ b/vl.c
@@ -2836,7 +2836,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.2.3
- [Qemu-devel] [PATCH 08/31] kvm: introduce kvm_inject_x86_mce_on, (continued)
- [Qemu-devel] [PATCH 08/31] kvm: introduce kvm_inject_x86_mce_on, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 14/31] kvm: x86: Swallow KVM_EXIT_SET_TPR, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 09/31] kvm: x86: Fix DPL write back of segment registers, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 29/31] kvm: Do not use qemu_fair_mutex, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 18/31] kvm: x86: Align kvm_arch_put_registers code with comment, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 10/31] kvm: x86: Remove obsolete SS.RPL/DPL aligment, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 21/31] kvm: x86: Fix xcr0 reset mismerge, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 20/31] kvm: x86: Remove redundant mp_state initialization, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 23/31] kvm: x86: Reset paravirtual MSRs, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 27/31] kvm: x86: Rework identity map and TSS setup for larger BIOS sizes, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 25/31] kvm: Drop smp_cpus argument from init functions,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 16/31] kvm: Improve reporting of fatal errors, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 06/31] kvm: introduce kvm_mce_in_progress, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 12/31] kvm: x86: Fix a few coding style violations, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 26/31] kvm: Consolidate must-have capability checks, Marcelo Tosatti, 2011/01/24