From 43670b03d57dc8e270c2e74a698a29d551cfa612 Mon Sep 17 00:00:00 2001
From: Shuang Zheng <shuang.zheng@intel.com>
Date: Tue, 15 Sep 2020 11:55:09 +0800
Subject: [PATCH] acrn-config: move source code of IVSHMEM region name to
 ivshmem_cfg.h

move MACRO of IVSHMEM region name to ivshmem_cfg.h and bug fix that
avoids multiple declarations of mem_regions in ivshmem_cfg.h

Tracked-On: #4853

Signed-off-by: Shuang Zheng <shuang.zheng@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
---
 .../scenarios/hybrid_rt/ehl-crb-b/ivshmem_cfg.h     | 13 ++++++-------
 .../scenarios/hybrid_rt/ehl-crb-b/pci_dev.c         |  2 +-
 .../scenarios/hybrid_rt/whl-ipc-i5/ivshmem_cfg.h    |  8 ++++----
 .../scenarios/hybrid_rt/whl-ipc-i5/pci_dev.c        |  2 +-
 .../scenarios/hybrid_rt/whl-ipc-i7/ivshmem_cfg.h    | 13 ++++++-------
 .../scenarios/hybrid_rt/whl-ipc-i7/pci_dev.c        |  2 +-
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/ivshmem_cfg.h b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/ivshmem_cfg.h
index 3a91f92ff..3104f28d8 100644
--- a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/ivshmem_cfg.h
+++ b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/ivshmem_cfg.h
@@ -8,7 +8,8 @@
 
 #include <ivshmem.h>
 #include <pgtable.h>
-#include <pci_devices.h>
+
+#define IVSHMEM_SHM_REGION_0	"hv:/shm_region_0"
 
 /*
  * The IVSHMEM_SHM_SIZE is the sum of all memory regions.
@@ -18,12 +19,10 @@
 #define IVSHMEM_DEV_NUM		2UL
 
 /* All user defined memory regions */
-
-struct ivshmem_shm_region mem_regions[] = {
-	{
-		.name = IVSHMEM_SHM_REGION_0,
-		.size = 0x200000UL,		/* 2M */
+#define IVSHMEM_SHM_REGIONS \
+	{ \
+		.name = IVSHMEM_SHM_REGION_0, \
+		.size = 0x200000UL,		/* 2M */ \
 	},
-};
 
 #endif /* IVSHMEM_CFG_H */
diff --git a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/pci_dev.c b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/pci_dev.c
index a6f6e2be5..3a10600a8 100644
--- a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/pci_dev.c
+++ b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/pci_dev.c
@@ -10,7 +10,7 @@
 #include <vbar_base.h>
 #include <mmu.h>
 #include <page.h>
-#include <ivshmem.h>
+#include <ivshmem_cfg.h>
 
 /*
  * TODO: remove PTDEV macro and add DEV_PRIVINFO macro to initialize pbdf for
diff --git a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/ivshmem_cfg.h b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/ivshmem_cfg.h
index 734c8801c..3104f28d8 100644
--- a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/ivshmem_cfg.h
+++ b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/ivshmem_cfg.h
@@ -8,7 +8,8 @@
 
 #include <ivshmem.h>
 #include <pgtable.h>
-#include <pci_devices.h>
+
+#define IVSHMEM_SHM_REGION_0	"hv:/shm_region_0"
 
 /*
  * The IVSHMEM_SHM_SIZE is the sum of all memory regions.
@@ -18,11 +19,10 @@
 #define IVSHMEM_DEV_NUM		2UL
 
 /* All user defined memory regions */
-
 #define IVSHMEM_SHM_REGIONS \
 	{ \
-		.name = IVSHMEM_SHM_REGION_0,\
-		.size = 0x200000UL, /* 2MB */\
+		.name = IVSHMEM_SHM_REGION_0, \
+		.size = 0x200000UL,		/* 2M */ \
 	},
 
 #endif /* IVSHMEM_CFG_H */
diff --git a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/pci_dev.c b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/pci_dev.c
index a9cde5724..3cba194db 100644
--- a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/pci_dev.c
+++ b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/pci_dev.c
@@ -10,7 +10,7 @@
 #include <vbar_base.h>
 #include <mmu.h>
 #include <page.h>
-#include <ivshmem.h>
+#include <ivshmem_cfg.h>
 
 /*
  * TODO: remove PTDEV macro and add DEV_PRIVINFO macro to initialize pbdf for
diff --git a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/ivshmem_cfg.h b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/ivshmem_cfg.h
index 3a91f92ff..3104f28d8 100644
--- a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/ivshmem_cfg.h
+++ b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/ivshmem_cfg.h
@@ -8,7 +8,8 @@
 
 #include <ivshmem.h>
 #include <pgtable.h>
-#include <pci_devices.h>
+
+#define IVSHMEM_SHM_REGION_0	"hv:/shm_region_0"
 
 /*
  * The IVSHMEM_SHM_SIZE is the sum of all memory regions.
@@ -18,12 +19,10 @@
 #define IVSHMEM_DEV_NUM		2UL
 
 /* All user defined memory regions */
-
-struct ivshmem_shm_region mem_regions[] = {
-	{
-		.name = IVSHMEM_SHM_REGION_0,
-		.size = 0x200000UL,		/* 2M */
+#define IVSHMEM_SHM_REGIONS \
+	{ \
+		.name = IVSHMEM_SHM_REGION_0, \
+		.size = 0x200000UL,		/* 2M */ \
 	},
-};
 
 #endif /* IVSHMEM_CFG_H */
diff --git a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/pci_dev.c b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/pci_dev.c
index a9cde5724..3cba194db 100644
--- a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/pci_dev.c
+++ b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/pci_dev.c
@@ -10,7 +10,7 @@
 #include <vbar_base.h>
 #include <mmu.h>
 #include <page.h>
-#include <ivshmem.h>
+#include <ivshmem_cfg.h>
 
 /*
  * TODO: remove PTDEV macro and add DEV_PRIVINFO macro to initialize pbdf for