Not all OS with -accel has -cpu host option #900
Merged
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
jandubois
reviewed
Jun 12, 2022
pkg/limayaml/defaults.go
Outdated
Comment on lines
109
to
111
| if HasHostCPU() { | ||
| cpuType[arch] = "host" | ||
| } else { | ||
| cpuType[arch] = "max" | ||
| } |
There was a problem hiding this comment.
Maybe this should be a function, as the logic is duplicated in the test?
There was a problem hiding this comment.
Yeah, the flags and functions are a bit spread out between qemu and limayaml
AkihiroSuda
reviewed
Jun 16, 2022
pkg/limayaml/defaults.go
Outdated
| if HasHostCPU() { | ||
| cpuType[arch] = "host" | ||
| } else { | ||
| cpuType[arch] = "max" |
There was a problem hiding this comment.
Probably better to leave empty (QEMU default)
There was a problem hiding this comment.
You mean remove -cpu argument altogether ?
Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
AkihiroSuda
reviewed
Jun 18, 2022
| @@ -106,7 +106,9 @@ func FillDefault(y, d, o *LimaYAML, filePath string) { | |||
| } | |||
| for arch := range cpuType { | |||
| if IsNativeArch(arch) && IsAccelOS() { | |||
| cpuType[arch] = "host" | |||
| if HasHostCPU() { | |||
There was a problem hiding this comment.
You can merge this if to the if in the previous line
AkihiroSuda
reviewed
Jun 18, 2022
| @@ -84,7 +84,9 @@ func TestFillDefault(t *testing.T) { | |||
| }, | |||
| } | |||
| if IsAccelOS() { | |||
| builtin.CPUType[arch] = "host" | |||
| if HasHostCPU() { | |||
There was a problem hiding this comment.
Same, you can merge this if to the if in the previous line
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.
Instead use -cpu max, for everything available.
Affects NetBSD (NVMM) and Windows (WHPX)
Follow-up from #894