]> git.ipfire.org Git - thirdparty/libvirt.git/commit
conf: remove duplicated firmware type attribute v7.2.0-rc2
authorDaniel P. Berrangé <berrange@redhat.com>
Mon, 29 Mar 2021 18:00:05 +0000 (19:00 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Tue, 30 Mar 2021 09:19:42 +0000 (10:19 +0100)
commita9b1375d7d2f7d240dce09c5f8b62e568e386051
tree19deef5551b5311f16bf79a39acad8d3ba407a6a
parentcadfefd3ce32d0731115baff7f79b40dfc19039c
conf: remove duplicated firmware type attribute

The

  <os firmware='efi'>
    <firmware type='efi'>
      <feature enabled='no' name='enrolled-keys'/>
    </firmware>
  </os>

repeats the firmware attribute twice. This has no functional benefit, as
evidenced by fact that we use a single struct field to store both
attributes, while needlessly introducing an error scenario. The XML can
just be simplified to:

  <os firmware='efi'>
    <firmware>
      <feature enabled='no' name='enrolled-keys'/>
    </firmware>
  </os>

which also means that we don't need to emit the empty element
<firmware type='efi'/> for all existing configs too.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
docs/formatdomain.rst
docs/schemas/domaincommon.rng
src/conf/domain_conf.c
tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml
tests/qemuxml2argvdata/os-firmware-invalid-type.xml [deleted file]
tests/qemuxml2argvtest.c
tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml
tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml
tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml
tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml
tests/vmx2xmldata/vmx2xml-firmware-efi.xml