Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Fix broken IsVTXDisabled detection on AMD CPU #4679

Merged
merged 1 commit into from
Jul 18, 2019

Conversation

afbjorklund
Copy link
Contributor

VMX is in FeatureNames, but SVM is in ExtraFeatureNames
This meant that detection always failed for SVM (AMD)

Thanks to user @hilbertxia

Description

The new library approach to cpuid introduced in 5a8ce1a was broken on AMD CPU (SVM).
Unfortunately it also disabled all tests that were in the previous file-based version 850e264

Related issue(s)

Closes #4669

@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "svm" git@github.com:afbjorklund/machine.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

VMX is in FeatureNames, but SVM is in ExtraFeatureNames
This meant that detection *always* failed for SVM (AMD)

Thanks to user @hilbertxia

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
@tstromberg
Copy link

Thanks for sending this PR in. I'm excited to see this new bug get fixed for our users.

@tstromberg
Copy link

Is there any additional work required before this PR gets merged?

@shivakumargn
Copy link

I noticed this on a AMD/windows laptop. The fix provided is only in linux/darwin files.
Fix seems to be incomplete.

@afbjorklund
Copy link
Contributor Author

Did you actually look at the change ?
It is in the Intel file, not in Linux/Darwin

@shivakumargn
Copy link

shivakumargn commented Mar 7, 2019

Sorry my bad. I had looked at the links to original files (_linux.go & _darwin.go) referred to in the pull description.
Thanks for the fix.

@guillaumerose guillaumerose merged commit 2b36917 into docker:master Jul 18, 2019
@afbjorklund
Copy link
Contributor Author

Thanks!

@afbjorklund afbjorklund deleted the svm branch July 18, 2019 06:43
@atomi
Copy link

atomi commented Jul 18, 2019

I believe this closes #4709 as well.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

docker-machine for windows on AMD FX-8300 cannot create virtualbox machine
6 participants