Skip to content

sync dev #346

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.

Sign up for GitHub

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

Merged
NotRequiem merged 9 commits into from
Apr 17, 2025
Merged

sync dev #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
146c905
Merge pull request #339 from kernelwernel/dev
NotRequiem Apr 13, 2025
2db12d5
Merge QEMU_GA with VM_PROCESSES
dmfrpro Apr 14, 2025
ae8021a
Add Looking Glass & VirtualDisplayDriver processes check
dmfrpro Apr 14, 2025
78718ee
Merge pull request #340 from dmfrpro/vm_processes
kernelwernel Apr 14, 2025
944263f
Revert "Refactoring & Looking Glass detection"
kernelwernel Apr 14, 2025
df0b228
Merge pull request #341 from kernelwernel/revert-340-vm_processes
kernelwernel Apr 14, 2025
ffc45ad
Merge pull request #344 from kernelwernel/dev
NotRequiem Apr 17, 2025
47c38f4
Add QEMU fw_cfg to ACPI scan & fix typos in FIRMWARE_SCAN
dmfrpro Apr 17, 2025
5c56b32
Merge pull request #345 from dmfrpro/fwcf
NotRequiem Apr 17, 2025
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: 16 additions & 13 deletions src/vmaware.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
*
*
* ============================== SECTIONS ==================================
* - enums for publicly accessible techniques => line 551
* - enums for publicly accessible techniques => line 550
* - struct for internal cpu operations => line 734
* - struct for internal memoization => line 1206
* - struct for internal utility functions => line 1330
* - struct for internal core components => line 9946
* - start of VM detection technique list => line 2357
* - start of public VM detection functions => line 10610
* - start of externally defined variables => line 11549
* - struct for internal memoization => line 1205
* - struct for internal utility functions => line 1329
* - struct for internal core components => line 9948
* - start of VM detection technique list => line 2356
* - start of public VM detection functions => line 10612
* - start of externally defined variables => line 11551
*
*
* ============================== EXAMPLE ===================================
Expand Down Expand Up @@ -9379,8 +9379,8 @@ struct VM {

constexpr const char* targets[] = {
"Parallels Software International", "Parallels(R)", "innotek",
"Oracle", "VirtualBox", "VS2005R2", "VMware, Inc.",
"VMware", "VMWARE", "S3 Corp.", "Virtual Machine", "Qemu", "vbox",
"Oracle", "VirtualBox", "vbox", "VBOX", "VS2005R2", "VMware, Inc.",
"VMware", "VMWARE", "S3 Corp.", "Virtual Machine", "QEMU", "FWCF",
"WAET", "BOCHS", "BXPC"
};

Expand Down Expand Up @@ -9442,7 +9442,8 @@ struct VM {
strcmp(target, "VMware") == 0 ||
strcmp(target, "VMWARE") == 0)
brand = brands::VMWARE;
else if (strcmp(target, "Qemu") == 0)
else if (strcmp(target, "QEMU") == 0 ||
strcmp(target, "FWCF") == 0)
brand = brands::QEMU;
else if (strcmp(target, "BOCHS") == 0 ||
strcmp(target, "BXPC") == 0)
Expand Down Expand Up @@ -9589,8 +9590,9 @@ struct VM {
// Same targets as the Windows branch but without "WAET"
constexpr const char* targets[] = {
"Parallels Software International", "Parallels(R)", "innotek",
"Oracle", "VirtualBox", "VS2005R2", "VMware, Inc.",
"VMware", "S3 Corp.", "Virtual Machine", "Qemu", "vbox", "BOCHS", "BXPC"
"Oracle", "VirtualBox", "vbox", "VBOX", "VS2005R2", "VMware, Inc.",
"VMware", "VMWARE", "S3 Corp.", "Virtual Machine", "QEMU", "FWCF",
"BOCHS", "BXPC"
};

struct dirent* entry;
Expand Down Expand Up @@ -9658,7 +9660,8 @@ struct VM {
strcmp(target, "VMWARE") == 0) {
brand = brands::VMWARE;
}
else if (strcmp(target, "Qemu") == 0) {
else if (strcmp(target, "QEMU") == 0 ||
strcmp(target, "FWCF") == 0) {
brand = brands::QEMU;
}
else if (strcmp(target, "BOCHS") == 0 ||
Expand Down
Loading