From patchwork Mon Jan 3 08:33:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 77224 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B163FB7063 for ; Mon, 3 Jan 2011 19:39:26 +1100 (EST) Received: from localhost ([127.0.0.1]:36533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZfwp-0002Z9-Oj for incoming@patchwork.ozlabs.org; Mon, 03 Jan 2011 03:39:23 -0500 Received: from [140.186.70.92] (port=52301 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZfrF-0000jV-61 for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZfr8-0008LQ-Dr for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:35 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:50620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZfr8-0008LA-36 for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:30 -0500 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate03.web.de (Postfix) with ESMTP id 7593518393D36; Mon, 3 Jan 2011 09:33:29 +0100 (CET) Received: from [88.64.22.98] (helo=localhost.localdomain) by smtp01.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PZfr7-0007fO-00; Mon, 03 Jan 2011 09:33:29 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 3 Jan 2011 09:33:05 +0100 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/HhM5yUNFIxdjVoNfVw14WTcV0swpNRH6lsDzQ /Y7yenaNBbKjr5QNwnI5C+IKg2EQAC8uq1kmYk5uCRHH36xiar hfYFIf+LA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Jan Kiszka , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v2 15/17] kvm: Drop smp_cpus argument from init functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka No longer used. Signed-off-by: Jan Kiszka --- 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");