Merge pull request #2888 from likebreath/1022/backport_clh_v19.0_seccomp

stable-2.2 | versions: Upgrade to Cloud Hypervisor v19.0
Jakob-Naucke · Oct 25, 2021 · 4443a98 · 4443a98
2 parents aa40324 + b794a39
commit 4443a98
Show file tree

Hide file tree

Showing 7 changed files with 155 additions and 1 deletion.
diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml
@@ -358,13 +358,15 @@ components:
             hugepages: false
             shared: false
             hugepage_size: 4
+            prefault: false
             mergeable: false
             size: 9
             hotplugged_size: 2
             zones:
             - hugepages: false
               shared: false
               hugepage_size: 1
+              prefault: false
               mergeable: false
               file: file
               size: 7
@@ -375,6 +377,7 @@ components:
             - hugepages: false
               shared: false
               hugepage_size: 1
+              prefault: false
               mergeable: false
               file: file
               size: 7
@@ -663,13 +666,15 @@ components:
           hugepages: false
           shared: false
           hugepage_size: 4
+          prefault: false
           mergeable: false
           size: 9
           hotplugged_size: 2
           zones:
           - hugepages: false
             shared: false
             hugepage_size: 1
+            prefault: false
             mergeable: false
             file: file
             size: 7
@@ -680,6 +685,7 @@ components:
           - hugepages: false
             shared: false
             hugepage_size: 1
+            prefault: false
             mergeable: false
             file: file
             size: 7
@@ -983,6 +989,7 @@ components:
         hugepages: false
         shared: false
         hugepage_size: 1
+        prefault: false
         mergeable: false
         file: file
         size: 7
@@ -1019,6 +1026,9 @@ components:
         hotplugged_size:
           format: int64
           type: integer
+        prefault:
+          default: false
+          type: boolean
       required:
       - id
       - size
@@ -1028,13 +1038,15 @@ components:
         hugepages: false
         shared: false
         hugepage_size: 4
+        prefault: false
         mergeable: false
         size: 9
         hotplugged_size: 2
         zones:
         - hugepages: false
           shared: false
           hugepage_size: 1
+          prefault: false
           mergeable: false
           file: file
           size: 7
@@ -1045,6 +1057,7 @@ components:
         - hugepages: false
           shared: false
           hugepage_size: 1
+          prefault: false
           mergeable: false
           file: file
           size: 7
@@ -1079,6 +1092,9 @@ components:
         hugepage_size:
           format: int64
           type: integer
+        prefault:
+          default: false
+          type: boolean
         zones:
           items:
             $ref: '#/components/schemas/MemoryZoneConfig'

diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/MemoryConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/MemoryConfig.md
@@ -12,6 +12,7 @@ Name | Type | Description | Notes
 **Shared** | Pointer to **bool** |  | [optional] [default to false]
 **Hugepages** | Pointer to **bool** |  | [optional] [default to false]
 **HugepageSize** | Pointer to **int64** |  | [optional] 
+**Prefault** | Pointer to **bool** |  | [optional] [default to false]
 **Zones** | Pointer to [**[]MemoryZoneConfig**](MemoryZoneConfig.md) |  | [optional] 
 
 ## Methods
@@ -228,6 +229,31 @@ SetHugepageSize sets HugepageSize field to given value.
 
 HasHugepageSize returns a boolean if a field has been set.
 
+### GetPrefault
+
+`func (o *MemoryConfig) GetPrefault() bool`
+
+GetPrefault returns the Prefault field if non-nil, zero value otherwise.
+
+### GetPrefaultOk
+
+`func (o *MemoryConfig) GetPrefaultOk() (*bool, bool)`
+
+GetPrefaultOk returns a tuple with the Prefault field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetPrefault
+
+`func (o *MemoryConfig) SetPrefault(v bool)`
+
+SetPrefault sets Prefault field to given value.
+
+### HasPrefault
+
+`func (o *MemoryConfig) HasPrefault() bool`
+
+HasPrefault returns a boolean if a field has been set.
+
 ### GetZones
 
 `func (o *MemoryConfig) GetZones() []MemoryZoneConfig`

diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/MemoryZoneConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/MemoryZoneConfig.md
@@ -14,6 +14,7 @@ Name | Type | Description | Notes
 **HostNumaNode** | Pointer to **int32** |  | [optional] 
 **HotplugSize** | Pointer to **int64** |  | [optional] 
 **HotpluggedSize** | Pointer to **int64** |  | [optional] 
+**Prefault** | Pointer to **bool** |  | [optional] [default to false]
 
 ## Methods
 
@@ -274,6 +275,31 @@ SetHotpluggedSize sets HotpluggedSize field to given value.
 
 HasHotpluggedSize returns a boolean if a field has been set.
 
+### GetPrefault
+
+`func (o *MemoryZoneConfig) GetPrefault() bool`
+
+GetPrefault returns the Prefault field if non-nil, zero value otherwise.
+
+### GetPrefaultOk
+
+`func (o *MemoryZoneConfig) GetPrefaultOk() (*bool, bool)`
+
+GetPrefaultOk returns a tuple with the Prefault field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetPrefault
+
+`func (o *MemoryZoneConfig) SetPrefault(v bool)`
+
+SetPrefault sets Prefault field to given value.
+
+### HasPrefault
+
+`func (o *MemoryZoneConfig) HasPrefault() bool`
+
+HasPrefault returns a boolean if a field has been set.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_memory_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_memory_config.go
diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_memory_zone_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_memory_zone_config.go
diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml
@@ -546,6 +546,9 @@ components:
         hotplugged_size:
           type: integer
           format: int64
+        prefault:
+          type: boolean
+          default: false
 
     MemoryConfig:
       required:
@@ -577,6 +580,9 @@ components:
         hugepage_size:
           type: integer
           format: int64
+        prefault:
+          type: boolean
+          default: false
         zones:
           type: array
           items:

diff --git a/versions.yaml b/versions.yaml
@@ -75,7 +75,7 @@ assets:
       url: "https://github.com/cloud-hypervisor/cloud-hypervisor"
       uscan-url: >-
         https://github.com/cloud-hypervisor/cloud-hypervisor/tags.*/v?(\d\S+)\.tar\.gz
-      version: "v18.0"
+      version: "v19.0"
 
     firecracker:
       description: "Firecracker micro-VMM"