[Xen-changelog] [xen-unstable] arm: rename link to inflight

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
# Date 1331718422 0
# Node ID 48923471a385268217cc2116234945d0d3ab8efd
# Parent  64f5cd4aa2a273d4b84c382b8ef484eab7905631
arm: rename link to inflight

The link field in pending_irq has a confusing name so rename it to
inflight and comment its behaviour.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 64f5cd4aa2a2 -r 48923471a385 xen/arch/arm/gic.c
--- a/xen/arch/arm/gic.c        Tue Mar 13 17:30:50 2012 +0000
+++ b/xen/arch/arm/gic.c        Wed Mar 14 09:47:02 2012 +0000
@@ -481,8 +481,8 @@
                 GICC[GICC_DIR] = virq;
             }
             gic_inject_irq_stop();
-            list_del(&p->link);
-            INIT_LIST_HEAD(&p->link);
+            list_del(&p->inflight);
+            INIT_LIST_HEAD(&p->inflight);
             cpu_raise_softirq(current->processor, VGIC_SOFTIRQ);
             spin_unlock(&current->arch.vgic.lock);
         }
diff -r 64f5cd4aa2a2 -r 48923471a385 xen/arch/arm/vgic.c
--- a/xen/arch/arm/vgic.c       Tue Mar 13 17:30:50 2012 +0000
+++ b/xen/arch/arm/vgic.c       Wed Mar 14 09:47:02 2012 +0000
@@ -85,7 +85,7 @@
         xmalloc_array(struct pending_irq,
                 d->arch.vgic.nr_lines + (32 * d->max_vcpus));
     for (i=0; i<d->arch.vgic.nr_lines + (32 * d->max_vcpus); i++)
-        INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].link);
+        INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].inflight);
     for (i=0; i<DOMAIN_NR_RANKS(d); i++)
         spin_lock_init(&d->arch.vgic.shared_irqs[i].lock);
     return 0;
@@ -550,7 +550,7 @@
     struct pending_irq *iter, *n = irq_to_pending(v, irq);
 
     /* irq still pending */
-    if (!list_empty(&n->link))
+    if (!list_empty(&n->inflight))
         return;
 
     priority = byte_read(rank->ipriority[REG_RANK_INDEX(8, idx)], 0, byte);
@@ -565,16 +565,16 @@
     gic_set_guest_irq(irq, GICH_LR_PENDING, priority);
 
     spin_lock(&v->arch.vgic.lock);
-    list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, link )
+    list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight )
     {
         if ( iter->priority < priority )
         {
-            list_add_tail(&n->link, &iter->link);
+            list_add_tail(&n->inflight, &iter->inflight);
             spin_unlock(&v->arch.vgic.lock);
             return;
         }
     }
-    list_add(&n->link, &v->arch.vgic.inflight_irqs);
+    list_add(&n->inflight, &v->arch.vgic.inflight_irqs);
     spin_unlock(&v->arch.vgic.lock);
     /* we have a new higher priority irq, inject it into the guest */
     cpu_raise_softirq(v->processor, VGIC_SOFTIRQ);
diff -r 64f5cd4aa2a2 -r 48923471a385 xen/include/asm-arm/domain.h
--- a/xen/include/asm-arm/domain.h      Tue Mar 13 17:30:50 2012 +0000
+++ b/xen/include/asm-arm/domain.h      Wed Mar 14 09:47:02 2012 +0000
@@ -20,7 +20,9 @@
     int irq;
     struct irq_desc *desc; /* only set it the irq corresponds to a physical 
irq */
     uint8_t priority;
-    struct list_head link;
+    /* inflight is used to append instances of pending_irq to
+     * vgic.inflight_irqs */
+    struct list_head inflight;
 };
 
 struct arch_domain

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog