From patchwork Tue Jan 4 08:32:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 450071 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p048WoTK005428 for ; Tue, 4 Jan 2011 08:33:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752485Ab1ADIcs (ORCPT ); Tue, 4 Jan 2011 03:32:48 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:42633 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750824Ab1ADIco (ORCPT ); Tue, 4 Jan 2011 03:32:44 -0500 Received: from smtp04.web.de ( [172.20.0.225]) by fmmailgate02.web.de (Postfix) with ESMTP id 6847B192E3DD0; Tue, 4 Jan 2011 09:32:43 +0100 (CET) Received: from [88.64.22.98] (helo=localhost.localdomain) by smtp04.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1Pa2Jv-00050n-00; Tue, 04 Jan 2011 09:32:43 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH v3 16/21] kvm: Drop smp_cpus argument from init functions Date: Tue, 4 Jan 2011 09:32:28 +0100 Message-Id: <4aecc65bb5a61c0a7af424cf8f5514c1bc1c9f9f.1294129949.git.jan.kiszka@web.de> 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+uPgmhMTIH1L/RKTXbPlf6/0itf5K3s5OzyAAS cUDXs4MC4TrMjaQnAy03YJeZ3M2A96M6BxvifctLctkfJsgN+Y 8yxl8SLyg= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 04 Jan 2011 08:33:24 +0000 (UTC) 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 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");