diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml index cc446a4396..ef2cfcc496 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml @@ -306,7 +306,6 @@ components: vhost_socket: vhost_socket vhost_user: false direct: false - wce: true poll_queue: true id: id - path: path @@ -317,7 +316,6 @@ components: vhost_socket: vhost_socket vhost_user: false direct: false - wce: true poll_queue: true id: id cpus: @@ -336,23 +334,23 @@ components: iommu: false src: /dev/urandom fs: - - sock: sock - num_queues: 3 + - num_queues: 3 queue_size: 2 cache_size: 4 dax: true tag: tag + socket: socket id: id - - sock: sock - num_queues: 3 + - num_queues: 3 queue_size: 2 cache_size: 4 dax: true tag: tag + socket: socket id: id vsock: - sock: sock iommu: false + socket: socket id: id cid: 3 pmem: @@ -436,7 +434,6 @@ components: vhost_socket: vhost_socket vhost_user: false direct: false - wce: true poll_queue: true id: id - path: path @@ -447,7 +444,6 @@ components: vhost_socket: vhost_socket vhost_user: false direct: false - wce: true poll_queue: true id: id cpus: @@ -466,23 +462,23 @@ components: iommu: false src: /dev/urandom fs: - - sock: sock - num_queues: 3 + - num_queues: 3 queue_size: 2 cache_size: 4 dax: true tag: tag + socket: socket id: id - - sock: sock - num_queues: 3 + - num_queues: 3 queue_size: 2 cache_size: 4 dax: true tag: tag + socket: socket id: id vsock: - sock: sock iommu: false + socket: socket id: id cid: 3 pmem: @@ -662,7 +658,6 @@ components: vhost_socket: vhost_socket vhost_user: false direct: false - wce: true poll_queue: true id: id properties: @@ -688,9 +683,6 @@ components: type: boolean vhost_socket: type: string - wce: - default: true - type: boolean poll_queue: default: true type: boolean @@ -756,17 +748,17 @@ components: type: object FsConfig: example: - sock: sock num_queues: 3 queue_size: 2 cache_size: 4 dax: true tag: tag + socket: socket id: id properties: tag: type: string - sock: + socket: type: string num_queues: default: 1 @@ -783,7 +775,7 @@ components: id: type: string required: - - sock + - socket - tag type: object PmemConfig: @@ -853,8 +845,8 @@ components: type: object VsockConfig: example: - sock: sock iommu: false + socket: socket id: id cid: 3 properties: @@ -863,7 +855,7 @@ components: format: int64 minimum: 3 type: integer - sock: + socket: description: Path to UNIX domain socket, used to proxy vsock connections. type: string iommu: @@ -873,7 +865,7 @@ components: type: string required: - cid - - sock + - socket type: object VmResize: example: diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DiskConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DiskConfig.md index 24698161db..09f8e7b5c3 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DiskConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DiskConfig.md @@ -12,7 +12,6 @@ Name | Type | Description | Notes **QueueSize** | **int32** | | [optional] [default to 128] **VhostUser** | **bool** | | [optional] [default to false] **VhostSocket** | **string** | | [optional] -**Wce** | **bool** | | [optional] [default to true] **PollQueue** | **bool** | | [optional] [default to true] **Id** | **string** | | [optional] diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md index df645302bb..cc1ad674b4 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Tag** | **string** | | -**Sock** | **string** | | +**Socket** | **string** | | **NumQueues** | **int32** | | [optional] [default to 1] **QueueSize** | **int32** | | [optional] [default to 1024] **Dax** | **bool** | | [optional] [default to true] diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VsockConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VsockConfig.md index 81ac68e3b4..c8715276d1 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VsockConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VsockConfig.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Cid** | **int64** | Guest Vsock CID | -**Sock** | **string** | Path to UNIX domain socket, used to proxy vsock connections. | +**Socket** | **string** | Path to UNIX domain socket, used to proxy vsock connections. | **Iommu** | **bool** | | [optional] [default to false] **Id** | **string** | | [optional] diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_disk_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_disk_config.go index 603b697fc9..24bf8c11e7 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_disk_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_disk_config.go @@ -18,7 +18,6 @@ type DiskConfig struct { QueueSize int32 `json:"queue_size,omitempty"` VhostUser bool `json:"vhost_user,omitempty"` VhostSocket string `json:"vhost_socket,omitempty"` - Wce bool `json:"wce,omitempty"` PollQueue bool `json:"poll_queue,omitempty"` Id string `json:"id,omitempty"` } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_fs_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_fs_config.go index 0744e0583d..568915feb0 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_fs_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_fs_config.go @@ -11,7 +11,7 @@ package openapi // FsConfig struct for FsConfig type FsConfig struct { Tag string `json:"tag"` - Sock string `json:"sock"` + Socket string `json:"socket"` NumQueues int32 `json:"num_queues,omitempty"` QueueSize int32 `json:"queue_size,omitempty"` Dax bool `json:"dax,omitempty"` diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vsock_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vsock_config.go index 34cf6119ee..2fed17461a 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vsock_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vsock_config.go @@ -13,7 +13,7 @@ type VsockConfig struct { // Guest Vsock CID Cid int64 `json:"cid"` // Path to UNIX domain socket, used to proxy vsock connections. - Sock string `json:"sock"` + Socket string `json:"socket"` Iommu bool `json:"iommu,omitempty"` Id string `json:"id,omitempty"` } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml index 3c677d927e..5c5edb2837 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml @@ -454,9 +454,6 @@ components: default: false vhost_socket: type: string - wce: - type: boolean - default: true poll_queue: type: boolean default: true @@ -509,12 +506,12 @@ components: FsConfig: required: - tag - - sock + - socket type: object properties: tag: type: string - sock: + socket: type: string num_queues: type: integer @@ -584,7 +581,7 @@ components: VsockConfig: required: - cid - - sock + - socket type: object properties: cid: @@ -592,7 +589,7 @@ components: format: int64 minimum: 3 description: Guest Vsock CID - sock: + socket: type: string description: Path to UNIX domain socket, used to proxy vsock connections. iommu: diff --git a/versions.yaml b/versions.yaml index df43811e94..15c964088a 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.7.0" + version: "v0.8.0" firecracker: description: "Firecracker micro-VMM"