From patchwork Thu Nov 19 13:34:46 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Avi Kivity <avi@redhat.com>
X-Patchwork-Id: 61346
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 nAJDkB51031997
	for <patchwork-kvm@patchwork.kernel.org>;
	Thu, 19 Nov 2009 13:46:14 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756420AbZKSNn0 (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Thu, 19 Nov 2009 08:43:26 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756802AbZKSNnL
	(ORCPT <rfc822;kvm-outgoing>); Thu, 19 Nov 2009 08:43:11 -0500
Received: from mx1.redhat.com ([209.132.183.28]:37826 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753421AbZKSNfH (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 19 Nov 2009 08:35:07 -0500
Received: from int-mx03.intmail.prod.int.phx2.redhat.com
	(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAJDZE7Z023743
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Thu, 19 Nov 2009 08:35:14 -0500
Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com
	[10.35.255.11])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id nAJDZDVs018207; Thu, 19 Nov 2009 08:35:14 -0500
Received: from localhost.localdomain (file.tlv.redhat.com [10.35.255.8])
	by cleopatra.tlv.redhat.com (Postfix) with ESMTP id F28AA250037;
	Thu, 19 Nov 2009 15:35:10 +0200 (IST)
From: Avi Kivity <avi@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org
Subject: [PATCH 10/35] KVM: x86: Drop unneeded CONFIG_HAS_IOMEM check
Date: Thu, 19 Nov 2009 15:34:46 +0200
Message-Id: <1258637711-11674-11-git-send-email-avi@redhat.com>
In-Reply-To: <1258637711-11674-1-git-send-email-avi@redhat.com>
References: <1258637711-11674-1-git-send-email-avi@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org


diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 3cffa2c..5d450cc 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3814,7 +3814,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;
@@ -3832,7 +3831,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);