proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-09 04:54:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clone disk: allow cloning from an unused or unreferenced disk

Browse Source 
and also when source and target drivename are different. In those
cases, it is done via qemu-img convert/dd.

In preparation to allow import from existing PVE-managed disks.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2022-03-09 11:09:09 +01:00 committed by Fabian Grünbichler
parent 7344af7bf8
commit 25166060ae
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/Qemu.pm
View File

@ -3227,6 +3227,7 @@ __PACKAGE__->register_method({
my $dest_info = { my $dest_info = {
vmid => $newid, vmid => $newid,
drivename => $opt,
storage => $storage, storage => $storage,
format => $format, format => $format,
}; };
@ -3488,6 +3489,7 @@ __PACKAGE__->register_method({
my $dest_info = { my $dest_info = {
vmid => $vmid, vmid => $vmid,
drivename => $disk,
storage => $storeid, storage => $storeid,
format => $format, format => $format,
}; };

29
PVE/QemuServer.pm
View File

@ -7574,15 +7574,25 @@ sub clone_disk {
my ($storecfg, $source, $dest, $full, $newvollist, $jobs, $completion, $qga, $bwlimit) = @_; my ($storecfg, $source, $dest, $full, $newvollist, $jobs, $completion, $qga, $bwlimit) = @_;
my ($vmid, $running) = $source->@{qw(vmid running)}; my ($vmid, $running) = $source->@{qw(vmid running)};
my ($drivename, $drive, $snapname) = $source->@{qw(drivename drive snapname)}; my ($src_drivename, $drive, $snapname) = $source->@{qw(drivename drive snapname)};
my ($newvmid, $efisize) = $dest->@{qw(vmid efisize)}; my ($newvmid, $dst_drivename, $efisize) = $dest->@{qw(vmid drivename efisize)};
my ($storage, $format) = $dest->@{qw(storage format)}; my ($storage, $format) = $dest->@{qw(storage format)};
if ($src_drivename && $dst_drivename && $src_drivename ne $dst_drivename) {
die "cloning from/to EFI disk requires EFI disk\n"
if $src_drivename eq 'efidisk0' || $dst_drivename eq 'efidisk0';
die "cloning from/to TPM state requires TPM state\n"
if $src_drivename eq 'tpmstate0' || $dst_drivename eq 'tpmstate0';
}
my $newvolid; my $newvolid;
print "create " . ($full ? 'full' : 'linked') . " clone of drive ";
print "$src_drivename " if $src_drivename;
print "($drive->{file})\n";
if (!$full) { if (!$full) {
print "create linked clone of drive $drivename ($drive->{file})\n";
$newvolid = PVE::Storage::vdisk_clone($storecfg, $drive->{file}, $newvmid, $snapname); $newvolid = PVE::Storage::vdisk_clone($storecfg, $drive->{file}, $newvmid, $snapname);
push @$newvollist, $newvolid; push @$newvollist, $newvolid;
} else { } else {
@ -7592,7 +7602,6 @@ sub clone_disk {
my $dst_format = resolve_dst_disk_format($storecfg, $storeid, $volname, $format); my $dst_format = resolve_dst_disk_format($storecfg, $storeid, $volname, $format);
print "create full clone of drive $drivename ($drive->{file})\n";
my $name = undef; my $name = undef;
my $size = undef; my $size = undef;
if (drive_is_cloudinit($drive)) { if (drive_is_cloudinit($drive)) {
@ -7603,9 +7612,9 @@ sub clone_disk {
} }
$snapname = undef; $snapname = undef;
$size = PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE; $size = PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE;
} elsif ($drivename eq 'efidisk0') { } elsif ($dst_drivename eq 'efidisk0') {
$size = $efisize or die "internal error - need to specify EFI disk size\n"; $size = $efisize or die "internal error - need to specify EFI disk size\n";
} elsif ($drivename eq 'tpmstate0') { } elsif ($dst_drivename eq 'tpmstate0') {
$dst_format = 'raw'; $dst_format = 'raw';
$size = PVE::QemuServer::Drive::TPMSTATE_DISK_SIZE; $size = PVE::QemuServer::Drive::TPMSTATE_DISK_SIZE;
} else { } else {
@ -7629,9 +7638,9 @@ sub clone_disk {
} }
my $sparseinit = PVE::Storage::volume_has_feature($storecfg, 'sparseinit', $newvolid); my $sparseinit = PVE::Storage::volume_has_feature($storecfg, 'sparseinit', $newvolid);
if (!$running || $snapname) { if (!$running || !$src_drivename || $snapname) {
# TODO: handle bwlimits # TODO: handle bwlimits
if ($drivename eq 'efidisk0') { if ($dst_drivename eq 'efidisk0') {
# the relevant data on the efidisk may be smaller than the source # 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 # e.g. on RBD/ZFS, so we use dd to copy only the amount
# that is given by the OVMF_VARS.fd # that is given by the OVMF_VARS.fd
@ -7647,9 +7656,9 @@ sub clone_disk {
qemu_img_convert($drive->{file}, $newvolid, $size, $snapname, $sparseinit); qemu_img_convert($drive->{file}, $newvolid, $size, $snapname, $sparseinit);
} }
} else { } else {
die "cannot move TPM state while VM is running\n" if $drivename eq 'tpmstate0'; die "cannot move TPM state while VM is running\n" if $src_drivename eq 'tpmstate0';
qemu_drive_mirror($vmid, $drivename, $newvolid, $newvmid, $sparseinit, $jobs, qemu_drive_mirror($vmid, $src_drivename, $newvolid, $newvmid, $sparseinit, $jobs,
$completion, $qga, $bwlimit); $completion, $qga, $bwlimit);
} }
} }