From 1cfaee396a91adbf494b8b52d4cd975a62970107 Mon Sep 17 00:00:00 2001 From: Chenli Wei Date: Tue, 9 Nov 2021 10:50:40 +0800 Subject: [PATCH] hv: remove MAX_KATA_VM_NUM and CONFIG_KATA_VM Since the UUID is not a *must* set parameter for the standard post-launched VM which doesn't depend on any static VM configuration. We can remove the KATA related code from hypervisor as it belongs to such VM type. v2-->v3: separate the struce acrn_platform_info change of devicemodel v1-->v2: update the subject and commit msg Tracked-On:#6685 Signed-off-by: Chenli Wei Reviewed-by: Wang, Yu1 --- hypervisor/common/hypercall.c | 1 - hypervisor/include/arch/x86/asm/vm_config.h | 3 --- hypervisor/include/public/acrn_hv_defs.h | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hypervisor/common/hypercall.c b/hypervisor/common/hypercall.c index f82cda3d1..6fc18a671 100644 --- a/hypervisor/common/hypercall.c +++ b/hypervisor/common/hypercall.c @@ -214,7 +214,6 @@ int32_t hcall_get_platform_info(struct acrn_vcpu *vcpu, __unused struct acrn_vm pi.hw.cpu_num = pcpu_nums; pi.hw.version = 0x100; /* version 1.0; byte[1:0] = major:minor version */ pi.sw.max_vcpus_per_vm = MAX_VCPUS_PER_VM; - pi.sw.max_kata_containers = CONFIG_MAX_KATA_VM_NUM; pi.sw.max_vms = CONFIG_MAX_VM_NUM; pi.sw.vm_config_size = entry_size; diff --git a/hypervisor/include/arch/x86/asm/vm_config.h b/hypervisor/include/arch/x86/asm/vm_config.h index a9c9b1514..edd1a1019 100644 --- a/hypervisor/include/arch/x86/asm/vm_config.h +++ b/hypervisor/include/arch/x86/asm/vm_config.h @@ -52,9 +52,6 @@ #define CONFIG_POST_RT_VM .load_order = POST_LAUNCHED_VM, \ .severity = SEVERITY_RTVM -#define CONFIG_KATA_VM .load_order = POST_LAUNCHED_VM, \ - .severity = SEVERITY_STANDARD_VM - /* ACRN guest severity */ enum acrn_vm_severity { SEVERITY_SAFETY_VM = 0x40U, diff --git a/hypervisor/include/public/acrn_hv_defs.h b/hypervisor/include/public/acrn_hv_defs.h index 752adc452..d8a1136d7 100644 --- a/hypervisor/include/public/acrn_hv_defs.h +++ b/hypervisor/include/public/acrn_hv_defs.h @@ -337,10 +337,8 @@ struct acrn_platform_info { */ uint64_t vm_configs_addr; - /** Maximum Kata container number in Service VM */ - uint64_t max_kata_containers; /** Align the size of Configuration info to 128Bytes. */ - uint8_t reserved[104]; + uint8_t reserved[112]; } sw; } __aligned(8);