mirror of
https://github.com/projectacrn/acrn-hypervisor.git
synced 2025-09-08 12:19:06 +00:00
config tool: remove guest_flags in user interface
The concept of guest_flags is hard to understand for users. So turn guest_flags into several parameters in config tool user interface, list as below: GUEST_FLAG_LAPIC_PASSTHROUGH ---> lapic_passthrough GUEST_FLAG_IO_COMPLETION_POLLING ---> io_completion_polling GUEST_FLAG_VCAT_ENABLED ---> virtual_cat_support GUEST_FLAG_SECURE_WORLD_ENABLED ---> secure_world_support GUEST_FLAG_HIDE_MTRR ---> hide_mtrr_support GUEST_FLAG_NVMX_ENABLED ---> nested_virtualization_support GUEST_FLAG_SECURITY_VM ---> security_vm GUEST_FLAG_RT ---> vm_type(RTVM) GUEST_FLAG_TEE ---> vm_type(TEE_VM) GUEST_FLAG_REE ---> vm_type(REE_VM) In addition, HV global parameter NVMX_ENABLE is removed from user interface, when config tool detects more than one VM with nested_virtualization_support, NVMX_ENABLE is assigned as 'y' automatically. v1->v2: *Rebase on the latest xml schema checking change *Remove "all rights reserved" from the license header in guest_flags.py v2->v3: *Change the name of the new config items to CAPITAL_CASE style *Combine guest flag policy to an XPATH in guest_flags.py *Use count() to directly deduce NVMX_ENABLED in config_common.xsl and update `boolean-by-key-value` to process 'true' v3->v4: *Change the name of the new config items to lower_case style *Change guest_flag_node to allocation_vm_node in guest_flags.py *Separate value case and key case for boolean-by-key-value Tracked-On: #6690 Signed-off-by: hangliu1 <hang1.liu@linux.intel.com> Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
@@ -737,12 +737,7 @@ def gen_dsdt(board_etree, scenario_etree, allocation_etree, vm_id, dest_path):
|
||||
builder.build_value(0))))
|
||||
objects.add_object("\\", s5_object)
|
||||
|
||||
rtvm = False
|
||||
for guest_flag in scenario_etree.xpath(f"//vm[@id='{vm_id}']/guest_flags/guest_flag/text()"):
|
||||
if guest_flag == 'GUEST_FLAG_LAPIC_PASSTHROUGH':
|
||||
rtvm = True
|
||||
break
|
||||
|
||||
rtvm = bool(scenario_etree.xpath(f"//vm[@id='{vm_id}']//lapic_passthrough[text()='y']"))
|
||||
# RTVM cannot set IRQ because no INTR is sent with LAPIC PT
|
||||
if rtvm is False:
|
||||
objects.add_object("\\_SB_", pnp_uart("UAR0", 0, "COM1", 0x3f8, 4))
|
||||
|
Reference in New Issue
Block a user