From patchwork Fri May 13 12:14:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 782802 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4DCEiI3012256 for ; Fri, 13 May 2011 12:14:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932800Ab1EMMOk (ORCPT ); Fri, 13 May 2011 08:14:40 -0400 Received: from goliath.siemens.de ([192.35.17.28]:30162 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758584Ab1EMMOP (ORCPT ); Fri, 13 May 2011 08:14:15 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p4DCECuS028888; Fri, 13 May 2011 14:14:12 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p4DCEAvI019933; Fri, 13 May 2011 14:14:12 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 13/16] qemu-kvm: Remove handle_io_window Date: Fri, 13 May 2011 14:14:07 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: 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 (demeter2.kernel.org [140.211.167.43]); Fri, 13 May 2011 12:14:44 +0000 (UTC) Disentangle the logic around handle_io_window in kvm_run. Signed-off-by: Jan Kiszka --- qemu-kvm.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index b1405fd..2af70c5 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -339,11 +339,6 @@ static int handle_mmio(CPUState *env) return 0; } -static int handle_io_window(kvm_context_t kvm) -{ - return 1; -} - static int handle_shutdown(kvm_context_t kvm, CPUState *env) { /* stop the current vcpu from going back to guest mode */ @@ -422,8 +417,7 @@ static int kvm_run(CPUState *env) #if !defined(__s390__) if (r == -1) { - r = handle_io_window(kvm); - goto more; + return 1; } #endif if (1) { @@ -483,7 +477,6 @@ static int kvm_run(CPUState *env) break; } } -more: if (!r) { goto again; }