From 1843cb85c781c91c288ff5b89dec0cb41fe8e5cb Mon Sep 17 00:00:00 2001 From: Requiem <114197630+NotRequiem@users.noreply.github.com> Date: Tue, 1 Apr 2025 23:29:09 +0200 Subject: [PATCH 1/2] fixed typo --- src/cli.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli.cpp b/src/cli.cpp index 6a913ea1..b6d63dad 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -603,7 +603,7 @@ std::string vm_description(const std::string& vm_brand) { { brands::QEMU_KVM, "QEMU (a free and open-source emulator that uses dynamic binary translation to emulate a computer's processor) is being used with Kernel-based Virtual Machine (KVM, a free and open source module of the Linux kernel) to emulate hardware at near-native speeds." }, { brands::KVM_HYPERV, "KVM-HyperV integration allows Linux KVM hosts to expose Hyper-V-compatible paravirtualization interfaces to Windows guests. Enables performance optimizations like enlightened VMCS (Virtual Machine Control Structure) and TSC (Time Stamp Counter) synchronization, reducing overhead for Windows VMs running on Linux hypervisors." }, { brands::QEMU_KVM_HYPERV, "A QEMU/KVM virtual machine with Hyper-V enlightenments. These features make Windows and Hyper-V guests think they’re running on top of a Hyper-V compatible hypervisor and use Hyper-V specific features." }, - { brands::HYPERV, "Hyper-V is Microsoft's proprietary native hypervisor that can create x86 VMs on Windows. Released in 2008, it supercedes previous virtualization solutions such as Microsoft Virtual Server and Windows VirtualPC. Hyper-V uses partitioning to isolate the guest OSs, and has \"enlightenment\" features for bypassing device emulation layers, allowing for faster execution including when Windows is virtualization on Linux." }, + { brands::HYPERV, "Hyper-V is Microsoft's proprietary native hypervisor that can create x86 VMs on Windows. Released in 2008, it supercedes previous virtualization solutions such as Microsoft Virtual Server and Windows VirtualPC. Hyper-V uses partitioning to isolate the guest OSs, and has \"enlightenment\" features for bypassing device emulation layers, allowing for faster execution including when Windows is virtualized on Linux." }, { brands::HYPERV_VPC, "Either Hyper-V or VirtualPC were detected. Hyper-V is Microsoft's proprietary native hypervisor that can create x86 VMs on Windows. Virtual PC is a discontinued x86 emulator software for Microsoft Windows hosts and PowerPC-based Mac hosts." }, { brands::PARALLELS, "Parallels is a hypervisor providing hardware virtualization for Mac computers. It was released in 2006 and is developed by Parallels, a subsidiary of Corel. It is a hardware emulation virtualization software, using hypervisor technology that works by mapping the host computer's hardware resources directly to the VM's resources. Each VM thus operates with virtually all the resources of a physical computer." }, { brands::XEN, "Xen is a free and open-source type 1 hypervisor. Originally developed by the University of Cambridge Computer Laboratory and is now being developed by the Linux Foundation with support from Intel, Arm Ltd, Huawei, AWS, Alibaba Cloud, AMD, and more. It runs in a more privileged CPU state than any other software on the machine, except for firmware. It uses GNU GRUB as its bootloader, and then loads a paravirtualized host OS into the host domain (dom0)." }, From 59a47547589681aa813fc00f55af1e5f73e38eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-=C3=89tienne=20Messier?= Date: Tue, 1 Apr 2025 21:29:47 -0400 Subject: [PATCH 2/2] Make sure that the library compiles on Windows when WIN32_LEAN_AND_MEAN is defined - Added missing winioctl.h for STORAGE_PROPERTY_QUERY and IOCTL_STORAGE_PROPERTY_QUERY - CLI now compiles with with WIN32_LEAN_AND_MEAN to make sure this won't break in the future --- src/cli.cpp | 1 + src/vmaware.hpp | 1 + src/vmaware_MIT.hpp | 1 + 3 files changed, 3 insertions(+) diff --git a/src/cli.cpp b/src/cli.cpp index b6d63dad..9e328772 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -36,6 +36,7 @@ #if (defined(_MSC_VER) || defined(_WIN32) || defined(_WIN64) || defined(__MINGW32__)) #define WINDOWS 1 + #define WIN32_LEAN_AND_MEAN #include #else #define WINDOWS 0 diff --git a/src/vmaware.hpp b/src/vmaware.hpp index 452f085e..13a9a2ba 100644 --- a/src/vmaware.hpp +++ b/src/vmaware.hpp @@ -351,6 +351,7 @@ #include #include #include +#include #include #include #include diff --git a/src/vmaware_MIT.hpp b/src/vmaware_MIT.hpp index b317fe0f..ce78d02b 100644 --- a/src/vmaware_MIT.hpp +++ b/src/vmaware_MIT.hpp @@ -373,6 +373,7 @@ #include #include #include +#include #include #include #include