all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server] clone disk: add version guard for qemu-img dd's -l option
Date: Tue,  5 Apr 2022 10:22:14 +0200	[thread overview]
Message-ID: <20220405082214.15054-1-f.ebner@proxmox.com> (raw)

It's only available since QEMU 6.2 and doing a check here rather than
bumping the package dependency allows for easy downgrades.

Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 PVE/QemuServer.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index eb2db42a..d7f4befc 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -7708,7 +7708,12 @@ sub clone_disk {
 		my $bs = 1024*1024;
 
 		my $cmd = ['qemu-img', 'dd', '-n', '-O', $dst_format];
-		push $cmd->@*, '-l', $snapname if $src_format eq 'qcow2' && $snapname;
+
+		if ($src_format eq 'qcow2' && $snapname) {
+		    die "cannot clone qcow2 EFI disk snapshot - requires QEMU >= 6.2\n"
+			if !min_version(kvm_user_version(), 6, 2);
+		    push $cmd->@*, '-l', $snapname;
+		}
 		push $cmd->@*, "bs=$bs", "osize=$size", "if=$src_path", "of=$dst_path";
 		run_command($cmd);
 	    } else {
-- 
2.30.2





             reply	other threads:[~2022-04-05  8:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-05  8:22 Fabian Ebner [this message]
2022-04-06 15:42 ` [pve-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220405082214.15054-1-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal