From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH v13 qemu-server 4/8] clone disk: also clone EFI disk from snapshot
Date: Mon, 04 Apr 2022 16:58:19 +0200 [thread overview]
Message-ID: <1648805668.1mco8c9jev.astroid@nora.none> (raw)
In-Reply-To: <<20220317113107.60466-5-f.ebner@proxmox.com>
On March 17, 2022 12:31 pm, Fabian Ebner wrote:
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>
> New in v13.
>
> Dependency bump for QEMU 6.2 needed for qemu-img dd's -l option.
as discussed off-list - I'd prefer to version-guard the adding of the
`-l` part for a while, it's already conditional, and we probably want
users encountering issues with 6.2 to be able to downgrade to 6.1 ;)
likely bumping the versioned dep to 6 might be a good idea in any case?
>
> PVE/QemuServer.pm | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 907cfc09..a24309d2 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -7662,14 +7662,18 @@ sub clone_disk {
> # the relevant data on the efidisk may be smaller than the source
> # e.g. on RBD/ZFS, so we use dd to copy only the amount
> # that is given by the OVMF_VARS.fd
> - my $src_path = PVE::Storage::path($storecfg, $drive->{file});
> + my $src_path = PVE::Storage::path($storecfg, $drive->{file}, $snapname);
> my $dst_path = PVE::Storage::path($storecfg, $newvolid);
>
> + my $src_format = (PVE::Storage::parse_volname($storecfg, $drive->{file}))[6];
> +
> # better for Ceph if block size is not too small, see bug #3324
> my $bs = 1024*1024;
>
> - run_command(['qemu-img', 'dd', '-n', '-O', $dst_format, "bs=$bs", "osize=$size",
> - "if=$src_path", "of=$dst_path"]);
> + my $cmd = ['qemu-img', 'dd', '-n', '-O', $dst_format];
> + push $cmd->@*, '-l', $snapname if $src_format eq 'qcow2' && $snapname;
> + push $cmd->@*, "bs=$bs", "osize=$size", "if=$src_path", "of=$dst_path";
> + run_command($cmd);
> } else {
> qemu_img_convert($drive->{file}, $newvolid, $size, $snapname, $sparseinit);
> }
> --
> 2.30.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
next prev parent reply other threads:[~2022-04-04 14:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-17 11:30 [pve-devel] [PATCH-SERIES v13 qemu-server/manager] API for disk import and OVF Fabian Ebner
2022-03-17 11:30 ` [pve-devel] [PATCH v13 qemu-server 1/8] clone disk: assert that drive name is the same for drive-mirror on single VM Fabian Ebner
2022-03-17 11:31 ` [pve-devel] [PATCH v13 qemu-server 2/8] clone disk: move check against cloning TPM state of running VM to beginning Fabian Ebner
2022-03-17 11:31 ` [pve-devel] [PATCH v13 qemu-server 3/8] api: clone vm: check against cloning running TPM state early Fabian Ebner
2022-03-17 11:31 ` [pve-devel] [PATCH v13 qemu-server 4/8] clone disk: also clone EFI disk from snapshot Fabian Ebner
[not found] ` <<20220317113107.60466-5-f.ebner@proxmox.com>
2022-04-04 14:58 ` Fabian Grünbichler [this message]
2022-03-17 11:31 ` [pve-devel] [PATCH v13 qemu-server 5/8] api: add endpoint for parsing .ovf files Fabian Ebner
2022-03-17 11:31 ` [pve-devel] [PATCH v13 qemu-server 6/8] schema: drive: use separate schema when disk allocation is possible Fabian Ebner
2022-03-17 11:31 ` [pve-devel] [PATCH v13 qemu-server 7/8] api: support VM disk import Fabian Ebner
[not found] ` <CAOKSTBvWfnXW9RUo2ddKACTgZV9Be-7d=9g8zPoduaDH=XP1Zw@mail.gmail.com>
2022-03-17 12:35 ` Thomas Lamprecht
2022-03-17 11:31 ` [pve-devel] [PATCH v13 qemu-server 8/8] api: update vm: print drive string for newly allocated/imported drives Fabian Ebner
2022-03-17 11:31 ` [pve-devel] [PATCH v13 manager 1/1] api: nodes: add readovf endpoint Fabian Ebner
2022-04-04 14:59 ` [pve-devel] applied: [PATCH-SERIES v13 qemu-server/manager] API for disk import and OVF Fabian Grünbichler
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=1648805668.1mco8c9jev.astroid@nora.none \
--to=f.gruenbichler@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox