openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cli: support --boot loader.stateless= 

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2022-10-17 11:54:37 -04:00
parent 1d64a678d3
commit 15ddeae6cb
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/data/cli/compare/virt-install-singleton-config-2.xml
View File

@ -11,7 +11,7 @@
<vcpu cpuset="1,3-5">2</vcpu> <vcpu cpuset="1,3-5">2</vcpu>
<os> <os>
<type arch="x86_64" machine="q35">hvm</type> <type arch="x86_64" machine="q35">hvm</type>
<loader readonly="yes" secure="no" type="rom">/tmp/foo</loader> <loader readonly="yes" secure="no" type="rom" stateless="yes">/tmp/foo</loader>
<smbios mode="emulate"/> <smbios mode="emulate"/>
<boot dev="network"/> <boot dev="network"/>
<boot dev="hd"/> <boot dev="hd"/>
@ -112,7 +112,7 @@
<vcpu cpuset="1,3-5">2</vcpu> <vcpu cpuset="1,3-5">2</vcpu>
<os> <os>
<type arch="x86_64" machine="q35">hvm</type> <type arch="x86_64" machine="q35">hvm</type>
<loader readonly="yes" secure="no" type="rom">/tmp/foo</loader> <loader readonly="yes" secure="no" type="rom" stateless="yes">/tmp/foo</loader>
<boot dev="hd"/> <boot dev="hd"/>
<smbios mode="emulate"/> <smbios mode="emulate"/>
</os> </os>

2
tests/test_cli.py
View File

@ -832,7 +832,7 @@ c.add_compare("--pxe "
"--cpuset 1,3-5 " # setting compat --cpuset when --vcpus is not present "--cpuset 1,3-5 " # setting compat --cpuset when --vcpus is not present
# --boot loader settings here, or they will conflict with firmware=efi # --boot loader settings here, or they will conflict with firmware=efi
# in other test cases # in other test cases
"--boot loader_ro=yes,loader.type=rom,loader=/tmp/foo,loader_secure=no " "--boot loader_ro=yes,loader.type=rom,loader=/tmp/foo,loader_secure=no,loader.stateless=yes"
# 'default' handling for solo devices # 'default' handling for solo devices
""" """

1
virtinst/cli.py
View File

@ -2861,6 +2861,7 @@ class ParserBoot(VirtCLIParser):
cls.add_arg("loader.readonly", "loader_ro", is_onoff=True) cls.add_arg("loader.readonly", "loader_ro", is_onoff=True)
cls.add_arg("loader.type", "loader_type") cls.add_arg("loader.type", "loader_type")
cls.add_arg("loader.secure", "loader_secure", is_onoff=True) cls.add_arg("loader.secure", "loader_secure", is_onoff=True)
cls.add_arg("loader.stateless", "loader_stateless", is_onoff=True)
# Guest-Based bootloader options # Guest-Based bootloader options
cls.add_arg("firmware", "firmware") cls.add_arg("firmware", "firmware")

2
virtinst/domain/os.py
View File

@ -86,6 +86,7 @@ class DomainOs(XMLBuilder):
_XML_PROP_ORDER = [ _XML_PROP_ORDER = [
"firmware", "os_type", "arch", "machine", "firmware_features", "firmware", "os_type", "arch", "machine", "firmware_features",
"loader", "loader_ro", "loader_secure", "loader_type", "loader", "loader_ro", "loader_secure", "loader_type",
"loader_stateless",
"nvram", "nvram_template", "nvram", "nvram_template",
"init", "initargs", "initenvs", "initdir", "inituser", "initgroup", "init", "initargs", "initenvs", "initdir", "inituser", "initgroup",
"kernel", "initrd", "kernel_args", "dtb", "acpi_tb", "acpi_tb_type", "kernel", "initrd", "kernel_args", "dtb", "acpi_tb", "acpi_tb_type",
@ -100,6 +101,7 @@ class DomainOs(XMLBuilder):
loader_ro = XMLProperty("./loader/@readonly", is_yesno=True) loader_ro = XMLProperty("./loader/@readonly", is_yesno=True)
loader_type = XMLProperty("./loader/@type") loader_type = XMLProperty("./loader/@type")
loader_secure = XMLProperty("./loader/@secure", is_yesno=True) loader_secure = XMLProperty("./loader/@secure", is_yesno=True)
loader_stateless = XMLProperty("./loader/@stateless", is_yesno=True)
# BIOS bootloader options # BIOS bootloader options
def _get_bootorder(self): def _get_bootorder(self):