From ec8af42ab3932997b3d9d9ec4b3e6b1116aa5c88 Mon Sep 17 00:00:00 2001 From: Yang Yu-chu Date: Tue, 17 Nov 2020 13:23:48 -0800 Subject: [PATCH] acrn-config: update default pci_dev.c update all default pci_dev.c under misc/vm_configs/scenarios// for non-xml compilation Tracked-On: #5425 Signed-off-by: Yang Yu-chu --- misc/vm_configs/scenarios/hybrid/ehl-crb-b/pci_dev.c | 2 ++ misc/vm_configs/scenarios/hybrid/nuc7i7dnb/pci_dev.c | 2 ++ misc/vm_configs/scenarios/hybrid/whl-ipc-i5/pci_dev.c | 2 ++ misc/vm_configs/scenarios/hybrid/whl-ipc-i7/pci_dev.c | 2 ++ misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/pci_dev.c | 5 ++++- misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/pci_dev.c | 3 +++ misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/pci_dev.c | 3 +++ misc/vm_configs/scenarios/industry/cfl-k700-i7/pci_dev.c | 2 ++ misc/vm_configs/scenarios/industry/ehl-crb-b/pci_dev.c | 2 ++ misc/vm_configs/scenarios/industry/nuc7i7dnb/pci_dev.c | 2 ++ misc/vm_configs/scenarios/industry/whl-ipc-i5/pci_dev.c | 2 ++ misc/vm_configs/scenarios/industry/whl-ipc-i7/pci_dev.c | 2 ++ 12 files changed, 28 insertions(+), 1 deletion(-) diff --git a/misc/vm_configs/scenarios/hybrid/ehl-crb-b/pci_dev.c b/misc/vm_configs/scenarios/hybrid/ehl-crb-b/pci_dev.c index 79033ec6b..90b1a6138 100644 --- a/misc/vm_configs/scenarios/hybrid/ehl-crb-b/pci_dev.c +++ b/misc/vm_configs/scenarios/hybrid/ehl-crb-b/pci_dev.c @@ -10,3 +10,5 @@ #include #include #include + +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/misc/vm_configs/scenarios/hybrid/nuc7i7dnb/pci_dev.c b/misc/vm_configs/scenarios/hybrid/nuc7i7dnb/pci_dev.c index 79033ec6b..90b1a6138 100644 --- a/misc/vm_configs/scenarios/hybrid/nuc7i7dnb/pci_dev.c +++ b/misc/vm_configs/scenarios/hybrid/nuc7i7dnb/pci_dev.c @@ -10,3 +10,5 @@ #include #include #include + +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/misc/vm_configs/scenarios/hybrid/whl-ipc-i5/pci_dev.c b/misc/vm_configs/scenarios/hybrid/whl-ipc-i5/pci_dev.c index 79033ec6b..90b1a6138 100644 --- a/misc/vm_configs/scenarios/hybrid/whl-ipc-i5/pci_dev.c +++ b/misc/vm_configs/scenarios/hybrid/whl-ipc-i5/pci_dev.c @@ -10,3 +10,5 @@ #include #include #include + +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/misc/vm_configs/scenarios/hybrid/whl-ipc-i7/pci_dev.c b/misc/vm_configs/scenarios/hybrid/whl-ipc-i7/pci_dev.c index 79033ec6b..90b1a6138 100644 --- a/misc/vm_configs/scenarios/hybrid/whl-ipc-i7/pci_dev.c +++ b/misc/vm_configs/scenarios/hybrid/whl-ipc-i7/pci_dev.c @@ -10,3 +10,5 @@ #include #include #include + +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/pci_dev.c b/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/pci_dev.c index fce9cd9c1..0aa2e98a1 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/pci_dev.c +++ b/misc/vm_configs/scenarios/hybrid_rt/cfl-k700-i7/pci_dev.c @@ -22,6 +22,7 @@ * TODO: add DEV_PCICOMMON macro to initialize emu_type, vbdf and vdev_ops * to simplify the code. */ + struct acrn_vm_pci_dev_config vm0_pci_devs[VM0_CONFIG_PCI_DEV_NUM] = { { .emu_type = PCI_DEV_TYPE_HVEMUL, @@ -36,7 +37,7 @@ struct acrn_vm_pci_dev_config vm0_pci_devs[VM0_CONFIG_PCI_DEV_NUM] = { { .emu_type = PCI_DEV_TYPE_PTDEV, .vbdf.bits = {.b = 0x00U, .d = 0x02U, .f = 0x00U}, - PTDEV(NON_VOLATILE_MEMORY_CONTROLLER_0), + PTDEV(NON_VOLATILE_MEMORY_CONTROLLER_1), }, { .emu_type = PCI_DEV_TYPE_HVEMUL, @@ -47,6 +48,8 @@ struct acrn_vm_pci_dev_config vm0_pci_devs[VM0_CONFIG_PCI_DEV_NUM] = { }, }; +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; + struct acrn_vm_pci_dev_config vm2_pci_devs[VM2_CONFIG_PCI_DEV_NUM] = { { .emu_type = PCI_DEV_TYPE_HVEMUL, 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 3cba194db..66667030e 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 @@ -22,6 +22,7 @@ * TODO: add DEV_PCICOMMON macro to initialize emu_type, vbdf and vdev_ops * to simplify the code. */ + struct acrn_vm_pci_dev_config vm0_pci_devs[VM0_CONFIG_PCI_DEV_NUM] = { { .emu_type = PCI_DEV_TYPE_HVEMUL, @@ -47,6 +48,8 @@ struct acrn_vm_pci_dev_config vm0_pci_devs[VM0_CONFIG_PCI_DEV_NUM] = { }, }; +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; + struct acrn_vm_pci_dev_config vm2_pci_devs[VM2_CONFIG_PCI_DEV_NUM] = { { .emu_type = PCI_DEV_TYPE_HVEMUL, 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 3cba194db..66667030e 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 @@ -22,6 +22,7 @@ * TODO: add DEV_PCICOMMON macro to initialize emu_type, vbdf and vdev_ops * to simplify the code. */ + struct acrn_vm_pci_dev_config vm0_pci_devs[VM0_CONFIG_PCI_DEV_NUM] = { { .emu_type = PCI_DEV_TYPE_HVEMUL, @@ -47,6 +48,8 @@ struct acrn_vm_pci_dev_config vm0_pci_devs[VM0_CONFIG_PCI_DEV_NUM] = { }, }; +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; + struct acrn_vm_pci_dev_config vm2_pci_devs[VM2_CONFIG_PCI_DEV_NUM] = { { .emu_type = PCI_DEV_TYPE_HVEMUL, diff --git a/misc/vm_configs/scenarios/industry/cfl-k700-i7/pci_dev.c b/misc/vm_configs/scenarios/industry/cfl-k700-i7/pci_dev.c index 79033ec6b..90b1a6138 100644 --- a/misc/vm_configs/scenarios/industry/cfl-k700-i7/pci_dev.c +++ b/misc/vm_configs/scenarios/industry/cfl-k700-i7/pci_dev.c @@ -10,3 +10,5 @@ #include #include #include + +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/misc/vm_configs/scenarios/industry/ehl-crb-b/pci_dev.c b/misc/vm_configs/scenarios/industry/ehl-crb-b/pci_dev.c index 79033ec6b..90b1a6138 100644 --- a/misc/vm_configs/scenarios/industry/ehl-crb-b/pci_dev.c +++ b/misc/vm_configs/scenarios/industry/ehl-crb-b/pci_dev.c @@ -10,3 +10,5 @@ #include #include #include + +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/misc/vm_configs/scenarios/industry/nuc7i7dnb/pci_dev.c b/misc/vm_configs/scenarios/industry/nuc7i7dnb/pci_dev.c index 79033ec6b..90b1a6138 100644 --- a/misc/vm_configs/scenarios/industry/nuc7i7dnb/pci_dev.c +++ b/misc/vm_configs/scenarios/industry/nuc7i7dnb/pci_dev.c @@ -10,3 +10,5 @@ #include #include #include + +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/misc/vm_configs/scenarios/industry/whl-ipc-i5/pci_dev.c b/misc/vm_configs/scenarios/industry/whl-ipc-i5/pci_dev.c index 79033ec6b..90b1a6138 100644 --- a/misc/vm_configs/scenarios/industry/whl-ipc-i5/pci_dev.c +++ b/misc/vm_configs/scenarios/industry/whl-ipc-i5/pci_dev.c @@ -10,3 +10,5 @@ #include #include #include + +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/misc/vm_configs/scenarios/industry/whl-ipc-i7/pci_dev.c b/misc/vm_configs/scenarios/industry/whl-ipc-i7/pci_dev.c index 79033ec6b..90b1a6138 100644 --- a/misc/vm_configs/scenarios/industry/whl-ipc-i7/pci_dev.c +++ b/misc/vm_configs/scenarios/industry/whl-ipc-i7/pci_dev.c @@ -10,3 +10,5 @@ #include #include #include + +struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM];