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

Commit

Permalink
versions: Move to cloud-hypervisor v0.7.0
Browse files Browse the repository at this point in the history 
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: #2658

Signed-off-by: Bo Chen <[email protected]>
  • Loading branch information
@likebreath @jcvenegas
likebreath authored and jcvenegas committed May 6, 2020
1 parent 34be9e0 commit fcc9e93
Show file tree
Hide file tree
Showing 18 changed files with 191 additions and 16 deletions.
2 changes: 1 addition & 1 deletion versions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions virtcontainers/pkg/cloud-hypervisor/client/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
62 changes: 51 additions & 11 deletions virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -293,6 +308,7 @@ components:
direct: false
wce: true
poll_queue: true
id: id
- path: path
num_queues: 5
readonly: false
Expand All @@ -303,6 +319,7 @@ components:
direct: false
wce: true
poll_queue: true
id: id
cpus:
boot_vcpus: 1
max_vcpus: 1
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -417,6 +438,7 @@ components:
direct: false
wce: true
poll_queue: true
id: id
- path: path
num_queues: 5
readonly: false
Expand All @@ -427,6 +449,7 @@ components:
direct: false
wce: true
poll_queue: true
id: id
cpus:
boot_vcpus: 1
max_vcpus: 1
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -639,6 +664,7 @@ components:
direct: false
wce: true
poll_queue: true
id: id
properties:
path:
type: string
Expand Down Expand Up @@ -668,6 +694,8 @@ components:
poll_queue:
default: true
type: boolean
id:
type: string
required:
- path
type: object
Expand All @@ -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:
Expand Down Expand Up @@ -708,6 +737,8 @@ components:
type: boolean
vhost_socket:
type: string
id:
type: string
type: object
RngConfig:
example:
Expand All @@ -731,6 +762,7 @@ components:
cache_size: 4
dax: true
tag: tag
id: id
properties:
tag:
type: string
Expand All @@ -748,6 +780,8 @@ components:
cache_size:
format: int64
type: integer
id:
type: string
required:
- sock
- tag
Expand All @@ -758,6 +792,7 @@ components:
file: file
size: 7
iommu: false
id: id
discard_writes: false
properties:
file:
Expand All @@ -774,6 +809,8 @@ components:
discard_writes:
default: false
type: boolean
id:
type: string
required:
- file
type: object
Expand Down Expand Up @@ -818,6 +855,7 @@ components:
example:
sock: sock
iommu: false
id: id
cid: 3
properties:
cid:
Expand All @@ -831,6 +869,8 @@ components:
iommu:
default: false
type: boolean
id:
type: string
required:
- cid
- sock
Expand Down
66 changes: 66 additions & 0 deletions virtcontainers/pkg/cloud-hypervisor/client/api_default.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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().
Expand Down
33 changes: 33 additions & 0 deletions virtcontainers/pkg/cloud-hypervisor/client/docs/DefaultApi.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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, )
Expand Down
1 change: 1 addition & 0 deletions virtcontainers/pkg/cloud-hypervisor/client/docs/DiskConfig.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading

0 comments on commit fcc9e93

Please sign in to comment.