Skip to content

server,kvm: detect boot options for vm import #11218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weizhouapache merged 3 commits into from
Sep 8, 2025
Merged

server,kvm: detect boot options for vm import #11218

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6f63ab
server,kvm: detect boot options for vm import
shwstppr Jul 16, 2025
6f2d2d4
Merge remote-tracking branch 'apache/4.20' into add-boot-options-impo…
shwstppr Jul 28, 2025
0eb8030
tests and changes
shwstppr Jul 28, 2025
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
36 changes: 36 additions & 0 deletions ...pervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.WatchDogDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.WatchDogDef.WatchDogAction;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.WatchDogDef.WatchDogModel;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.GuestDef;

public class LibvirtDomainXMLParser {
protected Logger logger = LogManager.getLogger(getClass());
Expand All @@ -63,6 +64,8 @@ public class LibvirtDomainXMLParser {
private LibvirtVMDef.CpuTuneDef cpuTuneDef;
private LibvirtVMDef.CpuModeDef cpuModeDef;
private String name;
private GuestDef.BootType bootType;
private GuestDef.BootMode bootMode;

public boolean parseDomainXML(String domXML) {
DocumentBuilder builder;
Expand Down Expand Up @@ -516,6 +519,14 @@ public LibvirtVMDef.CpuModeDef getCpuModeDef() {
return cpuModeDef;
}

public GuestDef.BootType getBootType() {
return bootType;
}

public GuestDef.BootMode getBootMode() {
return bootMode;
}

private void extractCpuTuneDef(final Element rootElement) {
NodeList cpuTunesList = rootElement.getElementsByTagName("cputune");
if (cpuTunesList.getLength() > 0) {
Expand Down Expand Up @@ -569,4 +580,29 @@ private void extractCpuModeDef(final Element rootElement){
}
}
}

private void extractBootDef(final Element rootElement) {
Element osElement = (Element) rootElement.getElementsByTagName("os").item(0);
if (osElement != null) {
NodeList loaderList = osElement.getElementsByTagName("loader");
if (loaderList.getLength() > 0) {
Element loader = (Element) loaderList.item(0);
String type = loader.getAttribute("type");
String secure = loader.getAttribute("secure");
if ("pflash".equalsIgnoreCase(type) || loader.getTextContent().toLowerCase().contains("uefi")) {
bootType = GuestDef.BootType.UEFI;
} else {
bootType = GuestDef.BootType.BIOS;
}
if ("yes".equalsIgnoreCase(secure)) {
bootMode = GuestDef.BootMode.SECURE;
} else {
bootMode = GuestDef.BootMode.LEGACY;
}
} else {
bootType = GuestDef.BootType.BIOS;
bootMode = GuestDef.BootMode.LEGACY;
}
}
}
}
4 changes: 2 additions & 2 deletions plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public String toString() {
}
}

enum BootType {
public enum BootType {
UEFI("UEFI"), BIOS("BIOS");

String _type;
Expand All @@ -80,7 +80,7 @@ public String toString() {
}
}

enum BootMode {
public enum BootMode {
LEGACY("LEGACY"), SECURE("SECURE");

String _mode;
Expand Down
6 changes: 6 additions & 0 deletions ...com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetUnmanagedInstancesCommandWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ private UnmanagedInstanceTO getUnmanagedInstance(LibvirtComputingResource libvir
instance.setNics(getUnmanagedInstanceNics(parser.getInterfaces()));
instance.setDisks(getUnmanagedInstanceDisks(parser.getDisks(),libvirtComputingResource, conn, domain.getName()));
instance.setVncPassword(getFormattedVncPassword(parser.getVncPasswd()));
if (parser.getBootType() != null) {
instance.setBootType(parser.getBootType().toString());
}
if (parser.getBootMode() != null) {
instance.setBootMode(parser.getBootMode().toString());
}

return instance;
} catch (Exception e) {
Expand Down
3 changes: 3 additions & 0 deletions server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,9 @@ private UserVm importVirtualMachineInternal(final UnmanagedInstanceTO unmanagedI
allDetails.put(VmDetailConstants.CPU_SPEED, String.valueOf(validatedServiceOffering.getSpeed()));
}
}
if (!template.isDeployAsIs() && unmanagedInstance.getBootType() != null) {
allDetails.put(unmanagedInstance.getBootType(), unmanagedInstance.getBootMode());
}

if (!migrateAllowed && host != null && !hostSupportsServiceOfferingAndTemplate(host, validatedServiceOffering, template)) {
throw new InvalidParameterValueException(String.format("Service offering: %s or template: %s is not compatible with host: %s of unmanaged VM: %s", serviceOffering.getUuid(), template.getUuid(), host.getUuid(), instanceName));
Expand Down
Loading