Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit 49bd162

Browse files
likebreathlikebreath
committed
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 <[email protected]>
1 parent 62b0d5e commit 49bd162

File tree

11 files changed

+42
-26
lines changed

11 files changed

+42
-26
lines changed

‎versions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ assets:
7575
url: "https://github.com/cloud-hypervisor/cloud-hypervisor"
7676
uscan-url: >-
7777
https://github.com/cloud-hypervisor/cloud-hypervisor/tags.*/v?(\d\S+)\.tar\.gz
78-
version: "v0.10.0"
78+
version: "6d30fe05e4febd930d91bb36294f0219faf2254c"
7979

8080
firecracker:
8181
description: "Firecracker micro-VMM"

‎virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ components:
518518
VmCounters:
519519
additionalProperties:
520520
additionalProperties:
521-
format: uint64
521+
format: int64
522522
type: integer
523523
type: object
524524
type: object
@@ -828,7 +828,7 @@ components:
828828
default: false
829829
type: boolean
830830
host_numa_node:
831-
format: uint32
831+
format: int32
832832
type: integer
833833
hotplug_size:
834834
format: int64
@@ -896,7 +896,7 @@ components:
896896
default: false
897897
type: boolean
898898
balloon_size:
899-
format: uint64
899+
format: int64
900900
type: integer
901901
zones:
902902
items:
@@ -1158,7 +1158,7 @@ components:
11581158
size: 8
11591159
properties:
11601160
size:
1161-
format: uint64
1161+
format: int64
11621162
type: integer
11631163
prefault:
11641164
default: false
@@ -1172,10 +1172,10 @@ components:
11721172
destination: 3
11731173
properties:
11741174
destination:
1175-
format: uint32
1175+
format: int32
11761176
type: integer
11771177
distance:
1178-
format: uint8
1178+
format: int32
11791179
type: integer
11801180
required:
11811181
- destination
@@ -1197,11 +1197,11 @@ components:
11971197
guest_numa_id: 9
11981198
properties:
11991199
guest_numa_id:
1200-
format: uint32
1200+
format: int32
12011201
type: integer
12021202
cpus:
12031203
items:
1204-
format: uint8
1204+
format: int32
12051205
type: integer
12061206
type: array
12071207
distances:
@@ -1248,9 +1248,16 @@ components:
12481248
VmAddDevice:
12491249
example:
12501250
path: path
1251+
iommu: false
1252+
id: id
12511253
properties:
12521254
path:
12531255
type: string
1256+
iommu:
1257+
default: false
1258+
type: boolean
1259+
id:
1260+
type: string
12541261
type: object
12551262
VmRemoveDevice:
12561263
example:

‎virtcontainers/pkg/cloud-hypervisor/client/api_default.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -996,16 +996,16 @@ func (a *DefaultApiService) VmAddVsockPut(ctx _context.Context, vsockConfig Vsoc
996996
/*
997997
VmCountersGet Get counters from the VM
998998
* @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
999-
@return map[string]map[string]int32
999+
@return map[string]map[string]int64
10001000
*/
1001-
func (a *DefaultApiService) VmCountersGet(ctx _context.Context) (map[string]map[string]int32, *_nethttp.Response, error) {
1001+
func (a *DefaultApiService) VmCountersGet(ctx _context.Context) (map[string]map[string]int64, *_nethttp.Response, error) {
10021002
var (
10031003
localVarHTTPMethod = _nethttp.MethodGet
10041004
localVarPostBody interface{}
10051005
localVarFormFileName string
10061006
localVarFileName string
10071007
localVarFileBytes []byte
1008-
localVarReturnValue map[string]map[string]int32
1008+
localVarReturnValue map[string]map[string]int64
10091009
)
10101010

10111011
// create path and map variables

‎virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ No authorization required
451451

452452
## VmCountersGet
453453

454-
> map[string]map[string]int32 VmCountersGet(ctx, )
454+
> map[string]map[string]int64 VmCountersGet(ctx, )
455455
456456
Get counters from the VM
457457

@@ -461,7 +461,7 @@ This endpoint does not need any parameter.
461461

462462
### Return type
463463

464-
[**map[string]map[string]int32**](map.md)
464+
[**map[string]map[string]int64**](map.md)
465465

466466
### Authorization
467467

‎virtcontainers/pkg/cloud-hypervisor/client/docs/MemoryConfig.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Name | Type | Description | Notes
1212
**Shared** | **bool** | | [optional] [default to false]
1313
**Hugepages** | **bool** | | [optional] [default to false]
1414
**Balloon** | **bool** | | [optional] [default to false]
15-
**BalloonSize** | **int32** | | [optional]
15+
**BalloonSize** | **int64** | | [optional]
1616
**Zones** | [**[]MemoryZoneConfig**](MemoryZoneConfig.md) | | [optional]
1717

1818
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

‎virtcontainers/pkg/cloud-hypervisor/client/docs/SgxEpcConfig.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
7-
**Size** | **int32** | |
7+
**Size** | **int64** | |
88
**Prefault** | **bool** | | [optional] [default to false]
99

1010
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

‎virtcontainers/pkg/cloud-hypervisor/client/docs/VmAddDevice.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
77
**Path** | **string** | | [optional]
8+
**Iommu** | **bool** | | [optional] [default to false]
9+
**Id** | **string** | | [optional]
810

911
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
1012

‎virtcontainers/pkg/cloud-hypervisor/client/model_memory_config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ type MemoryConfig struct {
1818
Shared bool `json:"shared,omitempty"`
1919
Hugepages bool `json:"hugepages,omitempty"`
2020
Balloon bool `json:"balloon,omitempty"`
21-
BalloonSize int32 `json:"balloon_size,omitempty"`
21+
BalloonSize int64 `json:"balloon_size,omitempty"`
2222
Zones []MemoryZoneConfig `json:"zones,omitempty"`
2323
}

‎virtcontainers/pkg/cloud-hypervisor/client/model_sgx_epc_config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
package openapi
1111
// SgxEpcConfig struct for SgxEpcConfig
1212
type SgxEpcConfig struct {
13-
Size int32 `json:"size"`
13+
Size int64 `json:"size"`
1414
Prefault bool `json:"prefault,omitempty"`
1515
}

‎virtcontainers/pkg/cloud-hypervisor/client/model_vm_add_device.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ package openapi
1111
// VmAddDevice struct for VmAddDevice
1212
type VmAddDevice struct {
1313
Path string `json:"path,omitempty"`
14+
Iommu bool `json:"iommu,omitempty"`
15+
Id string `json:"id,omitempty"`
1416
}

0 commit comments

Comments
 (0)