[Xen-devel] [PATCH 23 of 45] gcc-4.6 compile fix: xen/drivers/passthrough/vtd/intremap.c

[Olaf Hering <olaf@xxxxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1305824408 -7200
# Node ID 452ca03a71814742f94213554399f6cfbf350046
# Parent  0f8146a56c8e2349f7fbc091e843f72974643106
gcc-4.6 compile fix: xen/drivers/passthrough/vtd/intremap.c

intremap.c: In function 'io_apic_read_remap_rte':
intremap.c:370:39: error: variable 'remap_rte' set but not used 
[-Werror=unused-but-set-variable]
intremap.c: In function 'iommu_enable_x2apic_IR':
intremap.c:853:25: error: variable 'qi_ctrl' set but not used 
[-Werror=unused-but-set-variable]

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>

diff -r 0f8146a56c8e -r 452ca03a7181 xen/drivers/passthrough/vtd/intremap.c
--- a/xen/drivers/passthrough/vtd/intremap.c    Thu May 19 19:00:06 2011 +0200
+++ b/xen/drivers/passthrough/vtd/intremap.c    Thu May 19 19:00:08 2011 +0200
@@ -367,7 +367,6 @@ unsigned int io_apic_read_remap_rte(
     unsigned int ioapic_pin = (reg - 0x10) / 2;
     int index;
     struct IO_xAPIC_route_entry old_rte = { 0 };
-    struct IO_APIC_route_remap_entry *remap_rte;
     int rte_upper = (reg & 1) ? 1 : 0;
     struct iommu *iommu = ioapic_to_iommu(IO_APIC_ID(apic));
     struct ir_ctrl *ir_ctrl = iommu_ir_ctrl(iommu);
@@ -389,8 +388,6 @@ unsigned int io_apic_read_remap_rte(
     *IO_APIC_BASE(apic) = reg + 1;
     *(((u32 *)&old_rte) + 1) = *(IO_APIC_BASE(apic)+4);
 
-    remap_rte = (struct IO_APIC_route_remap_entry *) &old_rte;
-
     if ( remap_entry_to_ioapic_rte(iommu, index, &old_rte) )
     {
         *IO_APIC_BASE(apic) = rte_upper ? (reg + 1) : reg;
@@ -850,10 +847,7 @@ int iommu_enable_x2apic_IR(void)
 
     for_each_drhd_unit ( drhd )
     {
-        struct qi_ctrl *qi_ctrl = NULL;
-
         iommu = drhd->iommu;
-        qi_ctrl = iommu_qi_ctrl(iommu);
 
         /* Clear previous faults */
         clear_fault_bits(iommu);

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