From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: [PATCH 29/35] kvm: Drop smp_cpus argument from init functions Date: Thu, 6 Jan 2011 15:56:35 -0200 Message-ID: <28ba5b4f2a1dbdb63e065268ff677f2b7b2e0b9b.1294336601.git.mtosatti@redhat.com> References: Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Jan Kiszka , Marcelo Tosatti To: Anthony Liguori Return-path: Received: from mx1.redhat.com ([209.132.183.28]:49312 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355Ab1AFSDS (ORCPT ); Thu, 6 Jan 2011 13:03:18 -0500 In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: From: Jan Kiszka No longer used. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti --- 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 47cb22b..a907578 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -612,7 +612,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 b0b6605..fd47f4c 100644 --- a/vl.c +++ b/vl.c @@ -2837,7 +2837,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 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=60972 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PauBA-0003sb-N4 for qemu-devel@nongnu.org; Thu, 06 Jan 2011 13:03:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PauB9-0006ZV-55 for qemu-devel@nongnu.org; Thu, 06 Jan 2011 13:03:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50047) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PauB8-0006Yi-S3 for qemu-devel@nongnu.org; Thu, 06 Jan 2011 13:03:15 -0500 From: Marcelo Tosatti Date: Thu, 6 Jan 2011 15:56:35 -0200 Message-Id: <28ba5b4f2a1dbdb63e065268ff677f2b7b2e0b9b.1294336601.git.mtosatti@redhat.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH 29/35] kvm: Drop smp_cpus argument from init functions List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org From: Jan Kiszka No longer used. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti --- 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 47cb22b..a907578 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -612,7 +612,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 b0b6605..fd47f4c 100644 --- a/vl.c +++ b/vl.c @@ -2837,7 +2837,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