{ subdir => 'unlink' },
{ subdir => 'vncproxy' },
{ subdir => 'migrate' },
+ { subdir => 'resize' },
{ subdir => 'rrd' },
{ subdir => 'rrddata' },
{ subdir => 'monitor' },
+ { subdir => 'snapshot' },
+ { subdir => 'rollback' },
];
return $res;
my $conf = PVE::QemuServer::load_config($param->{vmid});
+ delete $conf->{snapshots};
+
return $conf;
}});
PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
};
-my $safe_int_ne = sub {
+my $safe_num_ne = sub {
my ($a, $b) = @_;
return 0 if !defined($a) && !defined($b);
$conf = PVE::QemuServer::load_config($vmid); # update/reload
}
- if(&$safe_int_ne($drive->{bps}, $old_drive->{bps}) ||
- &$safe_int_ne($drive->{bps_rd}, $old_drive->{bps_rd}) ||
- &$safe_int_ne($drive->{bps_wr}, $old_drive->{bps_wr}) ||
- &$safe_int_ne($drive->{iops}, $old_drive->{iops}) ||
- &$safe_int_ne($drive->{iops_rd}, $old_drive->{iops_rd}) ||
- &$safe_int_ne($drive->{iops_wr}, $old_drive->{iops_wr})) {
- PVE::QemuServer::qemu_block_set_io_throttle($vmid,"drive-$opt",$drive->{bps}, $drive->{bps_rd}, $drive->{bps_wr}, $drive->{iops}, $drive->{iops_rd}, $drive->{iops_wr}) if !PVE::QemuServer::drive_is_cdrom($drive);
+ if(&$safe_num_ne($drive->{mbps}, $old_drive->{mbps}) ||
+ &$safe_num_ne($drive->{mbps_rd}, $old_drive->{mbps_rd}) ||
+ &$safe_num_ne($drive->{mbps_wr}, $old_drive->{mbps_wr}) ||
+ &$safe_num_ne($drive->{iops}, $old_drive->{iops}) ||
+ &$safe_num_ne($drive->{iops_rd}, $old_drive->{iops_rd}) ||
+ &$safe_num_ne($drive->{iops_wr}, $old_drive->{iops_wr})) {
+ PVE::QemuServer::qemu_block_set_io_throttle($vmid,"drive-$opt", $drive->{mbps}*1024*1024,
+ $drive->{mbps_rd}*1024*1024, $drive->{mbps_wr}*1024*1024,
+ $drive->{iops}, $drive->{iops_rd}, $drive->{iops_wr})
+ if !PVE::QemuServer::drive_is_cdrom($drive);
}
}
}
}
};
-my $vmconfig_resize_disk = sub {
- my ($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $value, $force) = @_;
-
- my $drive = PVE::QemuServer::parse_drive($opt, $value);
-
- if (PVE::QemuServer::drive_is_cdrom($drive)) { #cdrom
- die "you can't resize a cdrom";
- } else {
- $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']);
- }
-
- if ($conf->{$opt}) {
-
- if (my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt})) {
- my $volid = $drive->{file};
- my $size = PVE::Storage::volume_size_info($storecfg, $volid, 1);
- if ($value =~ m/^\+([1-9]\d*(\.\d+)?)([KMG])?$/){
- my ($sizeextent, $unit) = ($1, $3);
- if ($unit) {
- if ($unit eq 'K') {
- $sizeextent = $sizeextent * 1024;
- } elsif ($unit eq 'M') {
- $sizeextent = $sizeextent * 1024 * 1024;
- } elsif ($unit eq 'G') {
- $sizeextent = $sizeextent * 1024 * 1024 * 1024;
- }
- }
-
- my $targetsize = $size + int($sizeextent);
- PVE::QemuServer::qemu_block_resize($vmid, "drive-$opt", $storecfg, $drive->{file}, $targetsize);
- my $newsize = PVE::Storage::volume_size_info($storecfg, $volid, 1);
- $drive->{size} = $newsize;
- $conf->{$opt} = PVE::QemuServer::print_drive($vmid, $drive);
-
- PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
- }
- }
- }
-
-};
-
my $vmconfig_update_net = sub {
my ($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $value) = @_;
vmid => get_standard_option('pve-vmid'),
skiplock => get_standard_option('skiplock'),
stateuri => get_standard_option('pve-qm-stateuri'),
+ migratedfrom => get_standard_option('pve-node',{ optional => 1 }),
+
},
},
returns => {
raise_param_exc({ skiplock => "Only root may use this option." })
if $skiplock && $authuser ne 'root@pam';
+ my $migratedfrom = extract_param($param, 'migratedfrom');
+ raise_param_exc({ migratedfrom => "Only root may use this option." })
+ if $migratedfrom && $authuser ne 'root@pam';
+
my $storecfg = PVE::Storage::config();
if (&$vm_is_ha_managed($vmid) && !$stateuri &&
syslog('info', "start VM $vmid: $upid\n");
- PVE::QemuServer::vm_start($storecfg, $vmid, $stateuri, $skiplock);
+ PVE::QemuServer::vm_start($storecfg, $vmid, $stateuri, $skiplock, $migratedfrom);
return;
};
node => get_standard_option('pve-node'),
vmid => get_standard_option('pve-vmid'),
skiplock => get_standard_option('skiplock'),
+ migratedfrom => get_standard_option('pve-node',{ optional => 1 }),
timeout => {
description => "Wait maximal timeout seconds.",
type => 'integer',
raise_param_exc({ keepActive => "Only root may use this option." })
if $keepActive && $authuser ne 'root@pam';
+ my $migratedfrom = extract_param($param, 'migratedfrom');
+ raise_param_exc({ migratedfrom => "Only root may use this option." })
+ if $migratedfrom && $authuser ne 'root@pam';
+
+
my $storecfg = PVE::Storage::config();
if (&$vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
syslog('info', "stop VM $vmid: $upid\n");
PVE::QemuServer::vm_stop($storecfg, $vmid, $skiplock, 0,
- $param->{timeout}, 0, 1, $keepActive);
+ $param->{timeout}, 0, 1, $keepActive, $migratedfrom);
return;
};
__PACKAGE__->register_method({
name => 'resize_vm',
- path => '{vmid}/config',
+ path => '{vmid}/resize',
method => 'PUT',
protected => 1,
proxyto => 'node',
- description => "extend volume size.",
+ description => "Extend volume size.",
permissions => {
- check => ['perm', '/vms/{vmid}', $vm_config_perm_list, any => 1],
+ check => ['perm', '/vms/{vmid}', [ 'VM.Config.Disk' ]],
},
parameters => {
additionalProperties => 0,
- properties => PVE::QemuServer::json_config_properties(
- {
- node => get_standard_option('pve-node'),
- vmid => get_standard_option('pve-vmid'),
- skiplock => get_standard_option('skiplock'),
- digest => {
- type => 'string',
- description => 'Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.',
- maxLength => 40,
- optional => 1,
- }
- }),
+ properties => {
+ node => get_standard_option('pve-node'),
+ vmid => get_standard_option('pve-vmid'),
+ skiplock => get_standard_option('skiplock'),
+ disk => {
+ type => 'string',
+ description => "The disk you want to resize.",
+ enum => [PVE::QemuServer::disknames()],
+ },
+ size => {
+ type => 'string',
+ pattern => '\+?\d+(\.\d+)?[KMGT]?',
+ description => "The new size. With the '+' sign the value is added to the actual size of the volume and without it, the value is taken as an absolute one. Shrinking disk size is not supported.",
+ },
+ digest => {
+ type => 'string',
+ description => 'Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.',
+ maxLength => 40,
+ optional => 1,
+ },
+ },
},
returns => { type => 'null'},
code => sub {
my $digest = extract_param($param, 'digest');
- my @paramarr = (); # used for log message
- foreach my $key (keys %$param) {
- push @paramarr, "-$key", $param->{$key};
- }
+ my $disk = extract_param($param, 'disk');
+
+ my $sizestr = extract_param($param, 'size');
- my $skiplock = extract_param($param, 'skiplock');
+ my $skiplock = extract_param($param, 'skiplock');
raise_param_exc({ skiplock => "Only root may use this option." })
if $skiplock && $authuser ne 'root@pam';
- my $force = extract_param($param, 'force');
-
- die "no options specified\n" if !scalar(keys %$param);
-
my $storecfg = PVE::Storage::config();
-
- &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, undef, [keys %$param]);
-
- &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param);
-
my $updatefn = sub {
my $conf = PVE::QemuServer::load_config($vmid);
if $digest && $digest ne $conf->{digest};
PVE::QemuServer::check_lock($conf) if !$skiplock;
- PVE::Cluster::log_msg('info', $authuser, "update VM $vmid: " . join (' ', @paramarr));
+ die "disk '$disk' does not exist\n" if !$conf->{$disk};
- foreach my $opt (keys %$param) { # add/change
- if (PVE::QemuServer::valid_drivename($opt)) {
- &$vmconfig_resize_disk($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $param->{$opt}, $force);
- }
- }
+ my $drive = PVE::QemuServer::parse_drive($disk, $conf->{$disk});
+
+ my $volid = $drive->{file};
+
+ die "disk '$disk' has no associated volume\n" if !$volid;
+
+ die "you can't resize a cdrom\n" if PVE::QemuServer::drive_is_cdrom($drive);
+
+ my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid);
+
+ $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']);
+
+ my $size = PVE::Storage::volume_size_info($storecfg, $volid, 5);
+
+ die "internal error" if $sizestr !~ m/^(\+)?(\d+(\.\d+)?)([KMGT])?$/;
+ my ($ext, $newsize, $unit) = ($1, $2, $4);
+ if ($unit) {
+ if ($unit eq 'K') {
+ $newsize = $newsize * 1024;
+ } elsif ($unit eq 'M') {
+ $newsize = $newsize * 1024 * 1024;
+ } elsif ($unit eq 'G') {
+ $newsize = $newsize * 1024 * 1024 * 1024;
+ } elsif ($unit eq 'T') {
+ $newsize = $newsize * 1024 * 1024 * 1024 * 1024;
+ }
+ }
+ $newsize += $size if $ext;
+ $newsize = int($newsize);
+
+ die "unable to skrink disk size\n" if $newsize < $size;
+
+ return if $size == $newsize;
- };
+ PVE::Cluster::log_msg('info', $authuser, "update VM $vmid: resize --disk $disk --size $sizestr");
+
+ PVE::QemuServer::qemu_block_resize($vmid, "drive-$disk", $storecfg, $volid, $newsize);
+
+ $drive->{size} = $newsize;
+ $conf->{$disk} = PVE::QemuServer::print_drive($vmid, $drive);
+
+ PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+ };
PVE::QemuServer::lock_config($vmid, $updatefn);
return undef;
}});
+__PACKAGE__->register_method({
+ name => 'snapshot_list',
+ path => '{vmid}/snapshot',
+ method => 'GET',
+ description => "List all snapshots.",
+ permissions => {
+ check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]],
+ },
+ proxyto => 'node',
+ protected => 1, # qemu pid files are only readable by root
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ vmid => get_standard_option('pve-vmid'),
+ node => get_standard_option('pve-node'),
+ },
+ },
+ returns => {
+ type => 'array',
+ items => {
+ type => "object",
+ properties => {},
+ },
+ links => [ { rel => 'child', href => "{name}" } ],
+ },
+ code => sub {
+ my ($param) = @_;
+
+ my $conf = PVE::QemuServer::load_config($param->{vmid});
+ my $snaphash = $conf->{snapshots} || {};
+
+ my $res = [];
+
+ foreach my $name (keys %$snaphash) {
+ push @$res, { name => $name };
+ }
+
+ return $res;
+ }});
+
+__PACKAGE__->register_method({
+ name => 'snapshot',
+ path => '{vmid}/snapshot',
+ method => 'POST',
+ protected => 1,
+ proxyto => 'node',
+ description => "Snapshot a VM.",
+ permissions => {
+ check => ['perm', '/vms/{vmid}', [ 'VM.Config.Disk' ]],
+ },
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ node => get_standard_option('pve-node'),
+ vmid => get_standard_option('pve-vmid'),
+ snapname => {
+ type => 'string',
+ description => "The name of the snapshot",
+ maxLength => 40,
+ },
+ vmstate => {
+ optional => 1,
+ type => 'boolean',
+ description => "Save the vmstate",
+ },
+ freezefs => {
+ optional => 1,
+ type => 'boolean',
+ description => "Freeze the filesystem",
+ },
+ },
+ },
+ returns => {
+ type => 'string',
+ description => "the task ID.",
+ },
+ code => sub {
+ my ($param) = @_;
+
+ my $rpcenv = PVE::RPCEnvironment::get();
+
+ my $authuser = $rpcenv->get_user();
+
+ my $node = extract_param($param, 'node');
+
+ my $vmid = extract_param($param, 'vmid');
+
+ my $snapname = extract_param($param, 'snapname');
+
+ my $vmstate = extract_param($param, 'vmstate');
+
+ my $freezefs = extract_param($param, 'freezefs');
+
+ # fixme: access rights?
+ # &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $conf);
+ # fixme: need to implement a check to see if all storages support snapshots
+
+ my $realcmd = sub {
+ PVE::Cluster::log_msg('info', $authuser, "snapshot VM $vmid: $snapname");
+ PVE::QemuServer::snapshot_create($vmid, $snapname, $vmstate, $freezefs);
+ };
+
+ return $rpcenv->fork_worker('qmsnapshot', $vmid, $authuser, $realcmd);
+ }});
+
+__PACKAGE__->register_method({
+ name => 'rollback',
+ path => '{vmid}/rollback',
+ method => 'POST',
+ protected => 1,
+ proxyto => 'node',
+ description => "Rollback VM state to specified snapshot.",
+ permissions => {
+ check => ['perm', '/vms/{vmid}', [ 'VM.Config.Disk' ]],
+ },
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ node => get_standard_option('pve-node'),
+ vmid => get_standard_option('pve-vmid'),
+ snapname => {
+ type => 'string',
+ description => "The name of the snapshot",
+ maxLength => 40,
+ },
+ },
+ },
+ returns => {
+ type => 'string',
+ description => "the task ID.",
+ },
+ code => sub {
+ my ($param) = @_;
+
+ my $rpcenv = PVE::RPCEnvironment::get();
+
+ my $authuser = $rpcenv->get_user();
+
+ my $node = extract_param($param, 'node');
+
+ my $vmid = extract_param($param, 'vmid');
+
+ my $snapname = extract_param($param, 'snapname');
+
+ # fixme: access rights?
+
+ my $realcmd = sub {
+ PVE::Cluster::log_msg('info', $authuser, "rollback snapshot VM $vmid: $snapname");
+ PVE::QemuServer::snapshot_rollback($vmid, $snapname);
+ };
+
+ return $rpcenv->fork_worker('qmrollback', $vmid, $authuser, $realcmd);
+ }});
+
+__PACKAGE__->register_method({
+ name => 'delsnapshot',
+ path => '{vmid}/snapshot/{snapname}',
+ method => 'DELETE',
+ protected => 1,
+ proxyto => 'node',
+ description => "Delete a VM snapshot.",
+ permissions => {
+ check => ['perm', '/vms/{vmid}', [ 'VM.Config.Disk' ]],
+ },
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ node => get_standard_option('pve-node'),
+ vmid => get_standard_option('pve-vmid'),
+ snapname => {
+ type => 'string',
+ description => "The name of the snapshot",
+ maxLength => 40,
+ },
+ },
+ },
+ returns => {
+ type => 'string',
+ description => "the task ID.",
+ },
+ code => sub {
+ my ($param) = @_;
+
+ my $rpcenv = PVE::RPCEnvironment::get();
+
+ my $authuser = $rpcenv->get_user();
+
+ my $node = extract_param($param, 'node');
+
+ my $vmid = extract_param($param, 'vmid');
+
+ my $snapname = extract_param($param, 'snapname');
+
+ # fixme: access rights?
+
+ my $realcmd = sub {
+ PVE::Cluster::log_msg('info', $authuser, "delete snapshot VM $vmid: $snapname");
+ PVE::QemuServer::snapshot_delete($vmid, $snapname);
+ };
+
+ return $rpcenv->fork_worker('qmdelsnaphot', $vmid, $authuser, $realcmd);
+ }});
+
1;
projects / qemu-server.git / blobdiff