-
Notifications
You must be signed in to change notification settings - Fork 22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add JSON output format to cpuid-gen #832
Merged
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
pfmooney
reviewed
Jan 11, 2025
pfmooney
approved these changes
Jan 11, 2025
hawkw
approved these changes
Jan 11, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i had a few very minor suggestions you may find useful, but this looks good to me!
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.
Add a JSON output format to
cpuid-gen
, which prints output suitable for inserting into an instance spec that can be fed topropolis-cli
.This is useful for ad hoc testing of hypervisor enlightenments. Enlightenments are exposed through special CPUID leaves in the hypervisor leaf range (0x4000_0000 to 0x4000_FFFF). To expose enlightenments, Propolis thus needs to pass the correct CPUID values to bhyve. However, if Propolis starts setting CPUID values for the hypervisor leaves, it will also need to set them for the standard and extended leaves. This implies that, to enable enlightenments, Propolis's instance-ensure API (or propolis-standalone's VM setup logic) will need a complete set of standard/extended CPUID values to apply. For
propolis-server
, the easiest way to do this is to usepropolis-cli new --spec
. The goal of this change is to make it easy to get a CPUID JSON blob to paste into this command's input spec.While dorking around with this change, I discovered that the
propolis-cli new --spec
switch was not properly marked as exclusive with the--config-toml
switch. Fix that up as well.Finally, if
propolis-server
fails to convert an API spec to its internal instance spec type, and the resulting error has a source, print both the error and the source. This allows the display of messages like "leaf 7 is specified both with and without a subleaf" when appropriate.Tested by booting some ad hoc propolis-server VMs using propolis-cli and the new output from cpuid-gen.