From patchwork Mon Jan 3 08:32:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 77229 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 CD947B7082 for ; Mon, 3 Jan 2011 19:50:40 +1100 (EST) Received: from localhost ([127.0.0.1]:33281 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZg6d-00070k-11 for incoming@patchwork.ozlabs.org; Mon, 03 Jan 2011 03:49:31 -0500 Received: from [140.186.70.92] (port=52453 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZfrp-0000x5-5n for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:34:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZfrM-0008Ok-Nt for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:49 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:48908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZfrM-0008O4-9O for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:44 -0500 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate01.web.de (Postfix) with ESMTP id 39F24184BCBAB; Mon, 3 Jan 2011 09:33:24 +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 1PZfr2-0007fO-00; Mon, 03 Jan 2011 09:33:24 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 3 Jan 2011 09:32:52 +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+avvxjMgsO6wW4Jf6tMdlhyGzz5T1gubv7Blsv 1zsV5OD/ocxOFJEjQ4i4FaP2gFmWe26WYMMkEgcyz3q2fNcSzp Mf1gs0kBI= 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 02/17] kvm: Drop return value of kvm_cpu_exec 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 It is not used, it is not needed, so let's remove it. Signed-off-by: Jan Kiszka --- kvm-all.c | 6 ++---- kvm-stub.c | 4 ++-- kvm.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 2538283..7518f2c 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -850,7 +850,7 @@ void kvm_cpu_synchronize_post_init(CPUState *env) env->kvm_vcpu_dirty = 0; } -int kvm_cpu_exec(CPUState *env) +void kvm_cpu_exec(CPUState *env) { struct kvm_run *run = env->kvm_run; int ret; @@ -943,7 +943,7 @@ int kvm_cpu_exec(CPUState *env) #ifdef KVM_CAP_SET_GUEST_DEBUG if (kvm_arch_debug(&run->debug.arch)) { env->exception_index = EXCP_DEBUG; - return 0; + return; } /* re-enter, this exception was guest-internal */ ret = 1; @@ -960,8 +960,6 @@ int kvm_cpu_exec(CPUState *env) env->exit_request = 0; env->exception_index = EXCP_INTERRUPT; } - - return ret; } int kvm_ioctl(KVMState *s, int type, ...) diff --git a/kvm-stub.c b/kvm-stub.c index 5384a4b..352c6a6 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -79,9 +79,9 @@ void kvm_cpu_synchronize_post_init(CPUState *env) { } -int kvm_cpu_exec(CPUState *env) +void kvm_cpu_exec(CPUState *env) { - abort (); + abort(); } int kvm_has_sync_mmu(void) diff --git a/kvm.h b/kvm.h index 60a9b42..51ad56f 100644 --- a/kvm.h +++ b/kvm.h @@ -46,7 +46,7 @@ int kvm_has_xcrs(void); #ifdef NEED_CPU_H int kvm_init_vcpu(CPUState *env); -int kvm_cpu_exec(CPUState *env); +void kvm_cpu_exec(CPUState *env); #if !defined(CONFIG_USER_ONLY) int kvm_log_start(target_phys_addr_t phys_addr, ram_addr_t size);