Skip to content

Fix Qemu probes for disk format and zero-byte skipping support #14272

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
sureshanaparti wants to merge 3 commits into
base: 4.22
Choose a base branch
from
+13 −3
Open

Fix Qemu probes for disk format and zero-byte skipping support #14272

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9966f3a
utils.qemu - use qemu-img convert-based check for --target-is-zero su…
Tristan971 Sep 25, 2026
e4e8088
utils.qemu - use create-based disk format support detection
Tristan971 Sep 25, 2026
eef39c8
Fix comments and command syntax in QemuImg.java
sureshanaparti Sep 29, 2026
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
16 changes: 13 additions & 3 deletions plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ public enum BitmapOperation {

/**
* Create a QemuImg object that supports skipping target zeroes
* We detect this support via qemu-img help since support can
* be backported rather than found in a specific version.
* We detect this support via qemu-img convert --help since support
* can be backported rather than found in a specific version.
*
* @param timeout script timeout, default 0
* @param skipZeroIfSupported Don't write zeroes to target device during convert, if supported by qemu-img
Expand All @@ -132,7 +132,7 @@ public enum BitmapOperation {
public QemuImg(final long timeout, final boolean skipZeroIfSupported, final boolean noCache) throws LibvirtException {
if (skipZeroIfSupported) {
final Script s = new Script(_qemuImgPath, timeout);
s.add("--help");
s.add("convert", "--help");

@Damans227 Damans227 Oct 15, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

main already checks this flag a different way since #14256. should this match it so the forward merge doesnt conflict?


final OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
final String result = s.execute(parser);
Expand Down Expand Up @@ -911,6 +911,16 @@ public void setSkipTargetVolumeCreation(boolean skipTargetVolumeCreation) {
}

public boolean supportsImageFormat(QemuImg.PhysicalDiskFormat format) {
// qemu-img create -f $format -o help
// - prints supported format options with rc=0 on known format, and
// - error message with rc=1 on unsupported format
final Script createProbe = new Script(_qemuImgPath, timeout);
createProbe.add("create", "-f", format.toString(), "-o", "help");

@Damans227 Damans227 Oct 15, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this still needed? #13587 already handles the new help header on 4.22, and the current check finds qcow2 in the 10.x output from the description

String createProbeResult = createProbe.execute(new OutputInterpreter.AllLinesParser());
if (createProbeResult == null) {
return true;
}

final Script s = new Script(_qemuImgPath, timeout);
s.add("--help");

Expand Down
Loading