proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-07-01 07:21:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move_disk: implement delete flag

Browse Source
This commit is contained in:
Dietmar Maurer 2013-05-31 10:56:16 +02:00
parent 43bc02a921
commit 70d45e33e9
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
PVE/API2/Qemu.pm
View File

@ -2105,6 +2105,12 @@ __PACKAGE__->register_method({
enum => [ 'raw', 'qcow2', 'vmdk' ], enum => [ 'raw', 'qcow2', 'vmdk' ],
optional => 1, optional => 1,
}, },
delete => {
type => 'boolean',
description => "Delete the original disk after successful copy. By default the original disk is kept as unused disk.",
optional => 1,
default => 0,
},
digest => { digest => {
type => 'string', type => 'string',
description => 'Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.', description => 'Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.',
@ -2149,12 +2155,12 @@ __PACKAGE__->register_method({
my $drive = PVE::QemuServer::parse_drive($disk, $conf->{$disk}); my $drive = PVE::QemuServer::parse_drive($disk, $conf->{$disk});
my $volid = $drive->{file} || die "disk '$disk' has no associated volume\n"; my $old_volid = $drive->{file} || die "disk '$disk' has no associated volume\n";
die "you can't move a cdrom\n" if PVE::QemuServer::drive_is_cdrom($drive); die "you can't move a cdrom\n" if PVE::QemuServer::drive_is_cdrom($drive);
my $oldfmt; my $oldfmt;
my ($oldstoreid, $oldvolname) = PVE::Storage::parse_volume_id($volid); my ($oldstoreid, $oldvolname) = PVE::Storage::parse_volume_id($old_volid);
if ($oldvolname =~ m/\.(raw|qcow2|vmdk)$/){ if ($oldvolname =~ m/\.(raw|qcow2|vmdk)$/){
$oldfmt = $1; $oldfmt = $1;
} }
@ -2180,8 +2186,8 @@ __PACKAGE__->register_method({
$conf->{$disk} = PVE::QemuServer::print_drive($vmid, $newdrive); $conf->{$disk} = PVE::QemuServer::print_drive($vmid, $newdrive);
PVE::QemuServer::add_unused_volume($conf, $volid); PVE::QemuServer::add_unused_volume($conf, $old_volid) if !$param->{delete};
PVE::QemuServer::update_config_nolock($vmid, $conf, 1); PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
}; };
if (my $err = $@) { if (my $err = $@) {
@ -2192,6 +2198,11 @@ __PACKAGE__->register_method({
} }
die "storage migration failed: $err"; die "storage migration failed: $err";
} }
if ($param->{delete}) {
eval { PVE::Storage::vdisk_free($storecfg, $old_volid); };
warn $@ if $@;
}
}; };
return $rpcenv->fork_worker('qmmove', $vmid, $authuser, $realcmd); return $rpcenv->fork_worker('qmmove', $vmid, $authuser, $realcmd);