Merge branch 'kvmarm-master/master' into HEAD

2017-06-15 09:35:15 +01:00
parent ebb127f2d6 33b5c38852
commit 6f2f10cabe
22 changed files with 280 additions and 104 deletions
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -202,7 +202,10 @@ struct vgic_dist {
 		/* either a GICv2 CPU interface */
 		gpa_t			vgic_cpu_base;
 		/* or a number of GICv3 redistributor regions */
-		gpa_t			vgic_redist_base;
+		struct {
+			gpa_t		vgic_redist_base;
+			gpa_t		vgic_redist_free_offset;
+		};
 	};

 	/* distributor enabled */