hv/mod-irq: use arch specific header files

Requires explicit arch path name in the include directive.

The config scripts was also updated to reflect this change.

Tracked-On: #5825
Signed-off-by: Peter Fang <peter.fang@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>

misc/config_tools/board_config/board_c.py

@@ -15,9 +15,9 @@ class RDT(enum.Enum):
     MBA = 2
 
 INCLUDE_HEADER = """
-#include <board.h>
-#include <vtd.h>
-#include <msr.h>
+#include <x86/board.h>
+#include <x86/vtd.h>
+#include <x86/msr.h>
 #include <pci.h>
 #include <misc_cfg.h>
 """

misc/config_tools/scenario_config/ivshmem_cfg_h.py

@@ -95,7 +95,7 @@ def generate_file(scenario_items, config):
 
     if vm_info.shmem.shmem_enabled == 'y':
         print("#include <ivshmem.h>", file=config)
-        print("#include <pgtable.h>", file=config)
+        print("#include <x86/pgtable.h>", file=config)
         write_shmem_regions(config)
 
     print("{0}".format(IVSHMEM_END_DEFINE), file=config)

misc/config_tools/scenario_config/pci_dev_c.py

@@ -123,12 +123,12 @@ def generate_file(vm_info, config):
 
     print("{}".format(scenario_cfg_lib.HEADER_LICENSE), file=config)
     print("", file=config)
-    print("#include <vm_config.h>", file=config)
+    print("#include <x86/vm_config.h>", file=config)
     print("#include <pci_devices.h>", file=config)
     print("#include <vpci.h>", file=config)
     print("#include <vbar_base.h>", file=config)
-    print("#include <mmu.h>", file=config)
-    print("#include <page.h>", file=config)
+    print("#include <x86/mmu.h>", file=config)
+    print("#include <x86/page.h>", file=config)
     if pci_vuart_enabled:
         print("#include <vmcs9900.h>", file=config)
     # Insert header for share memory
@@ -306,4 +306,4 @@ def generate_file(vm_info, config):
                 print("\t},", file=config)
 
         # Insert the end bracket of the pci_dev.c file
-        print("};", file=config)
+        print("};", file=config)

misc/config_tools/scenario_config/pt_intx_c.py

@@ -17,7 +17,7 @@ def generate_file(vm_info, config):
 
     print("{}".format(scenario_cfg_lib.HEADER_LICENSE), file=config)
     print("", file=config)
-    print("#include <vm_config.h>", file=config)
+    print("#include <x86/vm_config.h>", file=config)
     print("", file=config)
 
     if (board_cfg_lib.is_matched_board(("ehl-crb-b"))

misc/config_tools/scenario_config/vm_configurations_c.py

@@ -9,9 +9,9 @@ import board_cfg_lib
 import scenario_cfg_lib
 
 C_HEADER = scenario_cfg_lib.HEADER_LICENSE + r"""
-#include <vm_config.h>
+#include <x86/vm_config.h>
 #include <vuart.h>
-#include <pci_dev.h>
+#include <x86/pci_dev.h>
 """
 
 def get_pre_vm_type(vm_type, vm_i):

misc/hv_prebuild/static_checks.c

@@ -6,9 +6,9 @@
 
 #include <util.h>
 #include <acrn_common.h>
-#include <vcpu.h>
-#include <mmu.h>
-#include <trusty.h>
+#include <x86/guest/vcpu.h>
+#include <x86/mmu.h>
+#include <x86/guest/trusty.h>
 
 #define CAT__(A,B) A ## B
 #define CAT_(A,B) CAT__(A,B)

misc/hv_prebuild/vm_cfg_checks.c

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bits.h>
-#include <page.h>
-#include <vm_config.h>
-#include <rdt.h>
+#include <x86/lib/bits.h>
+#include <x86/page.h>
+#include <x86/vm_config.h>
+#include <x86/rdt.h>
 #include <vuart.h>
 #include <ivshmem.h>
 #include <vmcs9900.h>