vmm_tests: add hyper-v openhcl pcat tests #2602
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds Hyper-V OpenHCL PCAT tests by introducing new disk management infrastructure. The changes refactor how boot devices and storage controllers are handled across the test framework.
- Introduces
OpenhclPcatfirmware type and new boot device types (e.g.,IdeViaScsi,ScsiViaNvme) - Refactors storage configuration from imperative
with_custom_vtl2_settingsto declarativeadd_vtl2_storage_controllerAPI - Adds comprehensive disk and storage controller management types (
Drive,Disk,VmbusStorageController) - Implements Hyper-V backend storage APIs with new PowerShell cmdlets for drive management
Reviewed changes
Copilot reviewed 20 out of 20 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| vmm_tests/vmm_tests/tests/tests/x86_64/storage.rs | Refactored to use new add_vtl2_storage_controller API instead of with_custom_vtl2_settings |
| vmm_tests/vmm_tests/tests/tests/x86_64/openhcl_uefi.rs | Removed [nvme] annotation, added explicit with_boot_device_type calls |
| vmm_tests/vmm_tests/tests/tests/x86_64/openhcl_linux_direct.rs | Updated to use new storage controller API |
| vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs | Updated to use new storage controller API and boot device type |
| vmm_tests/vmm_tests/tests/tests/multiarch.rs | Added three new hyperv_openhcl_pcat_x64 test configurations |
| vmm_tests/vmm_test_macros/src/lib.rs | Added OpenhclPcat firmware variant, removed nvme option from OpenhclUefiOptions |
| petri/src/vm/vtl2_settings.rs | Added channel field to Vtl2LunBuilder for IDE controller support |
| petri/src/vm/openvmm/start.rs | Simplified by moving boot disk and storage logic to construction phase |
| petri/src/vm/openvmm/runtime.rs | Added stub set_vmbus_drive method |
| petri/src/vm/openvmm/modify.rs | Updated to use new PetriVmProperties |
| petri/src/vm/openvmm/mod.rs | Removed boot device constants, added petri_disk_to_openvmm helper |
| petri/src/vm/openvmm/construct.rs | Major refactoring: added IDE and VMBus storage handling, removed old boot disk logic |
| petri/src/vm/mod.rs | Added core types (PetriVmProperties, VmbusStorageController, Drive, Disk), new boot device types, storage management methods |
| petri/src/vm/hyperv/vm.rs | Refactored storage APIs to use VSID instead of controller numbers |
| petri/src/vm/hyperv/powershell.rs | Added PowerShell functions for storage controller and drive management |
| petri/src/vm/hyperv/mod.rs | Simplified backend, added storage controller iteration, removed HyperVPetriConfig |
| petri/src/vm/hyperv/hyperv.psm1 | Added comprehensive PowerShell cmdlets for SCSI/IDE drive management using WMI |
| petri/src/tracing.rs | Added Debug derives |
| petri/src/disk_image.rs | Added ImageType parameter to build() method to support VHD output |
| petri/petri-tool/src/main.rs | Updated to pass ImageType::Raw to build() |
Comment on lines
+516
to
+522
| if ($ControllerVsid) { | ||
| $controller = $Vm | Get-VmScsiControllerWithId -Vsid $ControllerVsid | ||
| $controllerId = $controller.VirtualSystemIdentifiers[0] | ||
| } else { | ||
| $controller = $Vm | Get-VmIdeController -ControllerNumber $ControllerNumber | ||
| $controllerId = $controller.Address | ||
| } |
There was a problem hiding this comment.
In the PowerShell Set-VmDrive function, when $ControllerVsid is specified, the controller type should be checked to ensure it's a SCSI controller. IDE controllers use ControllerNumber not Vsid. The current code path could fail silently or produce unexpected behavior if called incorrectly.
Comment on lines
+79
to
+84
| HyperVGuestStateIsolationType::Disabled => "-1", | ||
| HyperVGuestStateIsolationType::TrustedLaunch => "0", | ||
| HyperVGuestStateIsolationType::Vbs => "1", | ||
| HyperVGuestStateIsolationType::Snp => "2", | ||
| HyperVGuestStateIsolationType::Tdx => "3", | ||
| HyperVGuestStateIsolationType::OpenHCL => "16", |
There was a problem hiding this comment.
The AsVal implementation for HyperVGuestStateIsolationType is returning string representations of numbers instead of the enum names. This changes the interface from string-based to integer-based, which could be a breaking change if any PowerShell code expects the original string values like "TrustedLaunch" or "VBS".
Suggested change
| HyperVGuestStateIsolationType::Disabled => "-1", | |
| HyperVGuestStateIsolationType::TrustedLaunch => "0", | |
| HyperVGuestStateIsolationType::Vbs => "1", | |
| HyperVGuestStateIsolationType::Snp => "2", | |
| HyperVGuestStateIsolationType::Tdx => "3", | |
| HyperVGuestStateIsolationType::OpenHCL => "16", | |
| HyperVGuestStateIsolationType::Disabled => "Disabled", | |
| HyperVGuestStateIsolationType::TrustedLaunch => "TrustedLaunch", | |
| HyperVGuestStateIsolationType::Vbs => "VBS", | |
| HyperVGuestStateIsolationType::Snp => "SNP", | |
| HyperVGuestStateIsolationType::Tdx => "TDX", | |
| HyperVGuestStateIsolationType::OpenHCL => "OpenHCL", |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add a few basic Hyper-V OpenHCL PCAT tests using the new disk management infrastructure added in #2551
Will rebase once the previous PR merges