From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R346f-0001YL-Ud for qemu-devel@nongnu.org; Mon, 12 Sep 2011 06:51:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R346b-0006nQ-Sz for qemu-devel@nongnu.org; Mon, 12 Sep 2011 06:51:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33697) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R346b-0006lv-9y for qemu-devel@nongnu.org; Mon, 12 Sep 2011 06:51:13 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8CApCTI014571 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 12 Sep 2011 06:51:12 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p8CApAav023133 for ; Mon, 12 Sep 2011 06:51:12 -0400 From: Avi Kivity Date: Mon, 12 Sep 2011 13:50:57 +0300 Message-Id: <1315824666-4214-20-git-send-email-avi@redhat.com> In-Reply-To: <1315824666-4214-1-git-send-email-avi@redhat.com> References: <1315824666-4214-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PULL 19/28] pci: simplify memory region registration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The two code paths (for ADDRESS_SPACE_IO and ADDRESS_SPACE_MEM) are identical. Unify them. Signed-off-by: Avi Kivity --- hw/pci.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index d23fa74..a4d7761 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1048,17 +1048,8 @@ static void pci_update_mappings(PCIDevice *d) * Teach them such cases, such that filtered_size < size and * addr & (size - 1) != 0. */ - if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { - memory_region_add_subregion_overlap(r->address_space, - r->addr, - r->memory, - 1); - } else { - memory_region_add_subregion_overlap(r->address_space, - r->addr, - r->memory, - 1); - } + memory_region_add_subregion_overlap(r->address_space, + r->addr, r->memory, 1); } } } -- 1.7.6.1