WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH] Fix non-debug build after c/s 23767:80e9fcdaef36

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH] Fix non-debug build after c/s 23767:80e9fcdaef36
From: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
Date: Mon, 22 Aug 2011 14:23:01 +0100
Cc: george.dunlap@xxxxxxxxxxxxx
Delivery-date: Mon, 22 Aug 2011 06:28:11 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.4.3
The hd variable in iommu_update_pde_count() and iommu_merge_pages() is
only used in the ASSERT, causing gcc to complain about the variable being
unused in non-debug builds.

Only define the variable for debug builds.

Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>

diff -r 2029263c501c -r ac4de6b4c457 xen/drivers/passthrough/amd/iommu_map.c
--- a/xen/drivers/passthrough/amd/iommu_map.c   Mon Aug 22 10:12:36 2011 +0100
+++ b/xen/drivers/passthrough/amd/iommu_map.c   Mon Aug 22 12:54:42 2011 +0100
@@ -462,7 +462,9 @@ static int iommu_update_pde_count(struct
     unsigned long first_mfn;
     u64 *table, *pde, *ntable;
     u64 ntable_maddr, mask;
+#ifndef NDEBUG
     struct hvm_iommu *hd = domain_hvm_iommu(d);
+#endif
     bool_t ok = 0;
 
     ASSERT( spin_is_locked(&hd->mapping_lock) && pt_mfn );
@@ -517,7 +519,9 @@ static int iommu_merge_pages(struct doma
     u64 *table, *pde, *ntable;
     u64 ntable_mfn;
     unsigned long first_mfn;
+#ifndef NDEBUG
     struct hvm_iommu *hd = domain_hvm_iommu(d);
+#endif
 
     ASSERT( spin_is_locked(&hd->mapping_lock) && pt_mfn );
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel