From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hidetoshi Seto Subject: [PATCH] device-assignment: cleanup assigned_dev_ioport_map Date: Wed, 13 Oct 2010 17:11:44 +0900 Message-ID: <4CB569C0.6020905@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Cc: Avi Kivity To: "kvm@vger.kernel.org" Return-path: Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:57376 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753050Ab0JMIL5 (ORCPT ); Wed, 13 Oct 2010 04:11:57 -0400 Received: from m5.gw.fujitsu.co.jp ([10.0.50.75]) by fgwmail7.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o9D8BuLZ021990 for (envelope-from seto.hidetoshi@jp.fujitsu.com); Wed, 13 Oct 2010 17:11:56 +0900 Received: from smail (m5 [127.0.0.1]) by outgoing.m5.gw.fujitsu.co.jp (Postfix) with ESMTP id 4BBCB45DE4F for ; Wed, 13 Oct 2010 17:11:56 +0900 (JST) Received: from s5.gw.fujitsu.co.jp (s5.gw.fujitsu.co.jp [10.0.50.95]) by m5.gw.fujitsu.co.jp (Postfix) with ESMTP id 2A44D45DE4E for ; Wed, 13 Oct 2010 17:11:56 +0900 (JST) Received: from s5.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s5.gw.fujitsu.co.jp (Postfix) with ESMTP id 161861DB803F for ; Wed, 13 Oct 2010 17:11:56 +0900 (JST) Received: from m108.s.css.fujitsu.com (m108.s.css.fujitsu.com [10.249.87.108]) by s5.gw.fujitsu.co.jp (Postfix) with ESMTP id C8D201DB8038 for ; Wed, 13 Oct 2010 17:11:52 +0900 (JST) Sender: kvm-owner@vger.kernel.org List-ID: Here we already have: AssignedDevRegion *region = &r_dev->v_addrs[region_num]; Signed-off-by: Hidetoshi Seto --- hw/device-assignment.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 26cb797..975bf29 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -324,18 +324,12 @@ static void assigned_dev_ioport_map(PCIDevice *pci_dev, int region_num, kvm_ioperm(env, data); } - register_ioport_read(addr, size, 1, assigned_dev_ioport_readb, - (r_dev->v_addrs + region_num)); - register_ioport_read(addr, size, 2, assigned_dev_ioport_readw, - (r_dev->v_addrs + region_num)); - register_ioport_read(addr, size, 4, assigned_dev_ioport_readl, - (r_dev->v_addrs + region_num)); - register_ioport_write(addr, size, 1, assigned_dev_ioport_writeb, - (r_dev->v_addrs + region_num)); - register_ioport_write(addr, size, 2, assigned_dev_ioport_writew, - (r_dev->v_addrs + region_num)); - register_ioport_write(addr, size, 4, assigned_dev_ioport_writel, - (r_dev->v_addrs + region_num)); + register_ioport_read(addr, size, 1, assigned_dev_ioport_readb, region); + register_ioport_read(addr, size, 2, assigned_dev_ioport_readw, region); + register_ioport_read(addr, size, 4, assigned_dev_ioport_readl, region); + register_ioport_write(addr, size, 1, assigned_dev_ioport_writeb, region); + register_ioport_write(addr, size, 2, assigned_dev_ioport_writew, region); + register_ioport_write(addr, size, 4, assigned_dev_ioport_writel, region); } static uint32_t assigned_dev_pci_read(PCIDevice *d, int pos, int len) -- 1.7.3.1