Disable Hyper-V extension on ARM #2858
Merged
Conversation
This file contains 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
dkbennett
approved these changes
May 10, 2024
krschau
approved these changes
May 10, 2024
src/Services/ActivationService.cs
Outdated
| if (arch == Architecture.Arm64 || arch == Architecture.Arm || arch == Architecture.Armv6) | ||
| { | ||
| await _localSettingsService.SaveSettingAsync<bool>(CommonConstants.HyperVUniqueId + "-ExtensionDisabled", true); | ||
| Log.Information("Disabling Hyper-V extension on ARM {Architecture}", arch); |
There was a problem hiding this comment.
nit
Suggested change
| Log.Information("Disabling Hyper-V extension on ARM {Architecture}", arch); | |
| Log.Information($"Disabling Hyper-V extension on ARM {arch}"); |
sshilov7
reviewed
May 10, 2024
src/Services/ActivationService.cs
Outdated
| // Disable Hyper-V extension on ARM on first run | ||
| if (!await _localSettingsService.ReadSettingAsync<bool>(WellKnownSettingsKeys.IsNotFirstRun)) | ||
| { | ||
| var arch = RuntimeInformation.ProcessArchitecture; |
There was a problem hiding this comment.
Note: it may be possible to run x86 or x64 DevHome on ARM64EC devices. We don't install those architectures, but users could force it or architectures we build can change in the future. It would be more correct to check device architecture instead of running process architecture.
huzaifa-d
force-pushed
the
user/modanish/DisableOnARM
branch
from
51b7043
to
4165e44
Compare
huzaifa-d
force-pushed
the
user/modanish/DisableOnARM
branch
from
853b3de
to
5268740
Compare
bbonaby
reviewed
May 14, 2024
Comment on lines
101
to
150
| var supportedOperations = ComputeSystemOperations.ApplyConfiguration; | ||
| var revertOperation = Guid.Empty.Equals(ParentCheckpointId) ? ComputeSystemOperations.None : ComputeSystemOperations.RevertSnapshot; | ||
|
|
||
| switch (GetState()) | ||
| { | ||
| case ComputeSystemState.Running: | ||
| // Supported operations when running | ||
| return ComputeSystemOperations.ShutDown | | ||
| supportedOperations = ComputeSystemOperations.ShutDown | | ||
| ComputeSystemOperations.Terminate | | ||
| ComputeSystemOperations.Save | | ||
| ComputeSystemOperations.Pause | | ||
| ComputeSystemOperations.CreateSnapshot | | ||
| ComputeSystemOperations.Restart | | ||
| ComputeSystemOperations.ApplyConfiguration | | ||
| revertOperation; | ||
| break; | ||
| case ComputeSystemState.Stopped: | ||
| // Supported operations when stopped | ||
| return ComputeSystemOperations.Start | | ||
| supportedOperations = ComputeSystemOperations.Start | | ||
| ComputeSystemOperations.CreateSnapshot | | ||
| ComputeSystemOperations.Delete | | ||
| ComputeSystemOperations.ApplyConfiguration; | ||
| break; | ||
| case ComputeSystemState.Saved: | ||
| // Supported operations when saved | ||
| return ComputeSystemOperations.Start | | ||
| supportedOperations = ComputeSystemOperations.Start | | ||
| ComputeSystemOperations.CreateSnapshot | | ||
| ComputeSystemOperations.Delete | | ||
| ComputeSystemOperations.ApplyConfiguration | | ||
| revertOperation; | ||
| break; | ||
| case ComputeSystemState.Paused: | ||
| // Supported operations when paused | ||
| return ComputeSystemOperations.Terminate | | ||
| supportedOperations = ComputeSystemOperations.Terminate | | ||
| ComputeSystemOperations.Save | | ||
| ComputeSystemOperations.Resume | | ||
| ComputeSystemOperations.CreateSnapshot | | ||
| ComputeSystemOperations.ApplyConfiguration | | ||
| revertOperation; | ||
| break; | ||
| } | ||
|
|
||
| // Before applying the configuration we start the VM. So we will allow the ApplyConfiguration to be the base supported operation | ||
| // for the VM. | ||
| return ComputeSystemOperations.ApplyConfiguration; | ||
| // Disable ApplyConfiguration for ARM | ||
| var arch = RuntimeInformation.ProcessArchitecture; | ||
| if (arch == Architecture.Arm64 || arch == Architecture.Arm || arch == Architecture.Armv6) | ||
| { | ||
| supportedOperations &= ~ComputeSystemOperations.ApplyConfiguration; | ||
| } | ||
|
|
||
| return supportedOperations; |
There was a problem hiding this comment.
Would it be simpler to just remove the ComputeSystemOperations.ApplyConfiguration from the switch statements and then add it at the end in line 150? This way you can just do return supportedOperations so something like this:
Suggested change
| var supportedOperations = ComputeSystemOperations.ApplyConfiguration; | |
| var revertOperation = Guid.Empty.Equals(ParentCheckpointId) ? ComputeSystemOperations.None : ComputeSystemOperations.RevertSnapshot; | |
| switch (GetState()) | |
| { | |
| case ComputeSystemState.Running: | |
| // Supported operations when running | |
| return ComputeSystemOperations.ShutDown | | |
| supportedOperations = ComputeSystemOperations.ShutDown | | |
| ComputeSystemOperations.Terminate | | |
| ComputeSystemOperations.Save | | |
| ComputeSystemOperations.Pause | | |
| ComputeSystemOperations.CreateSnapshot | | |
| ComputeSystemOperations.Restart | | |
| ComputeSystemOperations.ApplyConfiguration | | |
| revertOperation; | |
| break; | |
| case ComputeSystemState.Stopped: | |
| // Supported operations when stopped | |
| return ComputeSystemOperations.Start | | |
| supportedOperations = ComputeSystemOperations.Start | | |
| ComputeSystemOperations.CreateSnapshot | | |
| ComputeSystemOperations.Delete | | |
| ComputeSystemOperations.ApplyConfiguration; | |
| break; | |
| case ComputeSystemState.Saved: | |
| // Supported operations when saved | |
| return ComputeSystemOperations.Start | | |
| supportedOperations = ComputeSystemOperations.Start | | |
| ComputeSystemOperations.CreateSnapshot | | |
| ComputeSystemOperations.Delete | | |
| ComputeSystemOperations.ApplyConfiguration | | |
| revertOperation; | |
| break; | |
| case ComputeSystemState.Paused: | |
| // Supported operations when paused | |
| return ComputeSystemOperations.Terminate | | |
| supportedOperations = ComputeSystemOperations.Terminate | | |
| ComputeSystemOperations.Save | | |
| ComputeSystemOperations.Resume | | |
| ComputeSystemOperations.CreateSnapshot | | |
| ComputeSystemOperations.ApplyConfiguration | | |
| revertOperation; | |
| break; | |
| } | |
| // Before applying the configuration we start the VM. So we will allow the ApplyConfiguration to be the base supported operation | |
| // for the VM. | |
| return ComputeSystemOperations.ApplyConfiguration; | |
| // Disable ApplyConfiguration for ARM | |
| var arch = RuntimeInformation.ProcessArchitecture; | |
| if (arch == Architecture.Arm64 || arch == Architecture.Arm || arch == Architecture.Armv6) | |
| { | |
| supportedOperations &= ~ComputeSystemOperations.ApplyConfiguration; | |
| } | |
| return supportedOperations; | |
| var supportedOperations = ComputeSystemOperations.None; | |
| var revertOperation = Guid.Empty.Equals(ParentCheckpointId) ? ComputeSystemOperations.None : ComputeSystemOperations.RevertSnapshot; | |
| switch (GetState()) | |
| { | |
| case ComputeSystemState.Running: | |
| // Supported operations when running | |
| supportedOperations = ComputeSystemOperations.ShutDown | | |
| ComputeSystemOperations.Terminate | | |
| ComputeSystemOperations.Save | | |
| ComputeSystemOperations.Pause | | |
| ComputeSystemOperations.CreateSnapshot | | |
| ComputeSystemOperations.Restart | | |
| revertOperation; | |
| break; | |
| case ComputeSystemState.Stopped: | |
| // Supported operations when stopped | |
| supportedOperations = ComputeSystemOperations.Start | | |
| ComputeSystemOperations.CreateSnapshot | | |
| ComputeSystemOperations.Delete; | |
| break; | |
| case ComputeSystemState.Saved: | |
| // Supported operations when saved | |
| supportedOperations = ComputeSystemOperations.Start | | |
| ComputeSystemOperations.CreateSnapshot | | |
| ComputeSystemOperations.Delete | | |
| revertOperation; | |
| break; | |
| case ComputeSystemState.Paused: | |
| // Supported operations when paused | |
| supportedOperations = ComputeSystemOperations.Terminate | | |
| ComputeSystemOperations.Save | | |
| ComputeSystemOperations.Resume | | |
| ComputeSystemOperations.CreateSnapshot | | |
| revertOperation; | |
| break; | |
| } | |
| // Disable ApplyConfiguration for ARM | |
| var arch = RuntimeInformation.ProcessArchitecture; | |
| if (arch == Architecture.Arm64 || arch == Architecture.Arm || arch == Architecture.Armv6) | |
| { | |
| return supportedOperations; | |
| } | |
| return supportedOperations | ComputeSystemOperations.ApplyConfiguration; |
sshilov7
reviewed
May 14, 2024
| { | ||
| // Disable the create operation for ARM devices. | ||
| var arch = RuntimeInformation.OSArchitecture; | ||
| if (arch == Architecture.Arm64 || arch == Architecture.Arm || arch == Architecture.Armv6) |
There was a problem hiding this comment.
Coding guidelines: "Use parentheses to make clauses in an expression apparent."
sshilov7
approved these changes
May 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary of the pull request
Disable config and creation flow for Hyper-V extension on ARM.
Validation steps performed
Tested on an ARM machine
PR checklist