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

clh: update CLH to stable/v0.5.x #2487

Merged
merged 2 commits into from Feb 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion versions.yaml
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: "v0.5.0"
version: "stable/v0.5.x"

firecracker:
description: "Firecracker micro-VMM"
Expand Down
4 changes: 3 additions & 1 deletion virtcontainers/clh.go
Expand Up @@ -120,6 +120,7 @@ var clhKernelParams = []Param{
{"no_timer_check", ""}, // do not check broken timer IRQ resources
{"noreplace-smp", ""}, // do not replace SMP instructions
{"agent.log_vport", fmt.Sprintf("%d", vSockLogsPort)}, // tell the agent where to send the logs
{"rootflags", "data=ordered,errors=remount-ro ro"}, // mount the root filesystem as readonly
}

var clhDebugKernelParams = []Param{
Expand Down Expand Up @@ -248,7 +249,8 @@ func (clh *cloudHypervisor) createSandbox(ctx context.Context, id string, networ
}

disk := chclient.DiskConfig{
Path: imagePath,
Path: imagePath,
Readonly: true,
}
clh.vmconfig.Disks = append(clh.vmconfig.Disks, disk)

Expand Down
@@ -1 +1 @@
4.2.3-SNAPSHOT
4.3.0-SNAPSHOT
31 changes: 31 additions & 0 deletions virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml
Expand Up @@ -156,12 +156,20 @@ components:
disks:
- path: path
num_queues: 5
readonly: false
iommu: false
queue_size: 5
vhost_socket: vhost_socket
vhost_user: false
wce: true
- path: path
num_queues: 5
readonly: false
iommu: false
queue_size: 5
vhost_socket: vhost_socket
vhost_user: false
wce: true
cpus:
boot_vcpus: 1
max_vcpus: 1
Expand Down Expand Up @@ -275,12 +283,20 @@ components:
disks:
- path: path
num_queues: 5
readonly: false
iommu: false
queue_size: 5
vhost_socket: vhost_socket
vhost_user: false
wce: true
- path: path
num_queues: 5
readonly: false
iommu: false
queue_size: 5
vhost_socket: vhost_socket
vhost_user: false
wce: true
cpus:
boot_vcpus: 1
max_vcpus: 1
Expand Down Expand Up @@ -477,11 +493,18 @@ components:
example:
path: path
num_queues: 5
readonly: false
iommu: false
queue_size: 5
vhost_socket: vhost_socket
vhost_user: false
wce: true
properties:
path:
type: string
readonly:
default: false
type: boolean
iommu:
default: false
type: boolean
Expand All @@ -491,6 +514,14 @@ components:
queue_size:
default: 128
type: integer
vhost_user:
default: false
type: boolean
vhost_socket:
type: string
wce:
default: true
type: boolean
required:
- path
type: object
Expand Down
Expand Up @@ -5,9 +5,13 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**Path** | **string** | |
**Readonly** | **bool** | | [optional] [default to false]
**Iommu** | **bool** | | [optional] [default to false]
**NumQueues** | **int32** | | [optional] [default to 1]
**QueueSize** | **int32** | | [optional] [default to 128]
**VhostUser** | **bool** | | [optional] [default to false]
**VhostSocket** | **string** | | [optional]
**Wce** | **bool** | | [optional] [default to true]

[[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
Expand Up @@ -11,7 +11,11 @@ package openapi
// DiskConfig struct for DiskConfig
type DiskConfig struct {
Path string `json:"path"`
Readonly bool `json:"readonly,omitempty"`
Iommu bool `json:"iommu,omitempty"`
NumQueues int32 `json:"num_queues,omitempty"`
QueueSize int32 `json:"queue_size,omitempty"`
VhostUser bool `json:"vhost_user,omitempty"`
VhostSocket string `json:"vhost_socket,omitempty"`
Wce bool `json:"wce,omitempty"`
}
11 changes: 11 additions & 0 deletions virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml
Expand Up @@ -274,6 +274,9 @@ components:
properties:
path:
type: string
readonly:
type: boolean
default: false
iommu:
type: boolean
default: false
Expand All @@ -283,6 +286,14 @@ components:
queue_size:
type: integer
default: 128
vhost_user:
type: boolean
default: false
vhost_socket:
type: string
wce:
type: boolean
default: true

NetConfig:
type: object
Expand Down