Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3281,25 +3281,25 @@ private void configureGuestIfUefiEnabled(boolean isSecureBoot, String bootMode,
setGuestLoader(bootMode, SECURE, guest, GuestDef.GUEST_LOADER_SECURE);
setGuestLoader(bootMode, LEGACY, guest, GuestDef.GUEST_LOADER_LEGACY);

if (isUefiPropertieNotNull(GuestDef.GUEST_NVRAM_PATH)) {
if (isUefiPropertyNotNull(GuestDef.GUEST_NVRAM_PATH)) {
guest.setNvram(uefiProperties.getProperty(GuestDef.GUEST_NVRAM_PATH));
}

if (isSecureBoot && isUefiPropertieNotNull(GuestDef.GUEST_NVRAM_TEMPLATE_SECURE) && SECURE.equalsIgnoreCase(bootMode)) {
if (isSecureBoot && isUefiPropertyNotNull(GuestDef.GUEST_NVRAM_TEMPLATE_SECURE) && SECURE.equalsIgnoreCase(bootMode)) {
guest.setNvramTemplate(uefiProperties.getProperty(GuestDef.GUEST_NVRAM_TEMPLATE_SECURE));
} else if (isUefiPropertieNotNull(GuestDef.GUEST_NVRAM_TEMPLATE_LEGACY)) {
} else if (isUefiPropertyNotNull(GuestDef.GUEST_NVRAM_TEMPLATE_LEGACY)) {
guest.setNvramTemplate(uefiProperties.getProperty(GuestDef.GUEST_NVRAM_TEMPLATE_LEGACY));
}
}

private void setGuestLoader(String bootMode, String mode, GuestDef guest, String propertie) {
if (isUefiPropertieNotNull(propertie) && mode.equalsIgnoreCase(bootMode)) {
guest.setLoader(uefiProperties.getProperty(propertie));
private void setGuestLoader(String bootMode, String mode, GuestDef guest, String property) {
if (isUefiPropertyNotNull(property) && mode.equalsIgnoreCase(bootMode)) {
guest.setLoader(uefiProperties.getProperty(property));
}
}

private boolean isUefiPropertieNotNull(String propertie) {
return uefiProperties.getProperty(propertie) != null;
private boolean isUefiPropertyNotNull(String property) {
return uefiProperties.getProperty(property) != null;
}

public boolean isGuestAarch64() {
Expand Down
Loading