jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into make-lxc3-optional

Browse source
This commit is contained in:
Simon Fels 2018-08-16 07:47:24 +02:00 • committed by GitHub
commit cd1d7880c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/anbox/cmds/check_features.cpp
View file

@ -21,6 +21,18 @@
#include "cpu_features_macros.h"
#include "cpuinfo_x86.h"
namespace {
std::vector<std::string> cpu_whitelist = {
// QEMU does not necessarily expose correctly that it supports SSE and friends even
// when started with `-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+x2apic`
"QEMU",
// Intel Core i7 M620 does not support AVX which causes cpu_features to not
// detect SSE and friends correctly
"M 620",
};
} // namespace
anbox::cmds::CheckFeatures::CheckFeatures()
: CommandWithFlagsAndAction{
cli::Name{"check-features"}, cli::Usage{"check-features"},
@ -41,9 +53,18 @@ anbox::cmds::CheckFeatures::CheckFeatures()
char brand_string[49];
cpu_features::FillX86BrandString(brand_string);
const auto is_qemu = utils::string_starts_with(brand_string, "QEMU");
std::string brand(brand_string);
if (missing_features.size() > 0 && !is_qemu) {
// Check if we have a CPU which's features we can't detect correctly
auto is_whitelisted = false;
for (const auto &entry : cpu_whitelist) {
if (brand.find(entry) != std::string::npos) {
is_whitelisted = true;
break;
}
}
if (missing_features.size() > 0 && !is_whitelisted) {
std::cerr << "The CPU of your computer (" << brand_string << ") does not support all" << std::endl
<< "features Anbox requires." << std::endl
<< "It is missing support for the following features: ";