From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L7ubn-0005eU-I6 for qemu-devel@nongnu.org; Wed, 03 Dec 2008 11:29:51 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L7ubm-0005eI-5V for qemu-devel@nongnu.org; Wed, 03 Dec 2008 11:29:50 -0500 Received: from [199.232.76.173] (port=37052 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L7ubl-0005eF-W3 for qemu-devel@nongnu.org; Wed, 03 Dec 2008 11:29:50 -0500 Received: from savannah.gnu.org ([199.232.41.3]:56276 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L7ubl-0008N1-N2 for qemu-devel@nongnu.org; Wed, 03 Dec 2008 11:29:49 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L7ubk-0004UV-PJ for qemu-devel@nongnu.org; Wed, 03 Dec 2008 16:29:48 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L7ubk-0004UP-CV for qemu-devel@nongnu.org; Wed, 03 Dec 2008 16:29:48 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Wed, 03 Dec 2008 16:29:48 +0000 Subject: [Qemu-devel] [5863] More consistent PAGE_xxx defines, avoid conflicting with system PAGE_xxx Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5863 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5863 Author: blueswir1 Date: 2008-12-03 16:29:47 +0000 (Wed, 03 Dec 2008) Log Message: ----------- More consistent PAGE_xxx defines, avoid conflicting with system PAGE_xxx Modified Paths: -------------- trunk/hw/iommu.c Modified: trunk/hw/iommu.c =================================================================== --- trunk/hw/iommu.c 2008-12-02 23:53:50 UTC (rev 5862) +++ trunk/hw/iommu.c 2008-12-03 16:29:47 UTC (rev 5863) @@ -109,9 +109,9 @@ #define IOPTE_VALID 0x00000002 /* IOPTE is valid */ #define IOPTE_WAZ 0x00000001 /* Write as zeros */ -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1 << PAGE_SHIFT) -#define PAGE_MASK (PAGE_SIZE - 1) +#define IOMMU_PAGE_SHIFT 12 +#define IOMMU_PAGE_SIZE (1 << IOMMU_PAGE_SHIFT) +#define IOMMU_PAGE_MASK ~(IOMMU_PAGE_SIZE - 1) typedef struct IOMMUState { uint32_t regs[IOMMU_NREGS]; @@ -242,7 +242,7 @@ iopte = s->regs[IOMMU_BASE] << 4; addr &= ~s->iostart; - iopte += (addr >> (PAGE_SHIFT - 2)) & ~3; + iopte += (addr >> (IOMMU_PAGE_SHIFT - 2)) & ~3; cpu_physical_memory_read(iopte, (uint8_t *)&ret, 4); tswap32s(&ret); DPRINTF("get flags addr " TARGET_FMT_plx " => pte " TARGET_FMT_plx @@ -258,7 +258,7 @@ target_phys_addr_t pa; tmppte = pte; - pa = ((pte & IOPTE_PAGE) << 4) + (addr & PAGE_MASK); + pa = ((pte & IOPTE_PAGE) << 4) + (addr & ~IOMMU_PAGE_MASK); DPRINTF("xlate dva " TARGET_FMT_plx " => pa " TARGET_FMT_plx " (iopte = %x)\n", addr, pa, tmppte); @@ -285,8 +285,8 @@ target_phys_addr_t page, phys_addr; while (len > 0) { - page = addr & TARGET_PAGE_MASK; - l = (page + TARGET_PAGE_SIZE) - addr; + page = addr & IOMMU_PAGE_MASK; + l = (page + IOMMU_PAGE_SIZE) - addr; if (l > len) l = len; flags = iommu_page_get_flags(opaque, page);