[Xen-devel] [RFC PATCH v2 05/22] ARM: vITS: rename pending_irq->lpi_priority to priority

[Andre Przywara <andre.przywara@xxxxxxx>]

Since we will soon store a virtual IRQ's priority in struct pending_irq,
generalise the existing storage for an LPI's priority to cover all IRQs.
This just renames "lpi_priority" to "priority", but doesn't change
anything else yet.

Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
---
 xen/arch/arm/vgic-v3-its.c | 4 ++--
 xen/arch/arm/vgic-v3.c     | 2 +-
 xen/include/asm-arm/vgic.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c
index 9ef792f..66095d4 100644
--- a/xen/arch/arm/vgic-v3-its.c
+++ b/xen/arch/arm/vgic-v3-its.c
@@ -419,7 +419,7 @@ static int update_lpi_property(struct domain *d, struct 
pending_irq *p)
     if ( ret )
         return ret;
 
-    write_atomic(&p->lpi_priority, property & LPI_PROP_PRIO_MASK);
+    write_atomic(&p->priority, property & LPI_PROP_PRIO_MASK);
 
     if ( property & LPI_PROP_ENABLED )
         set_bit(GIC_IRQ_GUEST_ENABLED, &p->status);
@@ -445,7 +445,7 @@ static void update_lpi_vgic_status(struct vcpu *v, struct 
pending_irq *p)
     {
         if ( !list_empty(&p->inflight) &&
              !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) )
-            gic_raise_guest_irq(v, p->irq, p->lpi_priority);
+            gic_raise_guest_irq(v, p->irq, p->priority);
     }
     else
         gic_remove_from_lr_pending(v, p);
diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c
index 48c7682..ad9019e 100644
--- a/xen/arch/arm/vgic-v3.c
+++ b/xen/arch/arm/vgic-v3.c
@@ -1784,7 +1784,7 @@ static int vgic_v3_lpi_get_priority(struct domain *d, 
uint32_t vlpi)
 
     ASSERT(p);
 
-    return p->lpi_priority;
+    return p->priority;
 }
 
 static const struct vgic_ops v3_ops = {
diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h
index 0df4ac7..27b5e37 100644
--- a/xen/include/asm-arm/vgic.h
+++ b/xen/include/asm-arm/vgic.h
@@ -79,7 +79,7 @@ struct pending_irq
 #define GIC_INVALID_LR         (uint8_t)~0
     uint8_t lr;
     uint8_t cur_priority;       /* Holds the priority of an injected IRQ. */
-    uint8_t lpi_priority;       /* Caches the priority if this is an LPI. */
+    uint8_t priority;           /* Holds the priority for any new IRQ. */
     uint8_t lpi_vcpu_id;        /* The VCPU for an LPI. */
     /* inflight is used to append instances of pending_irq to
      * vgic.inflight_irqs */
-- 
2.9.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel