From 1630a6e98f54a0478d1fa766bc25fe4b124ce796 Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Tue, 12 Aug 2025 13:56:05 -0700 Subject: [PATCH] runtime: clh: Use msft/v41.0.139 API YAML Replace the API definitions file with the proper definitions from Microsoft's cloud-hypervisor fork Signed-off-by: Manuel Huber --- .../cloud-hypervisor/client/api/openapi.yaml | 8 +-- .../client/docs/PlatformConfig.md | 26 ---------- .../client/model_platform_config.go | 50 +++---------------- .../cloud-hypervisor/cloud-hypervisor.yaml | 3 -- versions.yaml | 2 +- 5 files changed, 9 insertions(+), 80 deletions(-) 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 acb2b948dd..f7dc39ae97 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml @@ -466,7 +466,7 @@ components: VmInfo: description: Virtual Machine information example: - memory_actual_size: 7 + memory_actual_size: 4 state: Created config: memory: @@ -595,7 +595,6 @@ components: - 1 - 1 num_pci_segments: 4 - iommu_address_width: 4 oem_strings: - oem_strings - oem_strings @@ -1038,7 +1037,6 @@ components: - 1 - 1 num_pci_segments: 4 - iommu_address_width: 4 oem_strings: - oem_strings - oem_strings @@ -1445,7 +1443,6 @@ components: - 1 - 1 num_pci_segments: 4 - iommu_address_width: 4 oem_strings: - oem_strings - oem_strings @@ -1462,9 +1459,6 @@ components: format: int16 type: integer type: array - iommu_address_width: - format: uint8 - type: integer serial_number: type: string uuid: diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/PlatformConfig.md b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/PlatformConfig.md index ec199888bd..f89a295729 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/PlatformConfig.md +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/PlatformConfig.md @@ -6,7 +6,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **NumPciSegments** | Pointer to **int32** | | [optional] **IommuSegments** | Pointer to **[]int32** | | [optional] -**IommuAddressWidth** | Pointer to **int32** | | [optional] **SerialNumber** | Pointer to **string** | | [optional] **Uuid** | Pointer to **string** | | [optional] **OemStrings** | Pointer to **[]string** | | [optional] @@ -82,31 +81,6 @@ SetIommuSegments sets IommuSegments field to given value. HasIommuSegments returns a boolean if a field has been set. -### GetIommuAddressWidth - -`func (o *PlatformConfig) GetIommuAddressWidth() int32` - -GetIommuAddressWidth returns the IommuAddressWidth field if non-nil, zero value otherwise. - -### GetIommuAddressWidthOk - -`func (o *PlatformConfig) GetIommuAddressWidthOk() (*int32, bool)` - -GetIommuAddressWidthOk returns a tuple with the IommuAddressWidth field if it's non-nil, zero value otherwise -and a boolean to check if the value has been set. - -### SetIommuAddressWidth - -`func (o *PlatformConfig) SetIommuAddressWidth(v int32)` - -SetIommuAddressWidth sets IommuAddressWidth field to given value. - -### HasIommuAddressWidth - -`func (o *PlatformConfig) HasIommuAddressWidth() bool` - -HasIommuAddressWidth returns a boolean if a field has been set. - ### GetSerialNumber `func (o *PlatformConfig) GetSerialNumber() string` diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_platform_config.go b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_platform_config.go index fab93276fb..0dce5958f3 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_platform_config.go +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_platform_config.go @@ -16,14 +16,13 @@ import ( // PlatformConfig struct for PlatformConfig type PlatformConfig struct { - NumPciSegments *int32 `json:"num_pci_segments,omitempty"` - IommuSegments *[]int32 `json:"iommu_segments,omitempty"` - IommuAddressWidth *int32 `json:"iommu_address_width,omitempty"` - SerialNumber *string `json:"serial_number,omitempty"` - Uuid *string `json:"uuid,omitempty"` - OemStrings *[]string `json:"oem_strings,omitempty"` - Tdx *bool `json:"tdx,omitempty"` - SevSnp *bool `json:"sev_snp,omitempty"` + NumPciSegments *int32 `json:"num_pci_segments,omitempty"` + IommuSegments *[]int32 `json:"iommu_segments,omitempty"` + SerialNumber *string `json:"serial_number,omitempty"` + Uuid *string `json:"uuid,omitempty"` + OemStrings *[]string `json:"oem_strings,omitempty"` + Tdx *bool `json:"tdx,omitempty"` + SevSnp *bool `json:"sev_snp,omitempty"` } // NewPlatformConfig instantiates a new PlatformConfig object @@ -115,38 +114,6 @@ func (o *PlatformConfig) SetIommuSegments(v []int32) { o.IommuSegments = &v } -// GetIommuAddressWidth returns the IommuAddressWidth field value if set, zero value otherwise. -func (o *PlatformConfig) GetIommuAddressWidth() int32 { - if o == nil || o.IommuAddressWidth == nil { - var ret int32 - return ret - } - return *o.IommuAddressWidth -} - -// GetIommuAddressWidthOk returns a tuple with the IommuAddressWidth field value if set, nil otherwise -// and a boolean to check if the value has been set. -func (o *PlatformConfig) GetIommuAddressWidthOk() (*int32, bool) { - if o == nil || o.IommuAddressWidth == nil { - return nil, false - } - return o.IommuAddressWidth, true -} - -// HasIommuAddressWidth returns a boolean if a field has been set. -func (o *PlatformConfig) HasIommuAddressWidth() bool { - if o != nil && o.IommuAddressWidth != nil { - return true - } - - return false -} - -// SetIommuAddressWidth gets a reference to the given int32 and assigns it to the IommuAddressWidth field. -func (o *PlatformConfig) SetIommuAddressWidth(v int32) { - o.IommuAddressWidth = &v -} - // GetSerialNumber returns the SerialNumber field value if set, zero value otherwise. func (o *PlatformConfig) GetSerialNumber() string { if o == nil || o.SerialNumber == nil { @@ -315,9 +282,6 @@ func (o PlatformConfig) MarshalJSON() ([]byte, error) { if o.IommuSegments != nil { toSerialize["iommu_segments"] = o.IommuSegments } - if o.IommuAddressWidth != nil { - toSerialize["iommu_address_width"] = o.IommuAddressWidth - } if o.SerialNumber != nil { toSerialize["serial_number"] = o.SerialNumber } diff --git a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml index 81a58c0560..b9d9bd5fcf 100644 --- a/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml +++ b/src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml @@ -722,9 +722,6 @@ components: items: type: integer format: int16 - iommu_address_width: - type: integer - format: uint8 serial_number: type: string uuid: diff --git a/versions.yaml b/versions.yaml index 2ea7594953..eada3dbb3e 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/microsoft/cloud-hypervisor/tags.*/v?(\d\S+)\.tar\.gz - version: "v41.0.79" + version: "v41.0.139" firecracker: description: "Firecracker micro-VMM"