From 49bd162500b2e35cb5160e071c2be66a237134aa Mon Sep 17 00:00:00 2001 From: Bo Chen Date: Wed, 30 Sep 2020 11:38:32 -0700 Subject: [PATCH] versions: cloud-hypervisor: Bump to version 6d30fe05 The cloud-hypervisor commit `6d30fe05` introduced a fix on its API for VFIO device hotplug (`VmAddDevice`), which is required for supporting VFIO unplug through openAPI calls in kata. Signed-off-by: Bo Chen --- versions.yaml | 2 +- .../cloud-hypervisor/client/api/openapi.yaml | 23 ++++++++++++------- .../cloud-hypervisor/client/api_default.go | 6 ++--- .../client/docs/DefaultApi.md | 4 ++-- .../client/docs/MemoryConfig.md | 2 +- .../client/docs/SgxEpcConfig.md | 2 +- .../client/docs/VmAddDevice.md | 2 ++ .../client/model_memory_config.go | 2 +- .../client/model_sgx_epc_config.go | 2 +- .../client/model_vm_add_device.go | 2 ++ .../cloud-hypervisor/cloud-hypervisor.yaml | 21 ++++++++++------- 11 files changed, 42 insertions(+), 26 deletions(-) diff --git a/versions.yaml b/versions.yaml index 3ec29e9b3b..13bfd51916 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: "v0.10.0" + version: "6d30fe05e4febd930d91bb36294f0219faf2254c" firecracker: description: "Firecracker micro-VMM" diff --git a/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml b/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml index e765d67b31..e775606d88 100644 --- a/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml +++ b/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml @@ -518,7 +518,7 @@ components: VmCounters: additionalProperties: additionalProperties: - format: uint64 + format: int64 type: integer type: object type: object @@ -828,7 +828,7 @@ components: default: false type: boolean host_numa_node: - format: uint32 + format: int32 type: integer hotplug_size: format: int64 @@ -896,7 +896,7 @@ components: default: false type: boolean balloon_size: - format: uint64 + format: int64 type: integer zones: items: @@ -1158,7 +1158,7 @@ components: size: 8 properties: size: - format: uint64 + format: int64 type: integer prefault: default: false @@ -1172,10 +1172,10 @@ components: destination: 3 properties: destination: - format: uint32 + format: int32 type: integer distance: - format: uint8 + format: int32 type: integer required: - destination @@ -1197,11 +1197,11 @@ components: guest_numa_id: 9 properties: guest_numa_id: - format: uint32 + format: int32 type: integer cpus: items: - format: uint8 + format: int32 type: integer type: array distances: @@ -1248,9 +1248,16 @@ components: VmAddDevice: example: path: path + iommu: false + id: id properties: path: type: string + iommu: + default: false + type: boolean + id: + type: string type: object VmRemoveDevice: example: diff --git a/virtcontainers/pkg/cloud-hypervisor/client/api_default.go b/virtcontainers/pkg/cloud-hypervisor/client/api_default.go index 16b57bad3c..216e03e55b 100644 --- a/virtcontainers/pkg/cloud-hypervisor/client/api_default.go +++ b/virtcontainers/pkg/cloud-hypervisor/client/api_default.go @@ -996,16 +996,16 @@ func (a *DefaultApiService) VmAddVsockPut(ctx _context.Context, vsockConfig Vsoc /* VmCountersGet Get counters from the VM * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). -@return map[string]map[string]int32 +@return map[string]map[string]int64 */ -func (a *DefaultApiService) VmCountersGet(ctx _context.Context) (map[string]map[string]int32, *_nethttp.Response, error) { +func (a *DefaultApiService) VmCountersGet(ctx _context.Context) (map[string]map[string]int64, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - localVarReturnValue map[string]map[string]int32 + localVarReturnValue map[string]map[string]int64 ) // create path and map variables diff --git a/virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md b/virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md index 7d4ed80355..e84fcf38af 100644 --- a/virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md +++ b/virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md @@ -451,7 +451,7 @@ No authorization required ## VmCountersGet -> map[string]map[string]int32 VmCountersGet(ctx, ) +> map[string]map[string]int64 VmCountersGet(ctx, ) Get counters from the VM @@ -461,7 +461,7 @@ This endpoint does not need any parameter. ### Return type -[**map[string]map[string]int32**](map.md) +[**map[string]map[string]int64**](map.md) ### Authorization diff --git a/virtcontainers/pkg/cloud-hypervisor/client/docs/MemoryConfig.md b/virtcontainers/pkg/cloud-hypervisor/client/docs/MemoryConfig.md index ccafc86a73..c8dee09c48 100644 --- a/virtcontainers/pkg/cloud-hypervisor/client/docs/MemoryConfig.md +++ b/virtcontainers/pkg/cloud-hypervisor/client/docs/MemoryConfig.md @@ -12,7 +12,7 @@ Name | Type | Description | Notes **Shared** | **bool** | | [optional] [default to false] **Hugepages** | **bool** | | [optional] [default to false] **Balloon** | **bool** | | [optional] [default to false] -**BalloonSize** | **int32** | | [optional] +**BalloonSize** | **int64** | | [optional] **Zones** | [**[]MemoryZoneConfig**](MemoryZoneConfig.md) | | [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/virtcontainers/pkg/cloud-hypervisor/client/docs/SgxEpcConfig.md b/virtcontainers/pkg/cloud-hypervisor/client/docs/SgxEpcConfig.md index 929c278c8f..ab045e03e3 100644 --- a/virtcontainers/pkg/cloud-hypervisor/client/docs/SgxEpcConfig.md +++ b/virtcontainers/pkg/cloud-hypervisor/client/docs/SgxEpcConfig.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Size** | **int32** | | +**Size** | **int64** | | **Prefault** | **bool** | | [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/virtcontainers/pkg/cloud-hypervisor/client/docs/VmAddDevice.md b/virtcontainers/pkg/cloud-hypervisor/client/docs/VmAddDevice.md index e281db1380..124ac3b5d6 100644 --- a/virtcontainers/pkg/cloud-hypervisor/client/docs/VmAddDevice.md +++ b/virtcontainers/pkg/cloud-hypervisor/client/docs/VmAddDevice.md @@ -5,6 +5,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Path** | **string** | | [optional] +**Iommu** | **bool** | | [optional] [default to false] +**Id** | **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/virtcontainers/pkg/cloud-hypervisor/client/model_memory_config.go b/virtcontainers/pkg/cloud-hypervisor/client/model_memory_config.go index b0ccbc0348..749080979d 100644 --- a/virtcontainers/pkg/cloud-hypervisor/client/model_memory_config.go +++ b/virtcontainers/pkg/cloud-hypervisor/client/model_memory_config.go @@ -18,6 +18,6 @@ type MemoryConfig struct { Shared bool `json:"shared,omitempty"` Hugepages bool `json:"hugepages,omitempty"` Balloon bool `json:"balloon,omitempty"` - BalloonSize int32 `json:"balloon_size,omitempty"` + BalloonSize int64 `json:"balloon_size,omitempty"` Zones []MemoryZoneConfig `json:"zones,omitempty"` } diff --git a/virtcontainers/pkg/cloud-hypervisor/client/model_sgx_epc_config.go b/virtcontainers/pkg/cloud-hypervisor/client/model_sgx_epc_config.go index 9af3428094..692122c387 100644 --- a/virtcontainers/pkg/cloud-hypervisor/client/model_sgx_epc_config.go +++ b/virtcontainers/pkg/cloud-hypervisor/client/model_sgx_epc_config.go @@ -10,6 +10,6 @@ package openapi // SgxEpcConfig struct for SgxEpcConfig type SgxEpcConfig struct { - Size int32 `json:"size"` + Size int64 `json:"size"` Prefault bool `json:"prefault,omitempty"` } diff --git a/virtcontainers/pkg/cloud-hypervisor/client/model_vm_add_device.go b/virtcontainers/pkg/cloud-hypervisor/client/model_vm_add_device.go index ee96b9b9cd..f644fa60a2 100644 --- a/virtcontainers/pkg/cloud-hypervisor/client/model_vm_add_device.go +++ b/virtcontainers/pkg/cloud-hypervisor/client/model_vm_add_device.go @@ -11,4 +11,6 @@ package openapi // VmAddDevice struct for VmAddDevice type VmAddDevice struct { Path string `json:"path,omitempty"` + Iommu bool `json:"iommu,omitempty"` + Id string `json:"id,omitempty"` } diff --git a/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml b/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml index 138378127a..240e02e27b 100644 --- a/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml +++ b/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml @@ -368,7 +368,7 @@ components: type: object additionalProperties: type: integer - format: uint64 + format: int64 PciDeviceInfo: required: @@ -492,7 +492,7 @@ components: default: false host_numa_node: type: integer - format: uint32 + format: int32 hotplug_size: type: integer format: int64 @@ -532,7 +532,7 @@ components: default: false balloon_size: type: integer - format: uint64 + format: int64 zones: type: array items: @@ -741,7 +741,7 @@ components: properties: size: type: integer - format: uint64 + format: int64 prefault: type: boolean default: false @@ -754,10 +754,10 @@ components: properties: destination: type: integer - format: uint32 + format: int32 distance: type: integer - format: uint8 + format: int32 NumaConfig: required: @@ -766,12 +766,12 @@ components: properties: guest_numa_id: type: integer - format: uint32 + format: int32 cpus: type: array items: type: integer - format: uint8 + format: int32 distances: type: array items: @@ -811,6 +811,11 @@ components: properties: path: type: string + iommu: + type: boolean + default: false + id: + type: string VmRemoveDevice: type: object