Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions src/vmaware.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11283,15 +11283,6 @@ struct VM {
#endif
constexpr u32 random_msr = 0xDEADBEEFu;

struct range {
u32 start;
u32 end;
};
static constexpr range ranges[] = {
{ 0x40000000u, 0x400000FFu },
{ 0x4B564D00u, 0x4B564DFFu }
};

auto try_read = [](u32 msr_index) -> bool {
#if (MSVC)
unsigned __int64 value = 0;
Expand Down Expand Up @@ -11339,26 +11330,6 @@ struct VM {
debug("MSR: Detected hypervisor not correctly handling #GP");
return true;
}
for (size_t r = 0; r < (sizeof(ranges) / sizeof(ranges[0])); ++r) {
const u32 s = ranges[r].start;
const u32 e = ranges[r].end;
for (u32 i = s; i != e + 1u; ++i) {
if (try_read(i)) {
if (s == 0x40000000u && e == 0x400000FFu) {
debug("MSR: Detected Hyper-V VM");
return core::add(brands::HYPERV);
}
else if (s == 0x4B564D00u && e == 0x4B564DFFu) {
debug("MSR: Detected KVM");
return core::add(brands::KVM);
}
else {
debug("MSR: Detected readable MSR index: 0x", std::hex, i, std::dec, '\n');
return true;
}
}
}
}

return false;
}
Expand Down
Loading