Skip to content

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

Open
zstack-robot-1 wants to merge 1 commit into5.5.12from
sync/zstackio/revert-e2e0f8fc
Open

Revert "Merge branch 'fix/ZSTAC-81735@@2' into '5.5.12'"#3681
zstack-robot-1 wants to merge 1 commit into5.5.12from
sync/zstackio/revert-e2e0f8fc

Conversation

@zstack-robot-1
Copy link
Copy Markdown
Collaborator

This reverts merge request !9517

sync from gitlab !9542

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 3, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: http://open.zstack.ai:20001/code-reviews/zstack-cloud.yaml (via .coderabbit.yaml)

Review profile: CHILL

Plan: Pro

Run ID: 648dedf0-427c-41cf-bc0d-d2eb6b11ffe2

📥 Commits

Reviewing files that changed from the base of the PR and between e2e0f8f and 507f938.

📒 Files selected for processing (2)
  • plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java
  • plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java
💤 Files with no reviewable changes (2)
  • plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java
  • plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java

概览

从 KVMAgentCommands.StartVmCmd 类中删除了已标记为版本 5.5.12 的 guestOsType 字段及其 getter/setter 方法,并在 KVMHost.startVm() 中移除了对应的字段设置调用。

变更

变更内容 / 文件 摘要
字段和方法删除
plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java
删除了 StartVmCmd 类中的 guestOsType 私有字段(带 @GrayVersion("5.5.12") 注解)、getGuestOsType() 方法和 setGuestOsType(String) 方法。
命令设置调用删除
plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java
在 startVm() 方法中移除了 cmd.setGuestOsType() 的调用,其他命令构建和执行流程保持不变。

评估代码审查工作量

🎯 2 (Simple) | ⏱️ ~8 分钟

🐰 旧字段已褪去,版本渐远离,
StartVmCmd 更轻盈,代码焕新生,
GuestOsType 再见吧,清理代码净如水,
向后兼容已完成,质量稳步升——


Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error)

Check name Status Explanation Resolution
Title check ❌ Error 标题不符合要求的格式,应遵循[scope]: 的模式(例如'fix[core]: Fix config bug'),且长度应在72字符以内。 请修改标题为符合[scope]: 格式的描述,例如'revert[kvm]: Revert guestOsType field removal',确保清晰表达变更意图。
✅ Passed checks (2 passed)
Check name Status Explanation
Description check ✅ Passed 描述与变更集相关,说明这是对之前合并请求的回滚,与代码删除的guestOsType字段的回滚一致。
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch sync/zstackio/revert-e2e0f8fc

Comment @coderabbitai help to get the list of available commands and usage tips.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant