From patchwork Tue Feb 1 21:16:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 524031 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 p11LHxLH000732 for ; Tue, 1 Feb 2011 21:18:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752464Ab1BAVRN (ORCPT ); Tue, 1 Feb 2011 16:17:13 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:60077 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752434Ab1BAVRI (ORCPT ); Tue, 1 Feb 2011 16:17:08 -0500 Received: from smtp05.web.de ( [172.20.4.166]) by fmmailgate01.web.de (Postfix) with ESMTP id AAE62186D8AB8; Tue, 1 Feb 2011 22:16:15 +0100 (CET) Received: from [88.65.41.52] (helo=localhost.localdomain) by smtp05.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PkNaB-0006FM-01; Tue, 01 Feb 2011 22:16:15 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH v2 21/24] kvm: Remove static return code of kvm_handle_io Date: Tue, 1 Feb 2011 22:16:01 +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: V01U2FsdGVkX192fIHiCBELfomBG1ith5APyoxvXOLi9jVdasft zi7p8Y88TwJnMxHmXmCGiGQnwYubVJgZoSEo57H3RLLlWg2LIZ /f1vAqkk4= 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 01 Feb 2011 21:18:16 +0000 (UTC) diff --git a/kvm-all.c b/kvm-all.c index d961697..cf54256 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -770,8 +770,8 @@ err: return ret; } -static int kvm_handle_io(uint16_t port, void *data, int direction, int size, - uint32_t count) +static void kvm_handle_io(uint16_t port, void *data, int direction, int size, + uint32_t count) { int i; uint8_t *ptr = data; @@ -805,8 +805,6 @@ static int kvm_handle_io(uint16_t port, void *data, int direction, int size, ptr += size; } - - return 1; } #ifdef KVM_CAP_INTERNAL_ERROR_DATA @@ -940,11 +938,12 @@ int kvm_cpu_exec(CPUState *env) switch (run->exit_reason) { case KVM_EXIT_IO: DPRINTF("handle_io\n"); - ret = kvm_handle_io(run->io.port, - (uint8_t *)run + run->io.data_offset, - run->io.direction, - run->io.size, - run->io.count); + kvm_handle_io(run->io.port, + (uint8_t *)run + run->io.data_offset, + run->io.direction, + run->io.size, + run->io.count); + ret = 1; break; case KVM_EXIT_MMIO: DPRINTF("handle_mmio\n");