Skip to content

Revert "Merge branch 'fix/ZSTAC-81735@@2' into '5.5.12'" #3681

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

Open
zstack-robot-1 wants to merge 1 commit into
base: 5.5.12
Choose a base branch
from
Open

Revert "Merge branch 'fix/ZSTAC-81735@@2' into '5.5.12'" #3681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2283,8 +2283,6 @@ public static class StartVmCmd extends vdiCmd implements VmAddOnsCmd {
private boolean isApplianceVm;
@GrayVersion(value = "5.0.0")
private String systemSerialNumber;
@GrayVersion(value = "5.5.12")
private String guestOsType;
@GrayVersion(value = "5.0.0")
private String bootMode;
// used when bootMode == 'UEFI'
Expand Down Expand Up @@ -2478,14 +2476,6 @@ public void setSystemSerialNumber(String systemSerialNumber) {
this.systemSerialNumber = systemSerialNumber;
}

public String getGuestOsType() {
return guestOsType;
}

public void setGuestOsType(String guestOsType) {
this.guestOsType = guestOsType;
}

public String getVmCpuModel() {
return vmCpuModel;
}
Expand Down
1 change: 0 additions & 1 deletion plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4436,7 +4436,6 @@ protected void startVm(final VmInstanceSpec spec, final NeedReplyMessage msg, fi
cmd.setAdditionalQmp(VmGlobalConfig.ADDITIONAL_QMP.value(Boolean.class));
cmd.setApplianceVm(spec.getVmInventory().getType().equals("ApplianceVm"));
cmd.setSystemSerialNumber(makeAndSaveVmSystemSerialNumber(spec.getVmInventory().getUuid()));
cmd.setGuestOsType(spec.getVmInventory().getGuestOsType());
if (!NetworkGlobalProperty.CHASSIS_ASSET_TAG.isEmpty()) {
cmd.setChassisAssetTag(NetworkGlobalProperty.CHASSIS_ASSET_TAG);
}
Expand Down