1 files changed, 8 insertions, 1 deletions

diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index ff04afd0d901..98c30168bce4 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -162,7 +162,11 @@ struct vgic_dist {
 
         /* Distributor and vcpu interface mapping in the guest */
         phys_addr_t             vgic_dist_base;
-        phys_addr_t             vgic_cpu_base;
+        /* GICv2 and GICv3 use different mapped register blocks */
+        union {
+                phys_addr_t             vgic_cpu_base;
+                phys_addr_t             vgic_redist_base;
+        };
 
         /* Distributor enabled */
         u32                     enabled;
@@ -224,6 +228,9 @@ struct vgic_dist {
          */
         struct vgic_bitmap      *irq_spi_target;
 
+        /* Target MPIDR for each IRQ (needed for GICv3 IROUTERn) only */
+        u32                     *irq_spi_mpidr;
+
         /* Bitmap indicating which CPU has something pending */
         unsigned long           *irq_pending_on_cpu;