From e9c21c1a9086cac18e5a1511bf75e6ac0c86add4 Mon Sep 17 00:00:00 2001
From: Aditya R <arajan@redhat.com>
Date: Fri, 26 Aug 2022 12:42:16 +0530
Subject: [PATCH 1/3] rust,runtime: rename GidMapping,UidMapping to
 Linux{Uid/Gid}Mapping

Signed-off-by: Aditya R <arajan@redhat.com>
---
 src/runtime/mod.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/runtime/mod.rs b/src/runtime/mod.rs
index ea2a6ffd..e5639593 100644
--- a/src/runtime/mod.rs
+++ b/src/runtime/mod.rs
@@ -183,7 +183,7 @@ pub struct Linux {
     pub devices: Option<Vec<LinuxDevice>>,
 
     #[serde(rename = "gidMappings")]
-    pub gid_mappings: Option<Vec<GidMapping>>,
+    pub gid_mappings: Option<Vec<LinuxGidMapping>>,
 
     #[serde(rename = "intelRdt")]
     pub intel_rdt: Option<IntelRdt>,
@@ -216,7 +216,7 @@ pub struct Linux {
     pub sysctl: Option<HashMap<String, Option<serde_json::Value>>>,
 
     #[serde(rename = "uidMappings")]
-    pub uid_mappings: Option<Vec<UidMapping>>,
+    pub uid_mappings: Option<Vec<LinuxUidMapping>>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -248,7 +248,7 @@ pub struct LinuxDevice {
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct GidMapping {
+pub struct LinuxGidMapping {
     #[serde(rename = "containerID")]
     pub container_id: i64,
 
@@ -590,7 +590,7 @@ pub struct Arg {
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct UidMapping {
+pub struct LinuxUidMapping {
     #[serde(rename = "containerID")]
     pub container_id: i64,
 

From ac69f5ae65acdf8dc8ad3f3d0dad0d6de7553d15 Mon Sep 17 00:00:00 2001
From: Aditya R <arajan@redhat.com>
Date: Fri, 26 Aug 2022 12:47:24 +0530
Subject: [PATCH 2/3] rust,runtime: add idle type to CPU

See: https://github.com/opencontainers/runtime-spec/pull/1136

Signed-off-by: Aditya R <arajan@redhat.com>
---
 src/runtime/mod.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/runtime/mod.rs b/src/runtime/mod.rs
index e5639593..0e58ef5e 100644
--- a/src/runtime/mod.rs
+++ b/src/runtime/mod.rs
@@ -427,6 +427,9 @@ pub struct PurpleCpu {
     #[serde(rename = "cpus")]
     pub cpus: Option<String>,
 
+    #[serde(rename = "idle")]
+    pub idle: Option<i64>,
+
     #[serde(rename = "mems")]
     pub mems: Option<String>,
 

From d59cc930d6330f9c2c93282e23f16707202e0a2c Mon Sep 17 00:00:00 2001
From: Aditya R <arajan@redhat.com>
Date: Fri, 26 Aug 2022 12:49:01 +0530
Subject: [PATCH 3/3] rust,runtime: add MountUidMapping and MountGidMapping

Add IDMapping for mount points see https://github.com/opencontainers/runtime-spec/pull/1143

Signed-off-by: Aditya R <arajan@redhat.com>
---
 src/runtime/mod.rs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/runtime/mod.rs b/src/runtime/mod.rs
index 0e58ef5e..f5c9d39a 100644
--- a/src/runtime/mod.rs
+++ b/src/runtime/mod.rs
@@ -609,6 +609,9 @@ pub struct Mount {
     #[serde(rename = "destination")]
     pub destination: String,
 
+    #[serde(rename = "gidMappings")]
+    pub gid_mappings: Option<Vec<MountGidMapping>>,
+
     #[serde(rename = "options")]
     pub options: Option<Vec<String>>,
 
@@ -617,6 +620,33 @@ pub struct Mount {
 
     #[serde(rename = "type")]
     pub mount_type: Option<String>,
+
+    #[serde(rename = "uidMappings")]
+    pub uid_mappings: Option<Vec<MountUidMapping>>,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct MountGidMapping {
+    #[serde(rename = "containerID")]
+    pub container_id: i64,
+
+    #[serde(rename = "hostID")]
+    pub host_id: i64,
+
+    #[serde(rename = "size")]
+    pub size: i64,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct MountUidMapping {
+    #[serde(rename = "containerID")]
+    pub container_id: i64,
+
+    #[serde(rename = "hostID")]
+    pub host_id: i64,
+
+    #[serde(rename = "size")]
+    pub size: i64,
 }
 
 #[derive(Serialize, Deserialize)]