]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: Don't explicitly set the secure-boot feature
authorAndrea Bolognani <abologna@redhat.com>
Wed, 15 Mar 2023 19:23:58 +0000 (20:23 +0100)
committerAndrea Bolognani <abologna@redhat.com>
Wed, 22 Mar 2023 12:49:53 +0000 (13:49 +0100)
Now that we're adding information obtained from the firmware
descriptor to the domain XML, this will happen automatically
whenever a firmware that has the enrolled-keys feature ends up
being selected.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/domain_postparse.c

index 22eb603b3b076135b23005a6855fe9bf30346308..79862a72cd2d1e391c98fcac252e09b101ccae5b 100644 (file)
@@ -101,12 +101,6 @@ virDomainDefPostParseOs(virDomainDef *def)
                            _("firmware feature 'enrolled-keys' cannot be enabled when firmware feature 'secure-boot' is disabled"));
             return -1;
         }
-
-        /* For all non-broken firmware builds, enrolled-keys implies
-         * secure-boot, and having the Secure Boot keys in the NVRAM file
-         * when the firmware doesn't support the Secure Boot feature doesn't
-         * make sense anyway. Reflect this fact explicitly in the XML */
-        def->os.firmwareFeatures[VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_SECURE_BOOT] = VIR_TRISTATE_BOOL_YES;
     }
 
     if (!def->os.loader)