@@ -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);
@@ -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 = {
@@ -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 */
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@arm.com> --- 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(-)