From patchwork Mon Oct 12 06:51:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 53054 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9C70RgQ002215 for ; Mon, 12 Oct 2009 07:00:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753975AbZJLGwU (ORCPT ); Mon, 12 Oct 2009 02:52:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752728AbZJLGwU (ORCPT ); Mon, 12 Oct 2009 02:52:20 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:53638 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752827AbZJLGwT (ORCPT ); Mon, 12 Oct 2009 02:52:19 -0400 Received: from smtp05.web.de (fmsmtp05.dlan.cinetic.de [172.20.4.166]) by fmmailgate02.web.de (Postfix) with ESMTP id BAE9A12E1BF74; Mon, 12 Oct 2009 08:51:42 +0200 (CEST) Received: from [88.65.241.11] (helo=[192.168.1.10]) by smtp05.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #314) id 1MxEkv-00023M-00; Mon, 12 Oct 2009 08:51:41 +0200 Message-ID: <4AD2D1FC.3040707@web.de> Date: Mon, 12 Oct 2009 08:51:40 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Marcelo Tosatti , Avi Kivity CC: kvm-devel Subject: [PATCH] KVM: x86: Drop unneeded CONFIG_HAS_IOMEM check X-Enigmail-Version: 0.95.7 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX186sJz7sZWhaCB8v2zLf1eNFWgaxT2FGWGqkPEw i3QWYuZqgTQWFpRG006kSjHaJZ2pyLsYgpxdNKyzD6h5Gj2aYK QmCHzryb0= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 11a6f2f..12de5bb 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3802,7 +3802,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) if (r) goto out; } -#if CONFIG_HAS_IOMEM if (vcpu->mmio_needed) { memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8); vcpu->mmio_read_completed = 1; @@ -3820,7 +3819,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) goto out; } } -#endif if (kvm_run->exit_reason == KVM_EXIT_HYPERCALL) kvm_register_write(vcpu, VCPU_REGS_RAX, kvm_run->hypercall.ret);