github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-27 07:48:55 +00:00
Code Issues Projects Releases Wiki Activity

versions: Move to cloud-hypervisor v0.7.0

Browse Source 
Changes:

96be8229 release: Release v0.7.0
5115ad6e vmm: config: Support on/off/true/false for all booleans
d5bfa2df vmm, vhost_user_block: Make parameter names match --disk
2f0bc06b vmm: Update default devices names as "internal"
aaba6e77 vmm: Add virtio-console to the list of Migratable devices
9ab4bb1a devices: serial: Expect an identifier upon device creation
06487131 vm-virtio: pci: Expect an identifier upon device creation
eeb7e10d vm-virtio: mmio: Expect an identifier upon device creation
9d84ef50 vmm: Make the virtio identifier mandatory
14350f5d devices: ioapic: Expect an identifier upon device creation
55687157 vm-virtio: iommu: Expect an identifier upon device creation
052eff1c vm-virtio: console: Expect an identifier upon device creation
354c2a4b vm-virtio: vhost-user-net: Expect an identifier upon device creation
46e0b3ff vm-virtio: vhost-user-blk: Expect an identifier upon device creation
bb7fa71f vm-virtio: vhost-user-fs: Expect an identifier upon device creation
ec5ff395 vm-virtio: vsock: Expect an identifier upon device creation
9b53044a vm-virtio: mem: Expect an identifier upon device creation
1592a929 vm-virtio: pmem: Expect an identifier upon device creation
2e91b738 vm-virtio: rng: Expect an identifier upon device creation
9eb7413f vm-virtio: net: Expect an identifier upon device creation
be946caf vm-virtio: blk: Expect an identifier upon device creation
ff9c8b84 vmm: Always generate the next device name
81831413 vmm: Add an identifier to the ioapic device
e4386c8b vmm: Add an identifier to the virtio-iommu device
75ddd2a2 vmm: Add an identifier to the --console device
eac350c4 vmm: Add an identifier to the virtio-mem device
6802ef54 vmm: Add an identifier to the --rng device
d71d52e9 vmm: Fix virtio-console creation with virtual IOMMU
b08fde59 vmm: Fix virtio-rng creation with virtual IOMMU
8031ac33 vmm: Fix virtio-vsock creation with virtual IOMMU
50134969 Jenkins: Run musl unit and integration tests on master branch
ce794f78 ci: Pass target triple to the test scripts
33b0e158 resources: Add musl tools and toolchain to the Dockerfile
ad9374bd dev_cli: Add --libc to the build and test commands
8cef3574 vmm: seccomp: Add fork, gettid and pipe2 syscalls to permitted list
ce7678f2 vmm: seccomp: Add tkill syscall to permitted list
12758d7f vmm: seccomp: Add epoll_pwait syscall to permitted list
86fcd19b build: Initial musl support
a5de4955 vmm: Only allow removal of specific types of virtio device
9ed880d7 vmm: Add an identifier to the --fs device
7e0ab6b5 vmm: Fix pmem device creation
3012975c tests: Enhance vsock integration test to support hotplug
6c2bca5f bin: ch-remote: Add support for adding vsock devices
8de7448d vmm: api: Add "add-vsock" API entry point
bf09a1e6 openapi: Add "id" field to VsockConfig
a76cf086 vmm: vm: Remove vsock device from config
99422324 vmm: vm: Add "add_vsock()"
1d61c476 vmm: device_manager: Add support for hotplugging virtio-vsock devices
f8501a3b vmm: config: Move --vsock syntax to VsockConfig
6e049e0d vmm: Add an identifier to the --vsock device
10348f73 vmm, main: Support only zero or one vsock devices
9d1f95a3 openapi: Add missing "id" field
30e2e515 build(deps): bump serde_json from 1.0.51 to 1.0.52
dd9d0d04 build(deps): bump micro_http from `0d87a94` to `c9ffb90`
cdc8493a build(deps): bump thiserror from 1.0.15 to 1.0.16

Fixes: kata-containers/runtime#2658
Signed-off-by: Bo Chen <chen.bo@intel.com>
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
Bo Chen 2020-05-26 00:37:27 -07:00 committed by Peng Tao
parent 54f12461db
commit 4887ce059c
18 changed files with 191 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/versions.yaml
View File

@ -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: "f5debc4bc001fb14dad0aee28fef102e6c263565"
version: "v0.7.0"
firecracker:
description: "Firecracker micro-VMM"

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/README.md
View File

@ -45,6 +45,7 @@ Class | Method | HTTP request | Description
*DefaultApi* | [**VmAddFsPut**](docs/DefaultApi.md#vmaddfsput) | **Put** /vm.add-fs | Add a new virtio-fs device to the VM
*DefaultApi* | [**VmAddNetPut**](docs/DefaultApi.md#vmaddnetput) | **Put** /vm.add-net | Add a new network device to the VM
*DefaultApi* | [**VmAddPmemPut**](docs/DefaultApi.md#vmaddpmemput) | **Put** /vm.add-pmem | Add a new pmem device to the VM
*DefaultApi* | [**VmAddVsockPut**](docs/DefaultApi.md#vmaddvsockput) | **Put** /vm.add-vsock | Add a new vsock device to the VM
*DefaultApi* | [**VmInfoGet**](docs/DefaultApi.md#vminfoget) | **Get** /vm.info | Returns general information about the cloud-hypervisor Virtual Machine (VM) instance.
*DefaultApi* | [**VmRemoveDevicePut**](docs/DefaultApi.md#vmremovedeviceput) | **Put** /vm.remove-device | Remove a device from the VM
*DefaultApi* | [**VmResizePut**](docs/DefaultApi.md#vmresizeput) | **Put** /vm.resize | Resize the VM

62
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml
View File

@ -218,6 +218,21 @@ paths:
"500":
description: The new device could not be added to the VM instance.
summary: Add a new network device to the VM
/vm.add-vsock:
put:
requestBody:
content:
application/json:
schema:
$ref: '#/components/schemas/VsockConfig'
description: The details of the new vsock device
required: true
responses:
"204":
description: The new device was successfully added to the VM instance.
"500":
description: The new device could not be added to the VM instance.
summary: Add a new vsock device to the VM
/vm.snapshot:
put:
requestBody:
@ -293,6 +308,7 @@ components:
direct: false
wce: true
poll_queue: true
id: id
- path: path
num_queues: 5
readonly: false
@ -303,6 +319,7 @@ components:
direct: false
wce: true
poll_queue: true
id: id
cpus:
boot_vcpus: 1
max_vcpus: 1
@ -325,29 +342,31 @@ components:
cache_size: 4
dax: true
tag: tag
id: id
- sock: sock
num_queues: 3
queue_size: 2
cache_size: 4
dax: true
tag: tag
id: id
vsock:
- sock: sock
iommu: false
cid: 3
- sock: sock
sock: sock
iommu: false
id: id
cid: 3
pmem:
- mergeable: false
file: file
size: 7
iommu: false
id: id
discard_writes: false
- mergeable: false
file: file
size: 7
iommu: false
id: id
discard_writes: false
cmdline:
args: args
@ -366,6 +385,7 @@ components:
vhost_socket: vhost_socket
vhost_user: false
ip: 192.168.249.1
id: id
mac: mac
mask: 255.255.255.0
- tap: tap
@ -375,6 +395,7 @@ components:
vhost_socket: vhost_socket
vhost_user: false
ip: 192.168.249.1
id: id
mac: mac
mask: 255.255.255.0
properties:
@ -417,6 +438,7 @@ components:
direct: false
wce: true
poll_queue: true
id: id
- path: path
num_queues: 5
readonly: false
@ -427,6 +449,7 @@ components:
direct: false
wce: true
poll_queue: true
id: id
cpus:
boot_vcpus: 1
max_vcpus: 1
@ -449,29 +472,31 @@ components:
cache_size: 4
dax: true
tag: tag
id: id
- sock: sock
num_queues: 3
queue_size: 2
cache_size: 4
dax: true
tag: tag
id: id
vsock:
- sock: sock
iommu: false
cid: 3
- sock: sock
sock: sock
iommu: false
id: id
cid: 3
pmem:
- mergeable: false
file: file
size: 7
iommu: false
id: id
discard_writes: false
- mergeable: false
file: file
size: 7
iommu: false
id: id
discard_writes: false
cmdline:
args: args
@ -490,6 +515,7 @@ components:
vhost_socket: vhost_socket
vhost_user: false
ip: 192.168.249.1
id: id
mac: mac
mask: 255.255.255.0
- tap: tap
@ -499,6 +525,7 @@ components:
vhost_socket: vhost_socket
vhost_user: false
ip: 192.168.249.1
id: id
mac: mac
mask: 255.255.255.0
properties:
@ -539,9 +566,7 @@ components:
$ref: '#/components/schemas/DeviceConfig'
type: array
vsock:
items:
$ref: '#/components/schemas/VsockConfig'
type: array
$ref: '#/components/schemas/VsockConfig'
iommu:
default: false
type: boolean
@ -639,6 +664,7 @@ components:
direct: false
wce: true
poll_queue: true
id: id
properties:
path:
type: string
@ -668,6 +694,8 @@ components:
poll_queue:
default: true
type: boolean
id:
type: string
required:
- path
type: object
@ -680,6 +708,7 @@ components:
vhost_socket: vhost_socket
vhost_user: false
ip: 192.168.249.1
id: id
mac: mac
mask: 255.255.255.0
properties:
@ -708,6 +737,8 @@ components:
type: boolean
vhost_socket:
type: string
id:
type: string
type: object
RngConfig:
example:
@ -731,6 +762,7 @@ components:
cache_size: 4
dax: true
tag: tag
id: id
properties:
tag:
type: string
@ -748,6 +780,8 @@ components:
cache_size:
format: int64
type: integer
id:
type: string
required:
- sock
- tag
@ -758,6 +792,7 @@ components:
file: file
size: 7
iommu: false
id: id
discard_writes: false
properties:
file:
@ -774,6 +809,8 @@ components:
discard_writes:
default: false
type: boolean
id:
type: string
required:
- file
type: object
@ -818,6 +855,7 @@ components:
example:
sock: sock
iommu: false
id: id
cid: 3
properties:
cid:
@ -831,6 +869,8 @@ components:
iommu:
default: false
type: boolean
id:
type: string
required:
- cid
- sock

66
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api_default.go
View File

@ -861,6 +861,72 @@ func (a *DefaultApiService) VmAddPmemPut(ctx _context.Context, pmemConfig PmemCo
return localVarHTTPResponse, nil
}
/*
VmAddVsockPut Add a new vsock device to the VM
* @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
* @param vsockConfig The details of the new vsock device
*/
func (a *DefaultApiService) VmAddVsockPut(ctx _context.Context, vsockConfig VsockConfig) (*_nethttp.Response, error) {
var (
localVarHTTPMethod = _nethttp.MethodPut
localVarPostBody interface{}
localVarFormFileName string
localVarFileName string
localVarFileBytes []byte
)
// create path and map variables
localVarPath := a.client.cfg.BasePath + "/vm.add-vsock"
localVarHeaderParams := make(map[string]string)
localVarQueryParams := _neturl.Values{}
localVarFormParams := _neturl.Values{}
// to determine the Content-Type header
localVarHTTPContentTypes := []string{"application/json"}
// set Content-Type header
localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes)
if localVarHTTPContentType != "" {
localVarHeaderParams["Content-Type"] = localVarHTTPContentType
}
// to determine the Accept header
localVarHTTPHeaderAccepts := []string{}
// set Accept header
localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts)
if localVarHTTPHeaderAccept != "" {
localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
}
// body params
localVarPostBody = &vsockConfig
r, err := a.client.prepareRequest(ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
if err != nil {
return nil, err
}
localVarHTTPResponse, err := a.client.callAPI(r)
if err != nil || localVarHTTPResponse == nil {
return localVarHTTPResponse, err
}
localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
if err != nil {
return localVarHTTPResponse, err
}
if localVarHTTPResponse.StatusCode >= 300 {
newErr := GenericOpenAPIError{
body: localVarBody,
error: localVarHTTPResponse.Status,
}
return localVarHTTPResponse, newErr
}
return localVarHTTPResponse, nil
}
/*
VmInfoGet Returns general information about the cloud-hypervisor Virtual Machine (VM) instance.
* @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().

33
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md
View File

@ -17,6 +17,7 @@ Method | HTTP request | Description
[**VmAddFsPut**](DefaultApi.md#VmAddFsPut) | **Put** /vm.add-fs | Add a new virtio-fs device to the VM
[**VmAddNetPut**](DefaultApi.md#VmAddNetPut) | **Put** /vm.add-net | Add a new network device to the VM
[**VmAddPmemPut**](DefaultApi.md#VmAddPmemPut) | **Put** /vm.add-pmem | Add a new pmem device to the VM
[**VmAddVsockPut**](DefaultApi.md#VmAddVsockPut) | **Put** /vm.add-vsock | Add a new vsock device to the VM
[**VmInfoGet**](DefaultApi.md#VmInfoGet) | **Get** /vm.info | Returns general information about the cloud-hypervisor Virtual Machine (VM) instance.
[**VmRemoveDevicePut**](DefaultApi.md#VmRemoveDevicePut) | **Put** /vm.remove-device | Remove a device from the VM
[**VmResizePut**](DefaultApi.md#VmResizePut) | **Put** /vm.resize | Resize the VM
@ -414,6 +415,38 @@ No authorization required
[[Back to README]](../README.md)
## VmAddVsockPut
> VmAddVsockPut(ctx, vsockConfig)
Add a new vsock device to the VM
### Required Parameters
Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc.
**vsockConfig** | [**VsockConfig**](VsockConfig.md)| The details of the new vsock device |
### Return type
(empty response body)
### Authorization
No authorization required
### HTTP request headers
- **Content-Type**: application/json
- **Accept**: Not defined
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints)
[[Back to Model list]](../README.md#documentation-for-models)
[[Back to README]](../README.md)
## VmInfoGet
> VmInfo VmInfoGet(ctx, )

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DiskConfig.md
View File

@ -14,6 +14,7 @@ Name | Type | Description | Notes
**VhostSocket** | **string** | | [optional]
**Wce** | **bool** | | [optional] [default to true]
**PollQueue** | **bool** | | [optional] [default to true]
**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)

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md
View File

@ -10,6 +10,7 @@ Name | Type | Description | Notes
**QueueSize** | **int32** | | [optional] [default to 1024]
**Dax** | **bool** | | [optional] [default to true]
**CacheSize** | **int64** | | [optional]
**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)

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/NetConfig.md
View File

@ -13,6 +13,7 @@ Name | Type | Description | Notes
**QueueSize** | **int32** | | [optional] [default to 256]
**VhostUser** | **bool** | | [optional] [default to false]
**VhostSocket** | **string** | | [optional]
**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)

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/PmemConfig.md
View File

@ -9,6 +9,7 @@ Name | Type | Description | Notes
**Iommu** | **bool** | | [optional] [default to false]
**Mergeable** | **bool** | | [optional] [default to false]
**DiscardWrites** | **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)

2
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VmConfig.md
View File

@ -17,7 +17,7 @@ Name | Type | Description | Notes
**Serial** | [**ConsoleConfig**](ConsoleConfig.md) | | [optional]
**Console** | [**ConsoleConfig**](ConsoleConfig.md) | | [optional]
**Devices** | [**[]DeviceConfig**](DeviceConfig.md) | | [optional]
**Vsock** | [**[]VsockConfig**](VsockConfig.md) | | [optional]
**Vsock** | [**VsockConfig**](VsockConfig.md) | | [optional]
**Iommu** | **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)

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VsockConfig.md
View File

@ -7,6 +7,7 @@ Name | Type | Description | Notes
**Cid** | **int64** | Guest Vsock CID |
**Sock** | **string** | Path to UNIX domain socket, used to proxy vsock connections. |
**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)

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_disk_config.go
View File

@ -20,4 +20,5 @@ type DiskConfig struct {
VhostSocket string `json:"vhost_socket,omitempty"`
Wce bool `json:"wce,omitempty"`
PollQueue bool `json:"poll_queue,omitempty"`
Id string `json:"id,omitempty"`
}

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_fs_config.go
View File

@ -16,4 +16,5 @@ type FsConfig struct {
QueueSize int32 `json:"queue_size,omitempty"`
Dax bool `json:"dax,omitempty"`
CacheSize int64 `json:"cache_size,omitempty"`
Id string `json:"id,omitempty"`
}

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_net_config.go
View File

@ -19,4 +19,5 @@ type NetConfig struct {
QueueSize int32 `json:"queue_size,omitempty"`
VhostUser bool `json:"vhost_user,omitempty"`
VhostSocket string `json:"vhost_socket,omitempty"`
Id string `json:"id,omitempty"`
}

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_pmem_config.go
View File

@ -15,4 +15,5 @@ type PmemConfig struct {
Iommu bool `json:"iommu,omitempty"`
Mergeable bool `json:"mergeable,omitempty"`
DiscardWrites bool `json:"discard_writes,omitempty"`
Id string `json:"id,omitempty"`
}

2
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_config.go
View File

@ -23,6 +23,6 @@ type VmConfig struct {
Serial ConsoleConfig `json:"serial,omitempty"`
Console ConsoleConfig `json:"console,omitempty"`
Devices []DeviceConfig `json:"devices,omitempty"`
Vsock []VsockConfig `json:"vsock,omitempty"`
Vsock VsockConfig `json:"vsock,omitempty"`
Iommu bool `json:"iommu,omitempty"`
}

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vsock_config.go
View File

@ -15,4 +15,5 @@ type VsockConfig struct {
// Path to UNIX domain socket, used to proxy vsock connections.
Sock string `json:"sock"`
Iommu bool `json:"iommu,omitempty"`
Id string `json:"id,omitempty"`
}

29
src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml
View File

@ -235,6 +235,23 @@ paths:
500:
description: The new device could not be added to the VM instance.
/vm.add-vsock:
put:
summary: Add a new vsock device to the VM
requestBody:
description: The details of the new vsock device
content:
application/json:
schema:
$ref: '#/components/schemas/VsockConfig'
required: true
responses:
204:
description: The new device was successfully added to the VM instance.
500:
description: The new device could not be added to the VM instance.
/vm.snapshot:
put:
summary: Returns a VM snapshot.
@ -337,8 +354,6 @@ components:
items:
$ref: '#/components/schemas/DeviceConfig'
vsock:
type: array
items:
$ref: '#/components/schemas/VsockConfig'
iommu:
type: boolean
@ -445,6 +460,8 @@ components:
poll_queue:
type: boolean
default: true
id:
type: string
NetConfig:
type: object
@ -474,6 +491,8 @@ components:
default: false
vhost_socket:
type: string
id:
type: string
RngConfig:
required:
@ -510,6 +529,8 @@ components:
type: integer
format: int64
default: 8589934592
id:
type: string
PmemConfig:
required:
@ -530,6 +551,8 @@ components:
discard_writes:
type: boolean
default: false
id:
type: string
ConsoleConfig:
required:
@ -575,6 +598,8 @@ components:
iommu:
type: boolean
default: false
id:
type: string
VmResize:
type: object