From 485d4e01ed71d3446c1da48f22bd3d7bfdc5dfd1 Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Fri, 2 Sep 2022 17:26:54 +0300
Subject: [PATCH] Kernel: Move VMWare backdoor communication code to the x86
 directory

The VMWare backdoor handling code involves many x86-specific
instructions and therefore should be in the Arch/x86 directory. This
ensures we can easily omit the code in compile-time for non-x86 builds.
---
 Kernel/{Firmware => Arch/x86}/Hypervisor/VMWareBackdoor.cpp | 2 +-
 Kernel/{Firmware => Arch/x86}/Hypervisor/VMWareBackdoor.h   | 0
 Kernel/CMakeLists.txt                                       | 3 ++-
 Kernel/Devices/HID/PS2MouseDevice.cpp                       | 2 +-
 Kernel/Devices/HID/VMWareMouseDevice.cpp                    | 2 +-
 Kernel/init.cpp                                             | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename Kernel/{Firmware => Arch/x86}/Hypervisor/VMWareBackdoor.cpp (99%)
 rename Kernel/{Firmware => Arch/x86}/Hypervisor/VMWareBackdoor.h (100%)

diff --git a/Kernel/Firmware/Hypervisor/VMWareBackdoor.cpp b/Kernel/Arch/x86/Hypervisor/VMWareBackdoor.cpp
similarity index 99%
rename from Kernel/Firmware/Hypervisor/VMWareBackdoor.cpp
rename to Kernel/Arch/x86/Hypervisor/VMWareBackdoor.cpp
index b1b78ed585..f8c67b11d0 100644
--- a/Kernel/Firmware/Hypervisor/VMWareBackdoor.cpp
+++ b/Kernel/Arch/x86/Hypervisor/VMWareBackdoor.cpp
@@ -8,9 +8,9 @@
 #include <AK/Singleton.h>
 #include <Kernel/API/MousePacket.h>
 #include <Kernel/Arch/InterruptDisabler.h>
+#include <Kernel/Arch/x86/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Debug.h>
-#include <Kernel/Firmware/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Firmware/Hypervisor/VMWareBackdoor.h b/Kernel/Arch/x86/Hypervisor/VMWareBackdoor.h
similarity index 100%
rename from Kernel/Firmware/Hypervisor/VMWareBackdoor.h
rename to Kernel/Arch/x86/Hypervisor/VMWareBackdoor.h
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 82f24f32d2..0752e2245e 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -164,7 +164,6 @@ set(KERNEL_SOURCES
     Firmware/BIOS.cpp
     Firmware/ACPI/Initialize.cpp
     Firmware/ACPI/Parser.cpp
-    Firmware/Hypervisor/VMWareBackdoor.cpp
     Firmware/MultiProcessor/Parser.cpp
     FutexQueue.cpp
     Interrupts/APIC.cpp
@@ -339,6 +338,8 @@ if ("${SERENITY_ARCH}" STREQUAL "i686" OR "${SERENITY_ARCH}" STREQUAL "x86_64")
         Arch/x86/common/SmapDisabler.cpp
         Arch/x86/common/Shutdown.cpp
 
+        Arch/x86/Hypervisor/VMWareBackdoor.cpp
+
         Arch/x86/PCI/Controller/HostBridge.cpp
         Arch/x86/PCI/Initializer.cpp
     )
diff --git a/Kernel/Devices/HID/PS2MouseDevice.cpp b/Kernel/Devices/HID/PS2MouseDevice.cpp
index 819e99b191..9b06c4fbf5 100644
--- a/Kernel/Devices/HID/PS2MouseDevice.cpp
+++ b/Kernel/Devices/HID/PS2MouseDevice.cpp
@@ -5,11 +5,11 @@
  */
 
 #include <AK/Memory.h>
+#include <Kernel/Arch/x86/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/HID/PS2MouseDevice.h>
-#include <Kernel/Firmware/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/HID/VMWareMouseDevice.cpp b/Kernel/Devices/HID/VMWareMouseDevice.cpp
index 6eda47a6ed..b059477338 100644
--- a/Kernel/Devices/HID/VMWareMouseDevice.cpp
+++ b/Kernel/Devices/HID/VMWareMouseDevice.cpp
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Arch/x86/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/HID/VMWareMouseDevice.h>
-#include <Kernel/Firmware/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index 3f5e42e8b9..b34c8ed09a 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -7,6 +7,7 @@
 #include <AK/Types.h>
 #include <Kernel/Arch/InterruptManagement.h>
 #include <Kernel/Arch/Processor.h>
+#include <Kernel/Arch/x86/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/BootInfo.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Initializer.h>
@@ -32,7 +33,6 @@
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/Firmware/ACPI/Initialize.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
-#include <Kernel/Firmware/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Graphics/Console/BootFramebufferConsole.h>
 #include <Kernel/Graphics/Console/VGATextModeConsole.h>
 #include <Kernel/Graphics/GraphicsManagement.h>