diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml index c64d8a9052..5f8daf0d6e 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml @@ -353,6 +353,7 @@ components: iommu: false balloon: size: 9 + deflate_on_oom: false memory: hugepages: false shared: false @@ -449,6 +450,9 @@ components: cpus: - 5 - 5 + sgx_epc_sections: + - sgx_epc_sections + - sgx_epc_sections memory_zones: - memory_zones - memory_zones @@ -461,6 +465,9 @@ components: cpus: - 5 - 5 + sgx_epc_sections: + - sgx_epc_sections + - sgx_epc_sections memory_zones: - memory_zones - memory_zones @@ -471,8 +478,10 @@ components: sgx_epc: - prefault: false size: 6 + id: id - prefault: false size: 6 + id: id fs: - num_queues: 6 queue_size: 3 @@ -649,6 +658,7 @@ components: iommu: false balloon: size: 9 + deflate_on_oom: false memory: hugepages: false shared: false @@ -745,6 +755,9 @@ components: cpus: - 5 - 5 + sgx_epc_sections: + - sgx_epc_sections + - sgx_epc_sections memory_zones: - memory_zones - memory_zones @@ -757,6 +770,9 @@ components: cpus: - 5 - 5 + sgx_epc_sections: + - sgx_epc_sections + - sgx_epc_sections memory_zones: - memory_zones - memory_zones @@ -767,8 +783,10 @@ components: sgx_epc: - prefault: false size: 6 + id: id - prefault: false size: 6 + id: id fs: - num_queues: 6 queue_size: 3 @@ -1283,10 +1301,16 @@ components: BalloonConfig: example: size: 9 + deflate_on_oom: false properties: size: format: int64 type: integer + deflate_on_oom: + default: false + description: Whether the balloon should deflate when the guest is under + memory pressure. + type: boolean required: - size type: object @@ -1420,7 +1444,10 @@ components: example: prefault: false size: 6 + id: id properties: + id: + type: string size: format: int64 type: integer @@ -1428,6 +1455,7 @@ components: default: false type: boolean required: + - id - size type: object NumaDistance: @@ -1455,6 +1483,9 @@ components: cpus: - 5 - 5 + sgx_epc_sections: + - sgx_epc_sections + - sgx_epc_sections memory_zones: - memory_zones - memory_zones @@ -1476,6 +1507,10 @@ components: items: type: string type: array + sgx_epc_sections: + items: + type: string + type: array required: - guest_numa_id type: object diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/BalloonConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/BalloonConfig.md index 40283241f6..41c300ace1 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/BalloonConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/BalloonConfig.md @@ -5,6 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Size** | **int64** | | +**DeflateOnOom** | **bool** | Whether the balloon should deflate when the guest is under memory pressure. | [optional] [default to false] [[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/docs/NumaConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/NumaConfig.md index 15bf88e2ca..9cd68210ce 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/NumaConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/NumaConfig.md @@ -8,6 +8,7 @@ Name | Type | Description | Notes **Cpus** | **[]int32** | | [optional] **Distances** | [**[]NumaDistance**](NumaDistance.md) | | [optional] **MemoryZones** | **[]string** | | [optional] +**SgxEpcSections** | **[]string** | | [optional] [[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/docs/SgxEpcConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/SgxEpcConfig.md index ab045e03e3..962bc11914 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/SgxEpcConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/SgxEpcConfig.md @@ -4,6 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**Id** | **string** | | **Size** | **int64** | | **Prefault** | **bool** | | [optional] [default to false] diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_balloon_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_balloon_config.go index 96de345d35..0465ad30a9 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_balloon_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_balloon_config.go @@ -12,4 +12,6 @@ package openapi // BalloonConfig struct for BalloonConfig type BalloonConfig struct { Size int64 `json:"size"` + // Whether the balloon should deflate when the guest is under memory pressure. + DeflateOnOom bool `json:"deflate_on_oom,omitempty"` } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_numa_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_numa_config.go index e4e247d629..2250fdaff4 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_numa_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_numa_config.go @@ -11,8 +11,9 @@ package openapi // NumaConfig struct for NumaConfig type NumaConfig struct { - GuestNumaId int32 `json:"guest_numa_id"` - Cpus []int32 `json:"cpus,omitempty"` - Distances []NumaDistance `json:"distances,omitempty"` - MemoryZones []string `json:"memory_zones,omitempty"` + GuestNumaId int32 `json:"guest_numa_id"` + Cpus []int32 `json:"cpus,omitempty"` + Distances []NumaDistance `json:"distances,omitempty"` + MemoryZones []string `json:"memory_zones,omitempty"` + SgxEpcSections []string `json:"sgx_epc_sections,omitempty"` } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_sgx_epc_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_sgx_epc_config.go index a0562558f9..aac7f3d45d 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_sgx_epc_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_sgx_epc_config.go @@ -11,6 +11,7 @@ package openapi // SgxEpcConfig struct for SgxEpcConfig type SgxEpcConfig struct { - Size int64 `json:"size"` - Prefault bool `json:"prefault,omitempty"` + Id string `json:"id"` + Size int64 `json:"size"` + Prefault bool `json:"prefault,omitempty"` } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml index 49ddf3fbf4..ffb02a32e5 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml @@ -745,6 +745,10 @@ components: size: type: integer format: int64 + deflate_on_oom: + type: boolean + default: false + description: Whether the balloon should deflate when the guest is under memory pressure. FsConfig: required: @@ -847,9 +851,12 @@ components: SgxEpcConfig: required: + - id - size type: object properties: + id: + type: string size: type: integer format: int64 @@ -891,6 +898,10 @@ components: type: array items: type: string + sgx_epc_sections: + type: array + items: + type: string VmResize: type: object diff --git a/versions.yaml b/versions.yaml index 4ef917d116..2bf1a0527e 100644 --- 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: "v16.0" + version: "v17.0" firecracker: description: "Firecracker micro-VMM"