From 4756a04b2da34dd4aeca2acf895e9a6fd726eea0 Mon Sep 17 00:00:00 2001 From: Bo Chen Date: Thu, 2 Dec 2021 11:58:03 -0800 Subject: [PATCH] virtcontainers: clh: Re-generate the client code This patch re-generates the client code for Cloud Hypervisor v19.0. Note: The client code of cloud-hypervisor's (CLH) OpenAPI is automatically generated by openapi-generator [1-2]. [1] https://github.com/OpenAPITools/openapi-generator [2] https://github.com/kata-containers/kata-containers/blob/main/src/runtime/virtcontainers/pkg/cloud-hypervisor/README.md Signed-off-by: Bo Chen --- .../client/.openapi-generator/FILES | 2 + .../pkg/cloud-hypervisor/client/README.md | 1 + .../cloud-hypervisor/client/api/openapi.yaml | 351 +++++++++++------- .../client/docs/CpuAffinity.md | 82 ++++ .../client/docs/CpusConfig.md | 26 ++ .../client/docs/DeviceConfig.md | 26 ++ .../client/docs/DiskConfig.md | 26 ++ .../cloud-hypervisor/client/docs/FsConfig.md | 26 ++ .../cloud-hypervisor/client/docs/NetConfig.md | 26 ++ .../client/docs/PmemConfig.md | 26 ++ .../client/docs/VsockConfig.md | 26 ++ .../client/model_cpu_affinity.go | 149 ++++++++ .../client/model_cpus_config.go | 44 ++- .../client/model_device_config.go | 42 ++- .../client/model_disk_config.go | 36 ++ .../client/model_fs_config.go | 50 ++- .../client/model_net_config.go | 36 ++ .../client/model_pmem_config.go | 36 ++ .../client/model_vsock_config.go | 42 ++- .../cloud-hypervisor/cloud-hypervisor.yaml | 34 +- 20 files changed, 939 insertions(+), 148 deletions(-) create mode 100644 src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/CpuAffinity.md create mode 100644 src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cpu_affinity.go diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/.openapi-generator/FILES b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/.openapi-generator/FILES index 3685f73861..44ecb19dfb 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/.openapi-generator/FILES +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/.openapi-generator/FILES @@ -9,6 +9,7 @@ configuration.go docs/BalloonConfig.md docs/CmdLineConfig.md docs/ConsoleConfig.md +docs/CpuAffinity.md docs/CpuTopology.md docs/CpusConfig.md docs/DefaultApi.md @@ -45,6 +46,7 @@ go.sum model_balloon_config.go model_cmd_line_config.go model_console_config.go +model_cpu_affinity.go model_cpu_topology.go model_cpus_config.go model_device_config.go diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/README.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/README.md index 68d3004e03..ffc0caaee3 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/README.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/README.md @@ -108,6 +108,7 @@ Class | Method | HTTP request | Description - [BalloonConfig](docs/BalloonConfig.md) - [CmdLineConfig](docs/CmdLineConfig.md) - [ConsoleConfig](docs/ConsoleConfig.md) + - [CpuAffinity](docs/CpuAffinity.md) - [CpuTopology](docs/CpuTopology.md) - [CpusConfig](docs/CpusConfig.md) - [DeviceConfig](docs/DeviceConfig.md) 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 dcd0fb938c..fd963b0f4c 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml @@ -344,7 +344,7 @@ components: VmInfo: description: Virtual Machine information example: - memory_actual_size: 3 + memory_actual_size: 7 state: Created config: console: @@ -352,16 +352,16 @@ components: file: file iommu: false balloon: - size: 9 + size: 1 deflate_on_oom: false memory: hugepages: false shared: false - hugepage_size: 4 + hugepage_size: 1 prefault: false mergeable: false - size: 9 - hotplugged_size: 2 + size: 2 + hotplugged_size: 7 zones: - hugepages: false shared: false @@ -369,30 +369,31 @@ components: prefault: false mergeable: false file: file - size: 7 - hotplugged_size: 6 - host_numa_node: 1 + size: 1 + hotplugged_size: 1 + host_numa_node: 6 id: id - hotplug_size: 1 + hotplug_size: 7 - hugepages: false shared: false hugepage_size: 1 prefault: false mergeable: false file: file - size: 7 - hotplugged_size: 6 - host_numa_node: 1 + size: 1 + hotplugged_size: 1 + host_numa_node: 6 id: id - hotplug_size: 1 - hotplug_size: 3 + hotplug_size: 7 + hotplug_size: 4 hotplug_method: Acpi disks: - - path: path - num_queues: 7 + - pci_segment: 8 + path: path + num_queues: 4 readonly: false iommu: false - queue_size: 1 + queue_size: 5 vhost_socket: vhost_socket vhost_user: false direct: false @@ -407,11 +408,12 @@ components: one_time_burst: 0 refill_time: 0 id: id - - path: path - num_queues: 7 + - pci_segment: 8 + path: path + num_queues: 4 readonly: false iommu: false - queue_size: 1 + queue_size: 5 vhost_socket: vhost_socket vhost_user: false direct: false @@ -435,24 +437,35 @@ components: max_phys_bits: 7 boot_vcpus: 1 max_vcpus: 1 + affinity: + - vcpu: 9 + host_cpus: + - 3 + - 3 + - vcpu: 9 + host_cpus: + - 3 + - 3 devices: - - path: path + - pci_segment: 3 + path: path iommu: false id: id - - path: path + - pci_segment: 3 + path: path iommu: false id: id kernel: path: path numa: - distances: - - distance: 3 - destination: 6 - - distance: 3 - destination: 6 + - distance: 8 + destination: 4 + - distance: 8 + destination: 4 cpus: - - 5 - - 5 + - 0 + - 0 sgx_epc_sections: - sgx_epc_sections - sgx_epc_sections @@ -461,13 +474,13 @@ components: - memory_zones guest_numa_id: 6 - distances: - - distance: 3 - destination: 6 - - distance: 3 - destination: 6 + - distance: 8 + destination: 4 + - distance: 8 + destination: 4 cpus: - - 5 - - 5 + - 0 + - 0 sgx_epc_sections: - sgx_epc_sections - sgx_epc_sections @@ -480,41 +493,46 @@ components: src: /dev/urandom sgx_epc: - prefault: false - size: 6 + size: 7 id: id - prefault: false - size: 6 + size: 7 id: id fs: - - num_queues: 6 - queue_size: 3 + - pci_segment: 5 + num_queues: 2 + queue_size: 6 cache_size: 6 dax: true tag: tag socket: socket id: id - - num_queues: 6 - queue_size: 3 + - pci_segment: 5 + num_queues: 2 + queue_size: 6 cache_size: 6 dax: true tag: tag socket: socket id: id vsock: + pci_segment: 0 iommu: false socket: socket id: id cid: 3 pmem: - - mergeable: false + - pci_segment: 3 + mergeable: false file: file - size: 1 + size: 6 iommu: false id: id discard_writes: false - - mergeable: false + - pci_segment: 3 + mergeable: false file: file - size: 1 + size: 6 iommu: false id: id discard_writes: false @@ -543,14 +561,15 @@ components: one_time_burst: 0 refill_time: 0 mac: mac + pci_segment: 6 vhost_mode: Client iommu: false vhost_socket: vhost_socket vhost_user: false id: id fd: - - 8 - - 8 + - 3 + - 3 mask: 255.255.255.0 - tap: tap num_queues: 9 @@ -566,21 +585,22 @@ components: one_time_burst: 0 refill_time: 0 mac: mac + pci_segment: 6 vhost_mode: Client iommu: false vhost_socket: vhost_socket vhost_user: false id: id fd: - - 8 - - 8 + - 3 + - 3 mask: 255.255.255.0 device_tree: key: children: - children - children - pci_bdf: 7 + pci_bdf: 3 resources: - '{}' - '{}' @@ -611,7 +631,7 @@ components: children: - children - children - pci_bdf: 7 + pci_bdf: 3 resources: - '{}' - '{}' @@ -660,16 +680,16 @@ components: file: file iommu: false balloon: - size: 9 + size: 1 deflate_on_oom: false memory: hugepages: false shared: false - hugepage_size: 4 + hugepage_size: 1 prefault: false mergeable: false - size: 9 - hotplugged_size: 2 + size: 2 + hotplugged_size: 7 zones: - hugepages: false shared: false @@ -677,30 +697,31 @@ components: prefault: false mergeable: false file: file - size: 7 - hotplugged_size: 6 - host_numa_node: 1 + size: 1 + hotplugged_size: 1 + host_numa_node: 6 id: id - hotplug_size: 1 + hotplug_size: 7 - hugepages: false shared: false hugepage_size: 1 prefault: false mergeable: false file: file - size: 7 - hotplugged_size: 6 - host_numa_node: 1 + size: 1 + hotplugged_size: 1 + host_numa_node: 6 id: id - hotplug_size: 1 - hotplug_size: 3 + hotplug_size: 7 + hotplug_size: 4 hotplug_method: Acpi disks: - - path: path - num_queues: 7 + - pci_segment: 8 + path: path + num_queues: 4 readonly: false iommu: false - queue_size: 1 + queue_size: 5 vhost_socket: vhost_socket vhost_user: false direct: false @@ -715,11 +736,12 @@ components: one_time_burst: 0 refill_time: 0 id: id - - path: path - num_queues: 7 + - pci_segment: 8 + path: path + num_queues: 4 readonly: false iommu: false - queue_size: 1 + queue_size: 5 vhost_socket: vhost_socket vhost_user: false direct: false @@ -743,24 +765,35 @@ components: max_phys_bits: 7 boot_vcpus: 1 max_vcpus: 1 + affinity: + - vcpu: 9 + host_cpus: + - 3 + - 3 + - vcpu: 9 + host_cpus: + - 3 + - 3 devices: - - path: path + - pci_segment: 3 + path: path iommu: false id: id - - path: path + - pci_segment: 3 + path: path iommu: false id: id kernel: path: path numa: - distances: - - distance: 3 - destination: 6 - - distance: 3 - destination: 6 + - distance: 8 + destination: 4 + - distance: 8 + destination: 4 cpus: - - 5 - - 5 + - 0 + - 0 sgx_epc_sections: - sgx_epc_sections - sgx_epc_sections @@ -769,13 +802,13 @@ components: - memory_zones guest_numa_id: 6 - distances: - - distance: 3 - destination: 6 - - distance: 3 - destination: 6 + - distance: 8 + destination: 4 + - distance: 8 + destination: 4 cpus: - - 5 - - 5 + - 0 + - 0 sgx_epc_sections: - sgx_epc_sections - sgx_epc_sections @@ -788,41 +821,46 @@ components: src: /dev/urandom sgx_epc: - prefault: false - size: 6 + size: 7 id: id - prefault: false - size: 6 + size: 7 id: id fs: - - num_queues: 6 - queue_size: 3 + - pci_segment: 5 + num_queues: 2 + queue_size: 6 cache_size: 6 dax: true tag: tag socket: socket id: id - - num_queues: 6 - queue_size: 3 + - pci_segment: 5 + num_queues: 2 + queue_size: 6 cache_size: 6 dax: true tag: tag socket: socket id: id vsock: + pci_segment: 0 iommu: false socket: socket id: id cid: 3 pmem: - - mergeable: false + - pci_segment: 3 + mergeable: false file: file - size: 1 + size: 6 iommu: false id: id discard_writes: false - - mergeable: false + - pci_segment: 3 + mergeable: false file: file - size: 1 + size: 6 iommu: false id: id discard_writes: false @@ -851,14 +889,15 @@ components: one_time_burst: 0 refill_time: 0 mac: mac + pci_segment: 6 vhost_mode: Client iommu: false vhost_socket: vhost_socket vhost_user: false id: id fd: - - 8 - - 8 + - 3 + - 3 mask: 255.255.255.0 - tap: tap num_queues: 9 @@ -874,14 +913,15 @@ components: one_time_burst: 0 refill_time: 0 mac: mac + pci_segment: 6 vhost_mode: Client iommu: false vhost_socket: vhost_socket vhost_user: false id: id fd: - - 8 - - 8 + - 3 + - 3 mask: 255.255.255.0 properties: cpus: @@ -941,6 +981,20 @@ components: required: - kernel type: object + CpuAffinity: + example: + vcpu: 9 + host_cpus: + - 3 + - 3 + properties: + vcpu: + type: integer + host_cpus: + items: + type: integer + type: array + type: object CpuTopology: example: dies_per_package: 5 @@ -967,6 +1021,15 @@ components: max_phys_bits: 7 boot_vcpus: 1 max_vcpus: 1 + affinity: + - vcpu: 9 + host_cpus: + - 3 + - 3 + - vcpu: 9 + host_cpus: + - 3 + - 3 properties: boot_vcpus: default: 1 @@ -980,6 +1043,10 @@ components: $ref: '#/components/schemas/CpuTopology' max_phys_bits: type: integer + affinity: + items: + $ref: '#/components/schemas/CpuAffinity' + type: array required: - boot_vcpus - max_vcpus @@ -992,11 +1059,11 @@ components: prefault: false mergeable: false file: file - size: 7 - hotplugged_size: 6 - host_numa_node: 1 + size: 1 + hotplugged_size: 1 + host_numa_node: 6 id: id - hotplug_size: 1 + hotplug_size: 7 properties: id: type: string @@ -1037,11 +1104,11 @@ components: example: hugepages: false shared: false - hugepage_size: 4 + hugepage_size: 1 prefault: false mergeable: false - size: 9 - hotplugged_size: 2 + size: 2 + hotplugged_size: 7 zones: - hugepages: false shared: false @@ -1049,23 +1116,23 @@ components: prefault: false mergeable: false file: file - size: 7 - hotplugged_size: 6 - host_numa_node: 1 + size: 1 + hotplugged_size: 1 + host_numa_node: 6 id: id - hotplug_size: 1 + hotplug_size: 7 - hugepages: false shared: false hugepage_size: 1 prefault: false mergeable: false file: file - size: 7 - hotplugged_size: 6 - host_numa_node: 1 + size: 1 + hotplugged_size: 1 + host_numa_node: 6 id: id - hotplug_size: 1 - hotplug_size: 3 + hotplug_size: 7 + hotplug_size: 4 hotplug_method: Acpi properties: size: @@ -1184,11 +1251,12 @@ components: type: object DiskConfig: example: + pci_segment: 8 path: path - num_queues: 7 + num_queues: 4 readonly: false iommu: false - queue_size: 1 + queue_size: 5 vhost_socket: vhost_socket vhost_user: false direct: false @@ -1231,6 +1299,9 @@ components: type: boolean rate_limiter_config: $ref: '#/components/schemas/RateLimiterConfig' + pci_segment: + format: int16 + type: integer id: type: string required: @@ -1252,14 +1323,15 @@ components: one_time_burst: 0 refill_time: 0 mac: mac + pci_segment: 6 vhost_mode: Client iommu: false vhost_socket: vhost_socket vhost_user: false id: id fd: - - 8 - - 8 + - 3 + - 3 mask: 255.255.255.0 properties: tap: @@ -1297,6 +1369,9 @@ components: format: int32 type: integer type: array + pci_segment: + format: int16 + type: integer rate_limiter_config: $ref: '#/components/schemas/RateLimiterConfig' type: object @@ -1316,7 +1391,7 @@ components: type: object BalloonConfig: example: - size: 9 + size: 1 deflate_on_oom: false properties: size: @@ -1332,8 +1407,9 @@ components: type: object FsConfig: example: - num_queues: 6 - queue_size: 3 + pci_segment: 5 + num_queues: 2 + queue_size: 6 cache_size: 6 dax: true tag: tag @@ -1356,6 +1432,9 @@ components: cache_size: format: int64 type: integer + pci_segment: + format: int16 + type: integer id: type: string required: @@ -1368,9 +1447,10 @@ components: type: object PmemConfig: example: + pci_segment: 3 mergeable: false file: file - size: 1 + size: 6 iommu: false id: id discard_writes: false @@ -1389,6 +1469,9 @@ components: discard_writes: default: false type: boolean + pci_segment: + format: int16 + type: integer id: type: string required: @@ -1418,6 +1501,7 @@ components: type: object DeviceConfig: example: + pci_segment: 3 path: path iommu: false id: id @@ -1427,6 +1511,9 @@ components: iommu: default: false type: boolean + pci_segment: + format: int16 + type: integer id: type: string required: @@ -1434,6 +1521,7 @@ components: type: object VsockConfig: example: + pci_segment: 0 iommu: false socket: socket id: id @@ -1450,6 +1538,9 @@ components: iommu: default: false type: boolean + pci_segment: + format: int16 + type: integer id: type: string required: @@ -1459,7 +1550,7 @@ components: SgxEpcConfig: example: prefault: false - size: 6 + size: 7 id: id properties: id: @@ -1476,8 +1567,8 @@ components: type: object NumaDistance: example: - distance: 3 - destination: 6 + distance: 8 + destination: 4 properties: destination: format: int32 @@ -1492,13 +1583,13 @@ components: NumaConfig: example: distances: - - distance: 3 - destination: 6 - - distance: 3 - destination: 6 + - distance: 8 + destination: 4 + - distance: 8 + destination: 4 cpus: - - 5 - - 5 + - 0 + - 0 sgx_epc_sections: - sgx_epc_sections - sgx_epc_sections diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/CpuAffinity.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/CpuAffinity.md new file mode 100644 index 0000000000..300c7af1da --- /dev/null +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/CpuAffinity.md @@ -0,0 +1,82 @@ +# CpuAffinity + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Vcpu** | Pointer to **int32** | | [optional] +**HostCpus** | Pointer to **[]int32** | | [optional] + +## Methods + +### NewCpuAffinity + +`func NewCpuAffinity() *CpuAffinity` + +NewCpuAffinity instantiates a new CpuAffinity object +This constructor will assign default values to properties that have it defined, +and makes sure properties required by API are set, but the set of arguments +will change when the set of required properties is changed + +### NewCpuAffinityWithDefaults + +`func NewCpuAffinityWithDefaults() *CpuAffinity` + +NewCpuAffinityWithDefaults instantiates a new CpuAffinity object +This constructor will only assign default values to properties that have it defined, +but it doesn't guarantee that properties required by API are set + +### GetVcpu + +`func (o *CpuAffinity) GetVcpu() int32` + +GetVcpu returns the Vcpu field if non-nil, zero value otherwise. + +### GetVcpuOk + +`func (o *CpuAffinity) GetVcpuOk() (*int32, bool)` + +GetVcpuOk returns a tuple with the Vcpu field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetVcpu + +`func (o *CpuAffinity) SetVcpu(v int32)` + +SetVcpu sets Vcpu field to given value. + +### HasVcpu + +`func (o *CpuAffinity) HasVcpu() bool` + +HasVcpu returns a boolean if a field has been set. + +### GetHostCpus + +`func (o *CpuAffinity) GetHostCpus() []int32` + +GetHostCpus returns the HostCpus field if non-nil, zero value otherwise. + +### GetHostCpusOk + +`func (o *CpuAffinity) GetHostCpusOk() (*[]int32, bool)` + +GetHostCpusOk returns a tuple with the HostCpus field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetHostCpus + +`func (o *CpuAffinity) SetHostCpus(v []int32)` + +SetHostCpus sets HostCpus field to given value. + +### HasHostCpus + +`func (o *CpuAffinity) HasHostCpus() bool` + +HasHostCpus returns a boolean if a field has been set. + + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/CpusConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/CpusConfig.md index 3535cd213b..19b1a1795d 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/CpusConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/CpusConfig.md @@ -8,6 +8,7 @@ Name | Type | Description | Notes **MaxVcpus** | **int32** | | [default to 1] **Topology** | Pointer to [**CpuTopology**](CpuTopology.md) | | [optional] **MaxPhysBits** | Pointer to **int32** | | [optional] +**Affinity** | Pointer to [**[]CpuAffinity**](CpuAffinity.md) | | [optional] ## Methods @@ -118,6 +119,31 @@ SetMaxPhysBits sets MaxPhysBits field to given value. HasMaxPhysBits returns a boolean if a field has been set. +### GetAffinity + +`func (o *CpusConfig) GetAffinity() []CpuAffinity` + +GetAffinity returns the Affinity field if non-nil, zero value otherwise. + +### GetAffinityOk + +`func (o *CpusConfig) GetAffinityOk() (*[]CpuAffinity, bool)` + +GetAffinityOk returns a tuple with the Affinity field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetAffinity + +`func (o *CpusConfig) SetAffinity(v []CpuAffinity)` + +SetAffinity sets Affinity field to given value. + +### HasAffinity + +`func (o *CpusConfig) HasAffinity() bool` + +HasAffinity returns a boolean if a field has been set. + [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DeviceConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DeviceConfig.md index 3430fbc7ff..07f0943953 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DeviceConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DeviceConfig.md @@ -6,6 +6,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Path** | **string** | | **Iommu** | Pointer to **bool** | | [optional] [default to false] +**PciSegment** | Pointer to **int32** | | [optional] **Id** | Pointer to **string** | | [optional] ## Methods @@ -72,6 +73,31 @@ SetIommu sets Iommu field to given value. HasIommu returns a boolean if a field has been set. +### GetPciSegment + +`func (o *DeviceConfig) GetPciSegment() int32` + +GetPciSegment returns the PciSegment field if non-nil, zero value otherwise. + +### GetPciSegmentOk + +`func (o *DeviceConfig) GetPciSegmentOk() (*int32, bool)` + +GetPciSegmentOk returns a tuple with the PciSegment field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetPciSegment + +`func (o *DeviceConfig) SetPciSegment(v int32)` + +SetPciSegment sets PciSegment field to given value. + +### HasPciSegment + +`func (o *DeviceConfig) HasPciSegment() bool` + +HasPciSegment returns a boolean if a field has been set. + ### GetId `func (o *DeviceConfig) GetId() string` 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 558a793f90..f4e4a6cbd1 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DiskConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/DiskConfig.md @@ -14,6 +14,7 @@ Name | Type | Description | Notes **VhostSocket** | Pointer to **string** | | [optional] **PollQueue** | Pointer to **bool** | | [optional] [default to true] **RateLimiterConfig** | Pointer to [**RateLimiterConfig**](RateLimiterConfig.md) | | [optional] +**PciSegment** | Pointer to **int32** | | [optional] **Id** | Pointer to **string** | | [optional] ## Methods @@ -280,6 +281,31 @@ SetRateLimiterConfig sets RateLimiterConfig field to given value. HasRateLimiterConfig returns a boolean if a field has been set. +### GetPciSegment + +`func (o *DiskConfig) GetPciSegment() int32` + +GetPciSegment returns the PciSegment field if non-nil, zero value otherwise. + +### GetPciSegmentOk + +`func (o *DiskConfig) GetPciSegmentOk() (*int32, bool)` + +GetPciSegmentOk returns a tuple with the PciSegment field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetPciSegment + +`func (o *DiskConfig) SetPciSegment(v int32)` + +SetPciSegment sets PciSegment field to given value. + +### HasPciSegment + +`func (o *DiskConfig) HasPciSegment() bool` + +HasPciSegment returns a boolean if a field has been set. + ### GetId `func (o *DiskConfig) GetId() string` 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 08d41b6fed..daf24d2bc0 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md @@ -10,6 +10,7 @@ Name | Type | Description | Notes **QueueSize** | **int32** | | [default to 1024] **Dax** | **bool** | | [default to true] **CacheSize** | **int64** | | +**PciSegment** | Pointer to **int32** | | [optional] **Id** | Pointer to **string** | | [optional] ## Methods @@ -151,6 +152,31 @@ and a boolean to check if the value has been set. SetCacheSize sets CacheSize field to given value. +### GetPciSegment + +`func (o *FsConfig) GetPciSegment() int32` + +GetPciSegment returns the PciSegment field if non-nil, zero value otherwise. + +### GetPciSegmentOk + +`func (o *FsConfig) GetPciSegmentOk() (*int32, bool)` + +GetPciSegmentOk returns a tuple with the PciSegment field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetPciSegment + +`func (o *FsConfig) SetPciSegment(v int32)` + +SetPciSegment sets PciSegment field to given value. + +### HasPciSegment + +`func (o *FsConfig) HasPciSegment() bool` + +HasPciSegment returns a boolean if a field has been set. + ### GetId `func (o *FsConfig) GetId() string` diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/NetConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/NetConfig.md index 3dff096f51..6d7fc78de3 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/NetConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/NetConfig.md @@ -16,6 +16,7 @@ Name | Type | Description | Notes **VhostMode** | Pointer to **string** | | [optional] [default to "Client"] **Id** | Pointer to **string** | | [optional] **Fd** | Pointer to **[]int32** | | [optional] +**PciSegment** | Pointer to **int32** | | [optional] **RateLimiterConfig** | Pointer to [**RateLimiterConfig**](RateLimiterConfig.md) | | [optional] ## Methods @@ -337,6 +338,31 @@ SetFd sets Fd field to given value. HasFd returns a boolean if a field has been set. +### GetPciSegment + +`func (o *NetConfig) GetPciSegment() int32` + +GetPciSegment returns the PciSegment field if non-nil, zero value otherwise. + +### GetPciSegmentOk + +`func (o *NetConfig) GetPciSegmentOk() (*int32, bool)` + +GetPciSegmentOk returns a tuple with the PciSegment field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetPciSegment + +`func (o *NetConfig) SetPciSegment(v int32)` + +SetPciSegment sets PciSegment field to given value. + +### HasPciSegment + +`func (o *NetConfig) HasPciSegment() bool` + +HasPciSegment returns a boolean if a field has been set. + ### GetRateLimiterConfig `func (o *NetConfig) GetRateLimiterConfig() RateLimiterConfig` diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/PmemConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/PmemConfig.md index 73962eb741..82f206551c 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/PmemConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/PmemConfig.md @@ -9,6 +9,7 @@ Name | Type | Description | Notes **Iommu** | Pointer to **bool** | | [optional] [default to false] **Mergeable** | Pointer to **bool** | | [optional] [default to false] **DiscardWrites** | Pointer to **bool** | | [optional] [default to false] +**PciSegment** | Pointer to **int32** | | [optional] **Id** | Pointer to **string** | | [optional] ## Methods @@ -150,6 +151,31 @@ SetDiscardWrites sets DiscardWrites field to given value. HasDiscardWrites returns a boolean if a field has been set. +### GetPciSegment + +`func (o *PmemConfig) GetPciSegment() int32` + +GetPciSegment returns the PciSegment field if non-nil, zero value otherwise. + +### GetPciSegmentOk + +`func (o *PmemConfig) GetPciSegmentOk() (*int32, bool)` + +GetPciSegmentOk returns a tuple with the PciSegment field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetPciSegment + +`func (o *PmemConfig) SetPciSegment(v int32)` + +SetPciSegment sets PciSegment field to given value. + +### HasPciSegment + +`func (o *PmemConfig) HasPciSegment() bool` + +HasPciSegment returns a boolean if a field has been set. + ### GetId `func (o *PmemConfig) GetId() string` 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 0ce6c57840..4c8c05b63e 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VsockConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VsockConfig.md @@ -7,6 +7,7 @@ Name | Type | Description | Notes **Cid** | **int64** | Guest Vsock CID | **Socket** | **string** | Path to UNIX domain socket, used to proxy vsock connections. | **Iommu** | Pointer to **bool** | | [optional] [default to false] +**PciSegment** | Pointer to **int32** | | [optional] **Id** | Pointer to **string** | | [optional] ## Methods @@ -93,6 +94,31 @@ SetIommu sets Iommu field to given value. HasIommu returns a boolean if a field has been set. +### GetPciSegment + +`func (o *VsockConfig) GetPciSegment() int32` + +GetPciSegment returns the PciSegment field if non-nil, zero value otherwise. + +### GetPciSegmentOk + +`func (o *VsockConfig) GetPciSegmentOk() (*int32, bool)` + +GetPciSegmentOk returns a tuple with the PciSegment field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetPciSegment + +`func (o *VsockConfig) SetPciSegment(v int32)` + +SetPciSegment sets PciSegment field to given value. + +### HasPciSegment + +`func (o *VsockConfig) HasPciSegment() bool` + +HasPciSegment returns a boolean if a field has been set. + ### GetId `func (o *VsockConfig) GetId() string` diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cpu_affinity.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cpu_affinity.go new file mode 100644 index 0000000000..f0009699f2 --- /dev/null +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cpu_affinity.go @@ -0,0 +1,149 @@ +/* +Cloud Hypervisor API + +Local HTTP based API for managing and inspecting a cloud-hypervisor virtual machine. + +API version: 0.3.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi + +import ( + "encoding/json" +) + +// CpuAffinity struct for CpuAffinity +type CpuAffinity struct { + Vcpu *int32 `json:"vcpu,omitempty"` + HostCpus *[]int32 `json:"host_cpus,omitempty"` +} + +// NewCpuAffinity instantiates a new CpuAffinity object +// This constructor will assign default values to properties that have it defined, +// and makes sure properties required by API are set, but the set of arguments +// will change when the set of required properties is changed +func NewCpuAffinity() *CpuAffinity { + this := CpuAffinity{} + return &this +} + +// NewCpuAffinityWithDefaults instantiates a new CpuAffinity object +// This constructor will only assign default values to properties that have it defined, +// but it doesn't guarantee that properties required by API are set +func NewCpuAffinityWithDefaults() *CpuAffinity { + this := CpuAffinity{} + return &this +} + +// GetVcpu returns the Vcpu field value if set, zero value otherwise. +func (o *CpuAffinity) GetVcpu() int32 { + if o == nil || o.Vcpu == nil { + var ret int32 + return ret + } + return *o.Vcpu +} + +// GetVcpuOk returns a tuple with the Vcpu field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *CpuAffinity) GetVcpuOk() (*int32, bool) { + if o == nil || o.Vcpu == nil { + return nil, false + } + return o.Vcpu, true +} + +// HasVcpu returns a boolean if a field has been set. +func (o *CpuAffinity) HasVcpu() bool { + if o != nil && o.Vcpu != nil { + return true + } + + return false +} + +// SetVcpu gets a reference to the given int32 and assigns it to the Vcpu field. +func (o *CpuAffinity) SetVcpu(v int32) { + o.Vcpu = &v +} + +// GetHostCpus returns the HostCpus field value if set, zero value otherwise. +func (o *CpuAffinity) GetHostCpus() []int32 { + if o == nil || o.HostCpus == nil { + var ret []int32 + return ret + } + return *o.HostCpus +} + +// GetHostCpusOk returns a tuple with the HostCpus field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *CpuAffinity) GetHostCpusOk() (*[]int32, bool) { + if o == nil || o.HostCpus == nil { + return nil, false + } + return o.HostCpus, true +} + +// HasHostCpus returns a boolean if a field has been set. +func (o *CpuAffinity) HasHostCpus() bool { + if o != nil && o.HostCpus != nil { + return true + } + + return false +} + +// SetHostCpus gets a reference to the given []int32 and assigns it to the HostCpus field. +func (o *CpuAffinity) SetHostCpus(v []int32) { + o.HostCpus = &v +} + +func (o CpuAffinity) MarshalJSON() ([]byte, error) { + toSerialize := map[string]interface{}{} + if o.Vcpu != nil { + toSerialize["vcpu"] = o.Vcpu + } + if o.HostCpus != nil { + toSerialize["host_cpus"] = o.HostCpus + } + return json.Marshal(toSerialize) +} + +type NullableCpuAffinity struct { + value *CpuAffinity + isSet bool +} + +func (v NullableCpuAffinity) Get() *CpuAffinity { + return v.value +} + +func (v *NullableCpuAffinity) Set(val *CpuAffinity) { + v.value = val + v.isSet = true +} + +func (v NullableCpuAffinity) IsSet() bool { + return v.isSet +} + +func (v *NullableCpuAffinity) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableCpuAffinity(val *CpuAffinity) *NullableCpuAffinity { + return &NullableCpuAffinity{value: val, isSet: true} +} + +func (v NullableCpuAffinity) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableCpuAffinity) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cpus_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cpus_config.go index 07e32c6f8b..52430cf004 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cpus_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cpus_config.go @@ -16,10 +16,11 @@ import ( // CpusConfig struct for CpusConfig type CpusConfig struct { - BootVcpus int32 `json:"boot_vcpus"` - MaxVcpus int32 `json:"max_vcpus"` - Topology *CpuTopology `json:"topology,omitempty"` - MaxPhysBits *int32 `json:"max_phys_bits,omitempty"` + BootVcpus int32 `json:"boot_vcpus"` + MaxVcpus int32 `json:"max_vcpus"` + Topology *CpuTopology `json:"topology,omitempty"` + MaxPhysBits *int32 `json:"max_phys_bits,omitempty"` + Affinity *[]CpuAffinity `json:"affinity,omitempty"` } // NewCpusConfig instantiates a new CpusConfig object @@ -157,6 +158,38 @@ func (o *CpusConfig) SetMaxPhysBits(v int32) { o.MaxPhysBits = &v } +// GetAffinity returns the Affinity field value if set, zero value otherwise. +func (o *CpusConfig) GetAffinity() []CpuAffinity { + if o == nil || o.Affinity == nil { + var ret []CpuAffinity + return ret + } + return *o.Affinity +} + +// GetAffinityOk returns a tuple with the Affinity field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *CpusConfig) GetAffinityOk() (*[]CpuAffinity, bool) { + if o == nil || o.Affinity == nil { + return nil, false + } + return o.Affinity, true +} + +// HasAffinity returns a boolean if a field has been set. +func (o *CpusConfig) HasAffinity() bool { + if o != nil && o.Affinity != nil { + return true + } + + return false +} + +// SetAffinity gets a reference to the given []CpuAffinity and assigns it to the Affinity field. +func (o *CpusConfig) SetAffinity(v []CpuAffinity) { + o.Affinity = &v +} + func (o CpusConfig) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} if true { @@ -171,6 +204,9 @@ func (o CpusConfig) MarshalJSON() ([]byte, error) { if o.MaxPhysBits != nil { toSerialize["max_phys_bits"] = o.MaxPhysBits } + if o.Affinity != nil { + toSerialize["affinity"] = o.Affinity + } return json.Marshal(toSerialize) } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_device_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_device_config.go index 0214cd25e7..578cf2c794 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_device_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_device_config.go @@ -16,9 +16,10 @@ import ( // DeviceConfig struct for DeviceConfig type DeviceConfig struct { - Path string `json:"path"` - Iommu *bool `json:"iommu,omitempty"` - Id *string `json:"id,omitempty"` + Path string `json:"path"` + Iommu *bool `json:"iommu,omitempty"` + PciSegment *int32 `json:"pci_segment,omitempty"` + Id *string `json:"id,omitempty"` } // NewDeviceConfig instantiates a new DeviceConfig object @@ -99,6 +100,38 @@ func (o *DeviceConfig) SetIommu(v bool) { o.Iommu = &v } +// GetPciSegment returns the PciSegment field value if set, zero value otherwise. +func (o *DeviceConfig) GetPciSegment() int32 { + if o == nil || o.PciSegment == nil { + var ret int32 + return ret + } + return *o.PciSegment +} + +// GetPciSegmentOk returns a tuple with the PciSegment field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *DeviceConfig) GetPciSegmentOk() (*int32, bool) { + if o == nil || o.PciSegment == nil { + return nil, false + } + return o.PciSegment, true +} + +// HasPciSegment returns a boolean if a field has been set. +func (o *DeviceConfig) HasPciSegment() bool { + if o != nil && o.PciSegment != nil { + return true + } + + return false +} + +// SetPciSegment gets a reference to the given int32 and assigns it to the PciSegment field. +func (o *DeviceConfig) SetPciSegment(v int32) { + o.PciSegment = &v +} + // GetId returns the Id field value if set, zero value otherwise. func (o *DeviceConfig) GetId() string { if o == nil || o.Id == nil { @@ -139,6 +172,9 @@ func (o DeviceConfig) MarshalJSON() ([]byte, error) { if o.Iommu != nil { toSerialize["iommu"] = o.Iommu } + if o.PciSegment != nil { + toSerialize["pci_segment"] = o.PciSegment + } if o.Id != nil { toSerialize["id"] = o.Id } 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 e1b6e46986..eb3a7245e9 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 @@ -26,6 +26,7 @@ type DiskConfig struct { VhostSocket *string `json:"vhost_socket,omitempty"` PollQueue *bool `json:"poll_queue,omitempty"` RateLimiterConfig *RateLimiterConfig `json:"rate_limiter_config,omitempty"` + PciSegment *int32 `json:"pci_segment,omitempty"` Id *string `json:"id,omitempty"` } @@ -387,6 +388,38 @@ func (o *DiskConfig) SetRateLimiterConfig(v RateLimiterConfig) { o.RateLimiterConfig = &v } +// GetPciSegment returns the PciSegment field value if set, zero value otherwise. +func (o *DiskConfig) GetPciSegment() int32 { + if o == nil || o.PciSegment == nil { + var ret int32 + return ret + } + return *o.PciSegment +} + +// GetPciSegmentOk returns a tuple with the PciSegment field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *DiskConfig) GetPciSegmentOk() (*int32, bool) { + if o == nil || o.PciSegment == nil { + return nil, false + } + return o.PciSegment, true +} + +// HasPciSegment returns a boolean if a field has been set. +func (o *DiskConfig) HasPciSegment() bool { + if o != nil && o.PciSegment != nil { + return true + } + + return false +} + +// SetPciSegment gets a reference to the given int32 and assigns it to the PciSegment field. +func (o *DiskConfig) SetPciSegment(v int32) { + o.PciSegment = &v +} + // GetId returns the Id field value if set, zero value otherwise. func (o *DiskConfig) GetId() string { if o == nil || o.Id == nil { @@ -451,6 +484,9 @@ func (o DiskConfig) MarshalJSON() ([]byte, error) { if o.RateLimiterConfig != nil { toSerialize["rate_limiter_config"] = o.RateLimiterConfig } + if o.PciSegment != nil { + toSerialize["pci_segment"] = o.PciSegment + } if o.Id != nil { toSerialize["id"] = o.Id } 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 91cd9bed39..7e43990770 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 @@ -16,13 +16,14 @@ import ( // FsConfig struct for FsConfig type FsConfig struct { - Tag string `json:"tag"` - Socket string `json:"socket"` - NumQueues int32 `json:"num_queues"` - QueueSize int32 `json:"queue_size"` - Dax bool `json:"dax"` - CacheSize int64 `json:"cache_size"` - Id *string `json:"id,omitempty"` + Tag string `json:"tag"` + Socket string `json:"socket"` + NumQueues int32 `json:"num_queues"` + QueueSize int32 `json:"queue_size"` + Dax bool `json:"dax"` + CacheSize int64 `json:"cache_size"` + PciSegment *int32 `json:"pci_segment,omitempty"` + Id *string `json:"id,omitempty"` } // NewFsConfig instantiates a new FsConfig object @@ -198,6 +199,38 @@ func (o *FsConfig) SetCacheSize(v int64) { o.CacheSize = v } +// GetPciSegment returns the PciSegment field value if set, zero value otherwise. +func (o *FsConfig) GetPciSegment() int32 { + if o == nil || o.PciSegment == nil { + var ret int32 + return ret + } + return *o.PciSegment +} + +// GetPciSegmentOk returns a tuple with the PciSegment field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *FsConfig) GetPciSegmentOk() (*int32, bool) { + if o == nil || o.PciSegment == nil { + return nil, false + } + return o.PciSegment, true +} + +// HasPciSegment returns a boolean if a field has been set. +func (o *FsConfig) HasPciSegment() bool { + if o != nil && o.PciSegment != nil { + return true + } + + return false +} + +// SetPciSegment gets a reference to the given int32 and assigns it to the PciSegment field. +func (o *FsConfig) SetPciSegment(v int32) { + o.PciSegment = &v +} + // GetId returns the Id field value if set, zero value otherwise. func (o *FsConfig) GetId() string { if o == nil || o.Id == nil { @@ -250,6 +283,9 @@ func (o FsConfig) MarshalJSON() ([]byte, error) { if true { toSerialize["cache_size"] = o.CacheSize } + if o.PciSegment != nil { + toSerialize["pci_segment"] = o.PciSegment + } if o.Id != nil { toSerialize["id"] = o.Id } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_net_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_net_config.go index dc9b599e89..473c55441b 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_net_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_net_config.go @@ -28,6 +28,7 @@ type NetConfig struct { VhostMode *string `json:"vhost_mode,omitempty"` Id *string `json:"id,omitempty"` Fd *[]int32 `json:"fd,omitempty"` + PciSegment *int32 `json:"pci_segment,omitempty"` RateLimiterConfig *RateLimiterConfig `json:"rate_limiter_config,omitempty"` } @@ -464,6 +465,38 @@ func (o *NetConfig) SetFd(v []int32) { o.Fd = &v } +// GetPciSegment returns the PciSegment field value if set, zero value otherwise. +func (o *NetConfig) GetPciSegment() int32 { + if o == nil || o.PciSegment == nil { + var ret int32 + return ret + } + return *o.PciSegment +} + +// GetPciSegmentOk returns a tuple with the PciSegment field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *NetConfig) GetPciSegmentOk() (*int32, bool) { + if o == nil || o.PciSegment == nil { + return nil, false + } + return o.PciSegment, true +} + +// HasPciSegment returns a boolean if a field has been set. +func (o *NetConfig) HasPciSegment() bool { + if o != nil && o.PciSegment != nil { + return true + } + + return false +} + +// SetPciSegment gets a reference to the given int32 and assigns it to the PciSegment field. +func (o *NetConfig) SetPciSegment(v int32) { + o.PciSegment = &v +} + // GetRateLimiterConfig returns the RateLimiterConfig field value if set, zero value otherwise. func (o *NetConfig) GetRateLimiterConfig() RateLimiterConfig { if o == nil || o.RateLimiterConfig == nil { @@ -534,6 +567,9 @@ func (o NetConfig) MarshalJSON() ([]byte, error) { if o.Fd != nil { toSerialize["fd"] = o.Fd } + if o.PciSegment != nil { + toSerialize["pci_segment"] = o.PciSegment + } if o.RateLimiterConfig != nil { toSerialize["rate_limiter_config"] = o.RateLimiterConfig } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_pmem_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_pmem_config.go index 703f3840c5..69f45732f9 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_pmem_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_pmem_config.go @@ -21,6 +21,7 @@ type PmemConfig struct { Iommu *bool `json:"iommu,omitempty"` Mergeable *bool `json:"mergeable,omitempty"` DiscardWrites *bool `json:"discard_writes,omitempty"` + PciSegment *int32 `json:"pci_segment,omitempty"` Id *string `json:"id,omitempty"` } @@ -206,6 +207,38 @@ func (o *PmemConfig) SetDiscardWrites(v bool) { o.DiscardWrites = &v } +// GetPciSegment returns the PciSegment field value if set, zero value otherwise. +func (o *PmemConfig) GetPciSegment() int32 { + if o == nil || o.PciSegment == nil { + var ret int32 + return ret + } + return *o.PciSegment +} + +// GetPciSegmentOk returns a tuple with the PciSegment field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *PmemConfig) GetPciSegmentOk() (*int32, bool) { + if o == nil || o.PciSegment == nil { + return nil, false + } + return o.PciSegment, true +} + +// HasPciSegment returns a boolean if a field has been set. +func (o *PmemConfig) HasPciSegment() bool { + if o != nil && o.PciSegment != nil { + return true + } + + return false +} + +// SetPciSegment gets a reference to the given int32 and assigns it to the PciSegment field. +func (o *PmemConfig) SetPciSegment(v int32) { + o.PciSegment = &v +} + // GetId returns the Id field value if set, zero value otherwise. func (o *PmemConfig) GetId() string { if o == nil || o.Id == nil { @@ -255,6 +288,9 @@ func (o PmemConfig) MarshalJSON() ([]byte, error) { if o.DiscardWrites != nil { toSerialize["discard_writes"] = o.DiscardWrites } + if o.PciSegment != nil { + toSerialize["pci_segment"] = o.PciSegment + } if o.Id != nil { toSerialize["id"] = o.Id } 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 94a7ab5a57..714f9b56ae 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 @@ -19,9 +19,10 @@ type VsockConfig struct { // Guest Vsock CID Cid int64 `json:"cid"` // Path to UNIX domain socket, used to proxy vsock connections. - Socket string `json:"socket"` - Iommu *bool `json:"iommu,omitempty"` - Id *string `json:"id,omitempty"` + Socket string `json:"socket"` + Iommu *bool `json:"iommu,omitempty"` + PciSegment *int32 `json:"pci_segment,omitempty"` + Id *string `json:"id,omitempty"` } // NewVsockConfig instantiates a new VsockConfig object @@ -127,6 +128,38 @@ func (o *VsockConfig) SetIommu(v bool) { o.Iommu = &v } +// GetPciSegment returns the PciSegment field value if set, zero value otherwise. +func (o *VsockConfig) GetPciSegment() int32 { + if o == nil || o.PciSegment == nil { + var ret int32 + return ret + } + return *o.PciSegment +} + +// GetPciSegmentOk returns a tuple with the PciSegment field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *VsockConfig) GetPciSegmentOk() (*int32, bool) { + if o == nil || o.PciSegment == nil { + return nil, false + } + return o.PciSegment, true +} + +// HasPciSegment returns a boolean if a field has been set. +func (o *VsockConfig) HasPciSegment() bool { + if o != nil && o.PciSegment != nil { + return true + } + + return false +} + +// SetPciSegment gets a reference to the given int32 and assigns it to the PciSegment field. +func (o *VsockConfig) SetPciSegment(v int32) { + o.PciSegment = &v +} + // GetId returns the Id field value if set, zero value otherwise. func (o *VsockConfig) GetId() string { if o == nil || o.Id == nil { @@ -170,6 +203,9 @@ func (o VsockConfig) MarshalJSON() ([]byte, error) { if o.Iommu != nil { toSerialize["iommu"] = o.Iommu } + if o.PciSegment != nil { + toSerialize["pci_segment"] = o.PciSegment + } if o.Id != nil { toSerialize["id"] = o.Id } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml index 684f3cfaae..163d811edd 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml @@ -480,6 +480,16 @@ components: default: false description: Virtual machine configuration + CpuAffinity: + type: object + properties: + vcpu: + type: integer + host_cpus: + type: array + items: + type: integer + CpuTopology: type: object properties: @@ -507,9 +517,13 @@ components: default: 1 type: integer topology: - $ref: '#/components/schemas/CpuTopology' + $ref: '#/components/schemas/CpuTopology' max_phys_bits: type: integer + affinity: + type: array + items: + $ref: '#/components/schemas/CpuAffinity' MemoryZoneConfig: required: @@ -687,6 +701,9 @@ components: default: true rate_limiter_config: $ref: '#/components/schemas/RateLimiterConfig' + pci_segment: + type: integer + format: int16 id: type: string @@ -728,6 +745,9 @@ components: items: type: integer format: int32 + pci_segment: + type: integer + format: int16 rate_limiter_config: $ref: '#/components/schemas/RateLimiterConfig' @@ -783,6 +803,9 @@ components: type: integer format: int64 default: 8589934592 + pci_segment: + type: integer + format: int16 id: type: string @@ -805,6 +828,9 @@ components: discard_writes: type: boolean default: false + pci_segment: + type: integer + format: int16 id: type: string @@ -832,6 +858,9 @@ components: iommu: type: boolean default: false + pci_segment: + type: integer + format: int16 id: type: string @@ -852,6 +881,9 @@ components: iommu: type: boolean default: false + pci_segment: + type: integer + format: int16 id: type: string