github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-23 10:19:31 +00:00
Code Issues Projects Releases Wiki Activity

config_tools: remove DM_OWNED_GUEST_FLAG_MASK

Browse Source 
Because it is not configurable, config tool might not need to
define DM_OWNED_GUEST_FLAG_MASK. So we remove it in tool.

Tracked-On: #6366
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
This commit is contained in:
Kunhui-Li 2021-11-22 10:19:38 +08:00 committed by wenlingz
parent bded332620
commit 07abcf9e77
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc/config_tools/scenario_config/vm_configurations_h.py
View File

@ -82,20 +82,6 @@ def gen_header_file(scenario_items, config):
gen_sos_header(scenario_items, config) gen_sos_header(scenario_items, config)
def get_dm_owned_guest_flag_mask(vm_info, config):
print("", file=config)
if "SERVICE_VM" not in common.VM_TYPES.values():
print("#define DM_OWNED_GUEST_FLAG_MASK 0UL", file=config)
else:
print("/* Bits mask of guest flags that can be programmed by device model." +
" Other bits are set by hypervisor only */", file=config)
print("#define DM_OWNED_GUEST_FLAG_MASK " +
"(GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | \\\n" +
"\t\t\t\t\t\tGUEST_FLAG_RT | GUEST_FLAG_IO_COMPLETION_POLLING)", file=config)
print("", file=config)
def generate_file(scenario_items, config): def generate_file(scenario_items, config):
""" """
Start to generate vm_configurations.h Start to generate vm_configurations.h
@ -108,7 +94,6 @@ def generate_file(scenario_items, config):
print("#include <misc_cfg.h>", file=config) print("#include <misc_cfg.h>", file=config)
print("#include <pci_devices.h>", file=config) print("#include <pci_devices.h>", file=config)
scenario_vm_num(scenario_items, config) scenario_vm_num(scenario_items, config)
get_dm_owned_guest_flag_mask(vm_info, config)
gen_header_file(scenario_items, config) gen_header_file(scenario_items, config)
print("{0}".format(VM_END_DEFINE), file=config) print("{0}".format(VM_END_DEFINE), file=config)

14
misc/config_tools/xforms/vm_configurations.h.xsl
View File

@ -31,7 +31,6 @@
<xsl:template match="config-data/acrn-config"> <xsl:template match="config-data/acrn-config">
<xsl:call-template name="vm_count" /> <xsl:call-template name="vm_count" />
<xsl:call-template name="dm_guest_flag" />
<xsl:call-template name="pre_launched_vm_hpa" /> <xsl:call-template name="pre_launched_vm_hpa" />
<xsl:call-template name="sos_vm_bootarges" /> <xsl:call-template name="sos_vm_bootarges" />
</xsl:template> </xsl:template>
@ -45,19 +44,6 @@
<xsl:value-of select="acrn:define('CONFIG_MAX_VM_NUM', hv/CAPACITIES/MAX_VM_NUM , 'U')" /> <xsl:value-of select="acrn:define('CONFIG_MAX_VM_NUM', hv/CAPACITIES/MAX_VM_NUM , 'U')" />
</xsl:template> </xsl:template>
<xsl:template name ="dm_guest_flag">
<xsl:choose>
<xsl:when test="count(vm[vm_type='SERVICE_VM'])">
<xsl:value-of select="acrn:comment('Bitmask of guest flags that can be programmed by device model. Other bits are set by hypervisor only.')" />
<xsl:value-of select="$newline" />
<xsl:value-of select="acrn:define('DM_OWNED_GUEST_FLAG_MASK', '(GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | GUEST_FLAG_RT | GUEST_FLAG_IO_COMPLETION_POLLING)', '')" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="acrn:define('DM_OWNED_GUEST_FLAG_MASK', '0', 'UL')" />
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name ="sos_vm_bootarges"> <xsl:template name ="sos_vm_bootarges">
<xsl:if test="count(vm[vm_type='SERVICE_VM'])"> <xsl:if test="count(vm[vm_type='SERVICE_VM'])">
<xsl:value-of select="acrn:comment(concat('SERVICE_VM == VM', vm[vm_type='SERVICE_VM']/@id))" /> <xsl:value-of select="acrn:comment(concat('SERVICE_VM == VM', vm[vm_type='SERVICE_VM']/@id))" />