X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FAPI2%2FQemu.pm;h=8c5abc139f7291456107c40a00bf21fd8a767aac;hb=c21013ac58e8f178ba7e07722702747b50bfb980;hp=bd907cda995b9f54b649d304fa0a3bbf1dff4369;hpb=d58b93a8bfc25c5be341c1c99c8523eb81e4822f;p=qemu-server.git diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index bd907cd..8c5abc1 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -7,6 +7,7 @@ use Net::SSLeay; use POSIX; use IO::Socket::IP; use URI::Escape; +use Crypt::OpenSSL::Random; use PVE::Cluster qw (cfs_read_file cfs_write_file);; use PVE::RRD; @@ -20,6 +21,8 @@ use PVE::ReplicationConfig; use PVE::GuestHelpers; use PVE::QemuConfig; use PVE::QemuServer; +use PVE::QemuServer::Drive; +use PVE::QemuServer::CPUConfig; use PVE::QemuServer::Monitor qw(mon_cmd); use PVE::QemuMigrate; use PVE::RPCEnvironment; @@ -62,7 +65,7 @@ my $NEW_DISK_RE = qr!^(([^/:\s]+):)?(\d+(\.\d+)?)$!; my $check_storage_access = sub { my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage) = @_; - PVE::QemuServer::foreach_drive($settings, sub { + PVE::QemuConfig->foreach_volume($settings, sub { my ($ds, $drive) = @_; my $isCDROM = PVE::QemuServer::drive_is_cdrom($drive); @@ -95,7 +98,7 @@ my $check_storage_access_clone = sub { my $sharedvm = 1; - PVE::QemuServer::foreach_drive($conf, sub { + PVE::QemuConfig->foreach_volume($conf, sub { my ($ds, $drive) = @_; my $isCDROM = PVE::QemuServer::drive_is_cdrom($drive); @@ -147,7 +150,7 @@ my $create_disks = sub { if (!$volid || $volid eq 'none' || $volid eq 'cdrom') { delete $disk->{size}; - $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); + $res->{$ds} = PVE::QemuServer::print_drive($disk); } elsif (defined($volname) && $volname eq 'cloudinit') { $storeid = $storeid // $default_storage; die "no storage ID specified (and no default storage)\n" if !$storeid; @@ -169,7 +172,7 @@ my $create_disks = sub { $disk->{media} = 'cdrom'; push @$vollist, $volid; delete $disk->{format}; # no longer needed - $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); + $res->{$ds} = PVE::QemuServer::print_drive($disk); } elsif ($volid =~ $NEW_DISK_RE) { my ($storeid, $size) = ($2 || $default_storage, $3); die "no storage ID specified (and no default storage)\n" if !$storeid; @@ -180,7 +183,12 @@ my $create_disks = sub { my $volid; if ($ds eq 'efidisk0') { - ($volid, $size) = PVE::QemuServer::create_efidisk($storecfg, $storeid, $vmid, $fmt, $arch); + ($volid, $size) = PVE::QemuServer::create_efidisk( + $storecfg, $storeid, $vmid, $fmt, $arch, $disk); + } elsif ($ds eq 'tpmstate0') { + # swtpm can only use raw volumes, and uses a fixed size + $size = PVE::Tools::convert_size(PVE::QemuServer::Drive::TPMSTATE_DISK_SIZE, 'b' => 'kb'); + $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, "raw", undef, $size); } else { $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, undef, $size); } @@ -188,7 +196,7 @@ my $create_disks = sub { $disk->{file} = $volid; $disk->{size} = PVE::Tools::convert_size($size, 'kb' => 'b'); delete $disk->{format}; # no longer needed - $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); + $res->{$ds} = PVE::QemuServer::print_drive($disk); } else { PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid); @@ -206,16 +214,16 @@ my $create_disks = sub { my $size = PVE::Storage::volume_size_info($storecfg, $volid); - die "volume $volid does not exists\n" if !$size; + die "volume $volid does not exist\n" if !$size; $disk->{size} = $size; } - $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); + $res->{$ds} = PVE::QemuServer::print_drive($disk); } }; - eval { PVE::QemuServer::foreach_drive($settings, $code); }; + eval { PVE::QemuConfig->foreach_volume($settings, $code); }; # free allocated images on error if (my $err = $@) { @@ -235,6 +243,26 @@ my $create_disks = sub { return $vollist; }; +my $check_cpu_model_access = sub { + my ($rpcenv, $authuser, $new, $existing) = @_; + + return if !defined($new->{cpu}); + + my $cpu = PVE::JSONSchema::check_format('pve-vm-cpu-conf', $new->{cpu}); + return if !$cpu || !$cpu->{cputype}; # always allow default + my $cputype = $cpu->{cputype}; + + if ($existing && $existing->{cpu}) { + # changing only other settings doesn't require permissions for CPU model + my $existingCpu = PVE::JSONSchema::check_format('pve-vm-cpu-conf', $existing->{cpu}); + return if $existingCpu->{cputype} eq $cputype; + } + + if (PVE::QemuServer::CPUConfig::is_custom_model($cputype)) { + $rpcenv->check($authuser, "/nodes", ['Sys.Audit']); + } +}; + my $cpuoptions = { 'cores' => 1, 'cpu' => 1, @@ -306,6 +334,42 @@ my $cloudinitoptions = { sshkeys => 1, }; +my $check_vm_create_serial_perm = sub { + my ($rpcenv, $authuser, $vmid, $pool, $param) = @_; + + return 1 if $authuser eq 'root@pam'; + + foreach my $opt (keys %{$param}) { + next if $opt !~ m/^serial\d+$/; + + if ($param->{$opt} eq 'socket') { + $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.HWType']); + } else { + die "only root can set '$opt' config for real devices\n"; + } + } + + return 1; +}; + +my $check_vm_create_usb_perm = sub { + my ($rpcenv, $authuser, $vmid, $pool, $param) = @_; + + return 1 if $authuser eq 'root@pam'; + + foreach my $opt (keys %{$param}) { + next if $opt !~ m/^usb\d+$/; + + if ($param->{$opt} =~ m/spice/) { + $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.HWType']); + } else { + die "only root can set '$opt' config for real devices\n"; + } + } + + return 1; +}; + my $check_vm_modify_config_perm = sub { my ($rpcenv, $authuser, $vmid, $pool, $key_list) = @_; @@ -335,8 +399,14 @@ my $check_vm_modify_config_perm = sub { $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.PowerMgmt']); } elsif ($diskoptions->{$opt}) { $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Disk']); - } elsif ($cloudinitoptions->{$opt} || ($opt =~ m/^(?:net|ipconfig)\d+$/)) { + } elsif ($opt =~ m/^(?:net|ipconfig)\d+$/) { $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Network']); + } elsif ($cloudinitoptions->{$opt}) { + $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Cloudinit', 'VM.Config.Network'], 1); + } elsif ($opt eq 'vmstate') { + # the user needs Disk and PowerMgmt privileges to change the vmstate + # also needs privileges on the storage, that will be checked later + $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Disk', 'VM.PowerMgmt' ]); } else { # catches hostpci\d+, args, lock, etc. # new options will be checked here @@ -359,7 +429,7 @@ __PACKAGE__->register_method({ proxyto => 'node', protected => 1, # qemu pid files are only readable by root parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), full => { @@ -396,6 +466,26 @@ __PACKAGE__->register_method({ return $res; }}); +my $parse_restore_archive = sub { + my ($storecfg, $archive) = @_; + + my ($archive_storeid, $archive_volname) = PVE::Storage::parse_volume_id($archive, 1); + + if (defined($archive_storeid)) { + my $scfg = PVE::Storage::storage_config($storecfg, $archive_storeid); + if ($scfg->{type} eq 'pbs') { + return { + type => 'pbs', + volid => $archive, + }; + } + } + my $path = PVE::Storage::abs_filesystem_path($storecfg, $archive); + return { + type => 'file', + path => $path, + }; +}; __PACKAGE__->register_method({ @@ -412,13 +502,13 @@ __PACKAGE__->register_method({ protected => 1, proxyto => 'node', parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => PVE::QemuServer::json_config_properties( { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', { completion => \&PVE::Cluster::complete_next_vmid }), archive => { - description => "The backup file.", + description => "The backup archive. Either the file system path to a .tar or .vma file (use '-' to pipe data from stdin) or a proxmox storage backup volume identifier.", type => 'string', optional => 1, maxLength => 255, @@ -441,6 +531,12 @@ __PACKAGE__->register_method({ description => "Assign a unique random ethernet address.", requires => 'archive', }, + 'live-restore' => { + optional => 1, + type => 'boolean', + description => "Start the VM immediately from the backup and restore in background. PBS only.", + requires => 'archive', + }, pool => { optional => 1, type => 'string', format => 'pve-poolid', @@ -482,6 +578,7 @@ __PACKAGE__->register_method({ my $start_after_create = extract_param($param, 'start'); my $storage = extract_param($param, 'storage'); my $unique = extract_param($param, 'unique'); + my $live_restore = extract_param($param, 'live-restore'); if (defined(my $ssh_keys = $param->{sshkeys})) { $ssh_keys = URI::Escape::uri_unescape($ssh_keys); @@ -518,13 +615,18 @@ __PACKAGE__->register_method({ &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, $pool, [ keys %$param]); + &$check_vm_create_serial_perm($rpcenv, $authuser, $vmid, $pool, $param); + &$check_vm_create_usb_perm($rpcenv, $authuser, $vmid, $pool, $param); + + &$check_cpu_model_access($rpcenv, $authuser, $param); + foreach my $opt (keys %$param) { if (PVE::QemuServer::is_valid_drivename($opt)) { my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt}); raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive; PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive); - $param->{$opt} = PVE::QemuServer::print_drive($vmid, $drive); + $param->{$opt} = PVE::QemuServer::print_drive($drive); } } @@ -534,11 +636,12 @@ __PACKAGE__->register_method({ raise_param_exc({ archive => "option conflicts with other options ($keystr)"}) if $keystr; if ($archive eq '-') { - die "pipe requires cli environment\n" - if $rpcenv->{type} ne 'cli'; + die "pipe requires cli environment\n" if $rpcenv->{type} ne 'cli'; + $archive = { type => 'pipe' }; } else { PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $archive); - $archive = PVE::Storage::abs_filesystem_path($storecfg, $archive); + + $archive = $parse_restore_archive->($storecfg, $archive); } } @@ -547,6 +650,7 @@ __PACKAGE__->register_method({ eval { PVE::QemuConfig->create_and_lock_config($vmid, $force) }; die "$emsg $@" if $@; + my $restored_data = 0; my $restorefn = sub { my $conf = PVE::QemuConfig->load_config($vmid); @@ -555,12 +659,24 @@ __PACKAGE__->register_method({ die "$emsg vm is running\n" if PVE::QemuServer::check_running($vmid); my $realcmd = sub { - PVE::QemuServer::restore_archive($archive, $vmid, $authuser, { + my $restore_options = { storage => $storage, pool => $pool, unique => $unique, bwlimit => $bwlimit, - }); + live => $live_restore, + }; + if ($archive->{type} eq 'file' || $archive->{type} eq 'pipe') { + die "live-restore is only compatible with backup images from a Proxmox Backup Server\n" + if $live_restore; + PVE::QemuServer::restore_file_archive($archive->{path} // '-', $vmid, $authuser, $restore_options); + } elsif ($archive->{type} eq 'pbs') { + PVE::QemuServer::restore_proxmox_backup_archive($archive->{volid}, $vmid, $authuser, $restore_options); + } else { + die "unknown backup archive type\n"; + } + $restored_data = 1; + my $restored_conf = PVE::QemuConfig->load_config($vmid); # Convert restored VM to template if backup was VM template if (PVE::QemuConfig->is_template($restored_conf)) { @@ -568,19 +684,18 @@ __PACKAGE__->register_method({ eval { PVE::QemuServer::template_create($vmid, $restored_conf) }; warn $@ if $@; } - - PVE::AccessControl::add_vm_to_pool($vmid, $pool) if $pool; - - if ($start_after_create) { - eval { PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node }) }; - warn $@ if $@; - } }; # ensure no old replication state are exists PVE::ReplicationState::delete_guest_states($vmid); - return PVE::QemuConfig->lock_config_full($vmid, 1, $realcmd); + PVE::QemuConfig->lock_config_full($vmid, 1, $realcmd); + + if ($start_after_create && !$live_restore) { + print "Execute autostart\n"; + eval { PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node }) }; + warn $@ if $@; + } }; my $createfn = sub { @@ -588,20 +703,16 @@ __PACKAGE__->register_method({ PVE::ReplicationState::delete_guest_states($vmid); my $realcmd = sub { - - my $vollist = []; - my $conf = $param; + my $arch = PVE::QemuServer::get_vm_arch($conf); - my ($arch, undef) = PVE::QemuServer::get_basic_machine_info($conf); - + my $vollist = []; eval { - $vollist = &$create_disks($rpcenv, $authuser, $conf, $arch, $storecfg, $vmid, $pool, $param, $storage); - if (!$conf->{bootdisk}) { - my $firstdisk = PVE::QemuServer::resolve_first_disk($conf); - $conf->{bootdisk} = $firstdisk if $firstdisk; + if (!$conf->{boot}) { + my $devs = PVE::QemuServer::get_default_bootdevices($conf); + $conf->{boot} = PVE::QemuServer::print_bootorder($devs); } # auto generate uuid if user did not specify smbios1 option @@ -613,6 +724,14 @@ __PACKAGE__->register_method({ $conf->{vmgenid} = PVE::QemuServer::generate_uuid(); } + my $machine = $conf->{machine}; + if (!$machine || $machine =~ m/^(?:pc|q35|virt)$/) { + # always pin Windows' machine version on create, they get to easily confused + if (PVE::QemuServer::windows_version($conf->{ostype})) { + $conf->{machine} = PVE::QemuServer::windows_get_pinned_machine_version($machine); + } + } + PVE::QemuConfig->write_config($vmid, $conf); }; @@ -646,6 +765,13 @@ __PACKAGE__->register_method({ if (my $err = $@) { eval { PVE::QemuConfig->remove_lock($vmid, 'create') }; warn $@ if $@; + if ($restored_data) { + warn "error after data was restored, VM disks should be OK but config may " + ."require adaptions. VM $vmid state is NOT cleaned up.\n"; + } else { + warn "error before or during data restore, some or all disks were not " + ."completely restored. VM $vmid state is NOT cleaned up.\n"; + } die $err; } }; @@ -677,7 +803,7 @@ __PACKAGE__->register_method({ user => 'all', }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid'), @@ -739,7 +865,7 @@ __PACKAGE__->register_method({ }, description => "Read VM RRD statistics (returns PNG)", parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid'), @@ -785,7 +911,7 @@ __PACKAGE__->register_method({ }, description => "Read VM RRD statistics", parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid'), @@ -822,12 +948,13 @@ __PACKAGE__->register_method({ path => '{vmid}/config', method => 'GET', proxyto => 'node', - description => "Get current virtual machine configuration. This does not include pending configuration changes (see 'pending' API).", + description => "Get the virtual machine configuration with pending configuration " . + "changes applied. Set the 'current' parameter to get the current configuration instead.", permissions => { check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), @@ -848,7 +975,7 @@ __PACKAGE__->register_method({ }, }, returns => { - description => "The current VM configuration.", + description => "The VM configuration.", type => "object", properties => PVE::QemuServer::json_config_properties({ digest => { @@ -880,7 +1007,7 @@ __PACKAGE__->register_method({ path => '{vmid}/pending', method => 'GET', proxyto => 'node', - description => "Get virtual machine configuration, including pending changes.", + description => "Get the virtual machine configuration with both current and pending values.", permissions => { check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]], }, @@ -1040,7 +1167,10 @@ my $update_vm_api = sub { return if PVE::QemuServer::drive_is_cdrom($drive); my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1); - return if $volname eq 'cloudinit'; + die "cannot add non-managed/pass-through volume to a replicated VM\n" + if !defined($storeid); + + return if defined($volname) && $volname eq 'cloudinit'; my $format; if ($volid =~ $NEW_DISK_RE) { @@ -1062,7 +1192,7 @@ my $update_vm_api = sub { raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive; PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive); $check_replication->($drive); - $param->{$opt} = PVE::QemuServer::print_drive($vmid, $drive); + $param->{$opt} = PVE::QemuServer::print_drive($drive); } elsif ($opt =~ m/^net(\d+)$/) { # add macaddr my $net = PVE::QemuServer::parse_net($param->{$opt}); @@ -1090,6 +1220,18 @@ my $update_vm_api = sub { die "checksum missmatch (file change by other user?)\n" if $digest && $digest ne $conf->{digest}; + &$check_cpu_model_access($rpcenv, $authuser, $param, $conf); + + # FIXME: 'suspended' lock should probabyl be a state or "weak" lock?! + if (scalar(@delete) && grep { $_ eq 'vmstate'} @delete) { + if (defined($conf->{lock}) && $conf->{lock} eq 'suspended') { + delete $conf->{lock}; # for check lock check, not written out + push @delete, 'lock'; # this is the real deal to write it out + } + push @delete, 'runningmachine' if $conf->{runningmachine}; + push @delete, 'runningcpu' if $conf->{runningcpu}; + } + PVE::QemuConfig->check_lock($conf) if !$skiplock; foreach my $opt (keys %$revert) { @@ -1118,6 +1260,24 @@ my $update_vm_api = sub { my $modified = {}; # record what $option we modify + my @bootorder; + if (my $boot = $conf->{boot}) { + my $bootcfg = PVE::JSONSchema::parse_property_string('pve-qm-boot', $boot); + @bootorder = PVE::Tools::split_list($bootcfg->{order}) if $bootcfg && $bootcfg->{order}; + } + my $bootorder_deleted = grep {$_ eq 'bootorder'} @delete; + + my $check_drive_perms = sub { + my ($opt, $val) = @_; + my $drive = PVE::QemuServer::parse_drive($opt, $val); + # FIXME: cloudinit: CDROM or Disk? + if (PVE::QemuServer::drive_is_cdrom($drive)) { # CDROM + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.CDROM']); + } else { + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']); + } + }; + foreach my $opt (@delete) { $modified->{$opt} = 1; $conf = PVE::QemuConfig->load_config($vmid); # update/reload @@ -1132,6 +1292,13 @@ my $update_vm_api = sub { my $is_pending_val = defined($conf->{pending}->{$opt}); delete $conf->{pending}->{$opt}; + # remove from bootorder if necessary + if (!$bootorder_deleted && @bootorder && grep {$_ eq $opt} @bootorder) { + @bootorder = grep {$_ ne $opt} @bootorder; + $conf->{pending}->{boot} = PVE::QemuServer::print_bootorder(\@bootorder); + $modified->{boot} = 1; + } + if ($opt =~ m/^unused/) { my $drive = PVE::QemuServer::parse_drive($opt, $val); PVE::QemuConfig->check_protection($conf, "can't remove unused disk '$drive->{file}'"); @@ -1140,9 +1307,15 @@ my $update_vm_api = sub { delete $conf->{$opt}; PVE::QemuConfig->write_config($vmid, $conf); } + } elsif ($opt eq 'vmstate') { + PVE::QemuConfig->check_protection($conf, "can't remove vmstate '$val'"); + if (PVE::QemuServer::try_deallocate_drive($storecfg, $vmid, $conf, $opt, { file => $val }, $rpcenv, $authuser, 1)) { + delete $conf->{$opt}; + PVE::QemuConfig->write_config($vmid, $conf); + } } elsif (PVE::QemuServer::is_valid_drivename($opt)) { PVE::QemuConfig->check_protection($conf, "can't remove drive '$opt'"); - $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']); + $check_drive_perms->($opt, $val); PVE::QemuServer::vmconfig_register_unused_drive($storecfg, $vmid, $conf, PVE::QemuServer::parse_drive($opt, $val)) if $is_pending_val; PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force); @@ -1174,20 +1347,31 @@ my $update_vm_api = sub { $conf = PVE::QemuConfig->load_config($vmid); # update/reload next if defined($conf->{pending}->{$opt}) && ($param->{$opt} eq $conf->{pending}->{$opt}); # skip if nothing changed - my ($arch, undef) = PVE::QemuServer::get_basic_machine_info($conf); + my $arch = PVE::QemuServer::get_vm_arch($conf); if (PVE::QemuServer::is_valid_drivename($opt)) { - my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt}); - # FIXME: cloudinit: CDROM or Disk? - if (PVE::QemuServer::drive_is_cdrom($drive)) { # CDROM - $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.CDROM']); - } else { - $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']); + # old drive + if ($conf->{$opt}) { + $check_drive_perms->($opt, $conf->{$opt}); } + + # new drive + $check_drive_perms->($opt, $param->{$opt}); PVE::QemuServer::vmconfig_register_unused_drive($storecfg, $vmid, $conf, PVE::QemuServer::parse_drive($opt, $conf->{pending}->{$opt})) if defined($conf->{pending}->{$opt}); &$create_disks($rpcenv, $authuser, $conf->{pending}, $arch, $storecfg, $vmid, undef, {$opt => $param->{$opt}}); + + # default legacy boot order implies all cdroms anyway + if (@bootorder) { + # append new CD drives to bootorder to mark them bootable + my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt}); + if (PVE::QemuServer::drive_is_cdrom($drive, 1) && !grep(/^$opt$/, @bootorder)) { + push @bootorder, $opt; + $conf->{pending}->{boot} = PVE::QemuServer::print_bootorder(\@bootorder); + $modified->{boot} = 1; + } + } } elsif ($opt =~ m/^serial\d+/) { if ((!defined($conf->{$opt}) || $conf->{$opt} eq 'socket') && $param->{$opt} eq 'socket') { $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']); @@ -1204,6 +1388,24 @@ my $update_vm_api = sub { $conf->{pending}->{$opt} = $param->{$opt}; } else { $conf->{pending}->{$opt} = $param->{$opt}; + + if ($opt eq 'boot') { + my $new_bootcfg = PVE::JSONSchema::parse_property_string('pve-qm-boot', $param->{$opt}); + if ($new_bootcfg->{order}) { + my @devs = PVE::Tools::split_list($new_bootcfg->{order}); + for my $dev (@devs) { + my $exists = $conf->{$dev} || $conf->{pending}->{$dev}; + my $deleted = grep {$_ eq $dev} @delete; + die "invalid bootorder: device '$dev' does not exist'\n" + if !$exists || $deleted; + } + + # remove legacy boot order settings if new one set + $conf->{pending}->{$opt} = PVE::QemuServer::print_bootorder(\@devs); + PVE::QemuConfig->add_to_pending_delete($conf, "bootdisk") + if $conf->{bootdisk}; + } + } } PVE::QemuConfig->remove_from_pending_delete($conf, $opt); PVE::QemuConfig->write_config($vmid, $conf); @@ -1222,20 +1424,20 @@ my $update_vm_api = sub { $conf = PVE::QemuConfig->load_config($vmid); # update/reload + my $errors = {}; if ($running) { - my $errors = {}; PVE::QemuServer::vmconfig_hotplug_pending($vmid, $conf, $storecfg, $modified, $errors); - raise_param_exc($errors) if scalar(keys %$errors); } else { - PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $storecfg, $running); + PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $storecfg, $errors); } + raise_param_exc($errors) if scalar(keys %$errors); return; }; if ($sync) { &$worker(); - return undef; + return; } else { my $upid = $rpcenv->fork_worker('qmconfig', $vmid, $authuser, $worker); @@ -1257,7 +1459,7 @@ my $update_vm_api = sub { if (!$running) { my $status = PVE::Tools::upid_read_status($upid); - return undef if $status eq 'OK'; + return if !PVE::Tools::upid_status_is_error($status); die $status; } } @@ -1277,6 +1479,7 @@ my $vm_config_perm_list = [ 'VM.Config.Network', 'VM.Config.HWType', 'VM.Config.Options', + 'VM.Config.Cloudinit', ]; __PACKAGE__->register_method({ @@ -1290,7 +1493,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', $vm_config_perm_list, any => 1], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => PVE::QemuServer::json_config_properties( { node => get_standard_option('pve-node'), @@ -1345,7 +1548,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', $vm_config_perm_list, any => 1], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => PVE::QemuServer::json_config_properties( { node => get_standard_option('pve-node'), @@ -1379,7 +1582,7 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; &$update_vm_api($param, 1); - return undef; + return; } }); @@ -1389,21 +1592,29 @@ __PACKAGE__->register_method({ method => 'DELETE', protected => 1, proxyto => 'node', - description => "Destroy the vm (also delete all used/owned volumes).", + description => "Destroy the VM and all used/owned volumes. Removes any VM specific permissions" + ." and firewall rules", permissions => { check => [ 'perm', '/vms/{vmid}', ['VM.Allocate']], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid_stopped }), skiplock => get_standard_option('skiplock'), purge => { type => 'boolean', - description => "Remove vmid from backup cron jobs.", + description => "Remove VMID from configurations, like backup & replication jobs and HA.", optional => 1, }, + 'destroy-unreferenced-disks' => { + type => 'boolean', + description => "If set, destroy additionally all disks not referenced in the config" + ." but with a matching VMID from all enabled storages.", + optional => 1, + default => 0, + }, }, }, returns => { @@ -1420,38 +1631,59 @@ __PACKAGE__->register_method({ raise_param_exc({ skiplock => "Only root may use this option." }) if $skiplock && $authuser ne 'root@pam'; - # test if VM exists - my $conf = PVE::QemuConfig->load_config($vmid); - my $storecfg = PVE::Storage::config(); - PVE::QemuConfig->check_protection($conf, "can't remove VM $vmid"); - die "unable to remove VM $vmid - used in HA resources\n" - if PVE::HA::Config::vm_is_ha_managed($vmid); + my $early_checks = sub { + # test if VM exists + my $conf = PVE::QemuConfig->load_config($vmid); + PVE::QemuConfig->check_protection($conf, "can't remove VM $vmid"); - if (!$param->{purge}) { - # don't allow destroy if with replication jobs but no purge param - my $repl_conf = PVE::ReplicationConfig->new(); - $repl_conf->check_for_existing_jobs($vmid); - } + my $ha_managed = PVE::HA::Config::service_is_configured("vm:$vmid"); - # early tests (repeat after locking) - die "VM $vmid is running - destroy failed\n" - if PVE::QemuServer::check_running($vmid); + if (!$param->{purge}) { + die "unable to remove VM $vmid - used in HA resources and purge parameter not set.\n" + if $ha_managed; + # don't allow destroy if with replication jobs but no purge param + my $repl_conf = PVE::ReplicationConfig->new(); + $repl_conf->check_for_existing_jobs($vmid); + } + + die "VM $vmid is running - destroy failed\n" + if PVE::QemuServer::check_running($vmid); + + return $ha_managed; + }; + + $early_checks->(); my $realcmd = sub { my $upid = shift; + my $storecfg = PVE::Storage::config(); + syslog('info', "destroy VM $vmid: $upid\n"); PVE::QemuConfig->lock_config($vmid, sub { - die "VM $vmid is running - destroy failed\n" - if (PVE::QemuServer::check_running($vmid)); + # repeat, config might have changed + my $ha_managed = $early_checks->(); + + my $purge_unreferenced = $param->{'destroy-unreferenced-disks'}; - PVE::QemuServer::destroy_vm($storecfg, $vmid, $skiplock, { lock => 'destroyed' }); + PVE::QemuServer::destroy_vm( + $storecfg, + $vmid, + $skiplock, { lock => 'destroyed' }, + $purge_unreferenced, + ); PVE::AccessControl::remove_vm_access($vmid); PVE::Firewall::remove_vmfw_conf($vmid); if ($param->{purge}) { + print "purging VM $vmid from related configurations..\n"; PVE::ReplicationConfig::remove_vmid_jobs($vmid); PVE::VZDump::Plugin::remove_vmid_from_backup_jobs($vmid); + + if ($ha_managed) { + PVE::HA::Config::delete_service_from_config("vm:$vmid"); + print "NOTE: removed VM $vmid from HA resource configuration.\n"; + } } # only now remove the zombie config, else we can have reuse race @@ -1473,7 +1705,7 @@ __PACKAGE__->register_method({ check => [ 'perm', '/vms/{vmid}', ['VM.Config.Disk']], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), @@ -1496,9 +1728,26 @@ __PACKAGE__->register_method({ __PACKAGE__->update_vm($param); - return undef; + return; }}); +# uses good entropy, each char is limited to 6 bit to get printable chars simply +my $gen_rand_chars = sub { + my ($length) = @_; + + die "invalid length $length" if $length < 1; + + my $min = ord('!'); # first printable ascii + + my $rand_bytes = Crypt::OpenSSL::Random::random_bytes($length); + die "failed to generate random bytes!\n" + if !$rand_bytes; + + my $str = join('', map { chr((ord($_) & 0x3F) + $min) } split('', $rand_bytes)); + + return $str; +}; + my $sslcert; __PACKAGE__->register_method({ @@ -1511,7 +1760,7 @@ __PACKAGE__->register_method({ }, description => "Creates a TCP VNC proxy connections.", parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid'), @@ -1520,13 +1769,25 @@ __PACKAGE__->register_method({ type => 'boolean', description => "starts websockify instead of vncproxy", }, + 'generate-password' => { + optional => 1, + type => 'boolean', + default => 0, + description => "Generates a random password to be used as ticket instead of the API ticket.", + }, }, }, returns => { - additionalProperties => 0, + additionalProperties => 0, properties => { user => { type => 'string' }, ticket => { type => 'string' }, + password => { + optional => 1, + description => "Returned if requested with 'generate-password' param." + ." Consists of printable ASCII characters ('!' .. '~').", + type => 'string', + }, cert => { type => 'string' }, port => { type => 'integer' }, upid => { type => 'string' }, @@ -1544,11 +1805,20 @@ __PACKAGE__->register_method({ my $websocket = $param->{websocket}; my $conf = PVE::QemuConfig->load_config($vmid, $node); # check if VM exists - my $use_serial = ($conf->{vga} && ($conf->{vga} =~ m/^serial\d+$/)); + + my $serial; + if ($conf->{vga}) { + my $vga = PVE::QemuServer::parse_vga($conf->{vga}); + $serial = $vga->{type} if $vga->{type} =~ m/^serial\d+$/; + } my $authpath = "/vms/$vmid"; my $ticket = PVE::AccessControl::assemble_vnc_ticket($authuser, $authpath); + my $password = $ticket; + if ($param->{'generate-password'}) { + $password = $gen_rand_chars->(8); + } $sslcert = PVE::Tools::file_get_contents("/etc/pve/pve-root-ca.pem", 8192) if !$sslcert; @@ -1560,7 +1830,7 @@ __PACKAGE__->register_method({ (undef, $family) = PVE::Cluster::remote_node_ip($node); my $sshinfo = PVE::SSHInfo::get_ssh_info($node); # NOTE: kvm VNC traffic is already TLS encrypted or is known unsecure - $remcmd = PVE::SSHInfo::ssh_info_to_command($sshinfo, $use_serial ? '-t' : '-T'); + $remcmd = PVE::SSHInfo::ssh_info_to_command($sshinfo, defined($serial) ? '-t' : '-T'); } else { $family = PVE::Tools::get_host_address_family($node); } @@ -1576,16 +1846,16 @@ __PACKAGE__->register_method({ my $cmd; - if ($use_serial) { + if (defined($serial)) { - my $termcmd = [ '/usr/sbin/qm', 'terminal', $vmid, '-iface', $conf->{vga}, '-escape', '0' ]; + my $termcmd = [ '/usr/sbin/qm', 'terminal', $vmid, '-iface', $serial, '-escape', '0' ]; $cmd = ['/usr/bin/vncterm', '-rfbport', $port, '-timeout', $timeout, '-authpath', $authpath, '-perm', 'Sys.Console']; if ($param->{websocket}) { - $ENV{PVE_VNC_TICKET} = $ticket; # pass ticket to vncterm + $ENV{PVE_VNC_TICKET} = $password; # pass ticket to vncterm push @$cmd, '-notls', '-listen', 'localhost'; } @@ -1595,7 +1865,7 @@ __PACKAGE__->register_method({ } else { - $ENV{LC_PVE_TICKET} = $ticket if $websocket; # set ticket with "qm vncproxy" + $ENV{LC_PVE_TICKET} = $password if $websocket; # set ticket with "qm vncproxy" $cmd = [@$remcmd, "/usr/sbin/qm", 'vncproxy', $vmid]; @@ -1605,7 +1875,7 @@ __PACKAGE__->register_method({ LocalPort => $port, Proto => 'tcp', GetAddrInfoFlags => 0, - ) or die "failed to create socket: $!\n"; + ) or die "failed to create socket: $!\n"; # Inside the worker we shouldn't have any previous alarms # running anyway...: alarm(0); @@ -1630,13 +1900,16 @@ __PACKAGE__->register_method({ PVE::Tools::wait_for_vnc_port($port); - return { + my $res = { user => $authuser, ticket => $ticket, port => $port, upid => $upid, cert => $sslcert, }; + $res->{password} = $password if $param->{'generate-password'}; + + return $res; }}); __PACKAGE__->register_method({ @@ -1684,8 +1957,9 @@ __PACKAGE__->register_method({ my $conf = PVE::QemuConfig->load_config($vmid, $node); # check if VM exists if (!defined($serial)) { - if ($conf->{vga} && $conf->{vga} =~ m/^serial\d+$/) { - $serial = $conf->{vga}; + if ($conf->{vga}) { + my $vga = PVE::QemuServer::parse_vga($conf->{vga}); + $serial = $vga->{type} if $vga->{type} =~ m/^serial\d+$/; } } @@ -1744,7 +2018,7 @@ __PACKAGE__->register_method({ }, description => "Opens a weksocket for VNC traffic.", parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid'), @@ -1803,7 +2077,7 @@ __PACKAGE__->register_method({ }, description => "Returns a SPICE configuration to connect to the VM.", parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid'), @@ -1847,7 +2121,7 @@ __PACKAGE__->register_method({ user => 'all', }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid'), @@ -1893,7 +2167,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid'), @@ -1931,7 +2205,7 @@ __PACKAGE__->register_method({ $status->{ha} = PVE::HA::Config::get_service_status("vm:$param->{vmid}"); $status->{spice} = 1 if PVE::QemuServer::vga_conf_has_spice($conf->{vga}); - $status->{agent} = 1 if (PVE::QemuServer::parse_guest_agent($conf)->{enabled}); + $status->{agent} = 1 if PVE::QemuServer::get_qga_key($conf, 'enabled'); return $status; }}); @@ -1947,7 +2221,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', @@ -1969,11 +2243,19 @@ __PACKAGE__->register_method({ optional => 1, }, machine => get_standard_option('pve-qemu-machine'), - targetstorage => { - description => "Target storage for the migration. (Can be '1' to use the same storage id as on the source node.)", + 'force-cpu' => { + description => "Override QEMU's -cpu argument with the given string.", type => 'string', - optional => 1 - } + optional => 1, + }, + targetstorage => get_standard_option('pve-targetstorage'), + timeout => { + description => "Wait maximal timeout seconds.", + type => 'integer', + minimum => 0, + default => 'max(30, vm memory in GiB)', + optional => 1, + }, }, }, returns => { @@ -1987,8 +2269,10 @@ __PACKAGE__->register_method({ my $node = extract_param($param, 'node'); my $vmid = extract_param($param, 'vmid'); + my $timeout = extract_param($param, 'timeout'); my $machine = extract_param($param, 'machine'); + my $force_cpu = extract_param($param, 'force-cpu'); my $get_root_param = sub { my $value = extract_param($param, $_[0]); @@ -2004,15 +2288,33 @@ __PACKAGE__->register_method({ my $migration_network = $get_root_param->('migration_network'); my $targetstorage = $get_root_param->('targetstorage'); - raise_param_exc({ targetstorage => "targetstorage can only by used with migratedfrom." }) - if $targetstorage && !$migratedfrom; + my $storagemap; + + if ($targetstorage) { + raise_param_exc({ targetstorage => "targetstorage can only by used with migratedfrom." }) + if !$migratedfrom; + $storagemap = eval { PVE::JSONSchema::parse_idmap($targetstorage, 'pve-storage-id') }; + raise_param_exc({ targetstorage => "failed to parse storage map: $@" }) + if $@; + } # read spice ticket from STDIN my $spice_ticket; + my $nbd_protocol_version = 0; + my $replicated_volumes = {}; if ($stateuri && ($stateuri eq 'tcp' || $stateuri eq 'unix') && $migratedfrom && ($rpcenv->{type} eq 'cli')) { - if (defined(my $line = )) { + while (defined(my $line = )) { chomp $line; - $spice_ticket = $line; + if ($line =~ m/^spice_ticket: (.+)$/) { + $spice_ticket = $1; + } elsif ($line =~ m/^nbd_protocol_version: (\d+)$/) { + $nbd_protocol_version = $1; + } elsif ($line =~ m/^replicated_volume: (.*)$/) { + $replicated_volumes->{$1} = 1; + } else { + # fallback for old source node + $spice_ticket = $line; + } } } @@ -2040,8 +2342,25 @@ __PACKAGE__->register_method({ syslog('info', "start VM $vmid: $upid\n"); - PVE::QemuServer::vm_start($storecfg, $vmid, $stateuri, $skiplock, $migratedfrom, undef, - $machine, $spice_ticket, $migration_network, $migration_type, $targetstorage); + my $migrate_opts = { + migratedfrom => $migratedfrom, + spice_ticket => $spice_ticket, + network => $migration_network, + type => $migration_type, + storagemap => $storagemap, + nbd_proto_version => $nbd_protocol_version, + replicated_volumes => $replicated_volumes, + }; + + my $params = { + statefile => $stateuri, + skiplock => $skiplock, + forcemachine => $machine, + timeout => $timeout, + forcecpu => $force_cpu, + }; + + PVE::QemuServer::vm_start($storecfg, $vmid, $params, $migrate_opts); return; }; @@ -2061,7 +2380,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', @@ -2149,7 +2468,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', @@ -2200,7 +2519,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', @@ -2256,13 +2575,7 @@ __PACKAGE__->register_method({ # # checking the qmp status here to get feedback to the gui/cli/api # and the status query should not take too long - my $qmpstatus = eval { - PVE::QemuConfig::assert_config_exists_on_node($vmid); - mon_cmd($vmid, "query-status"); - }; - my $err = $@ if $@; - - if (!$err && $qmpstatus->{status} eq "paused") { + if (PVE::QemuServer::vm_is_paused($vmid)) { if ($param->{forceStop}) { warn "VM is paused - stop instead of shutdown\n"; $shutdown = 0; @@ -2338,15 +2651,7 @@ __PACKAGE__->register_method({ my $node = extract_param($param, 'node'); my $vmid = extract_param($param, 'vmid'); - my $qmpstatus = eval { - PVE::QemuConfig::assert_config_exists_on_node($vmid); - mon_cmd($vmid, "query-status"); - }; - my $err = $@ if $@; - - if (!$err && $qmpstatus->{status} eq "paused") { - die "VM is paused - cannot shutdown\n"; - } + die "VM is paused - cannot shutdown\n" if PVE::QemuServer::vm_is_paused($vmid); die "VM $vmid not running\n" if !PVE::QemuServer::check_running($vmid); @@ -2369,10 +2674,13 @@ __PACKAGE__->register_method({ proxyto => 'node', description => "Suspend virtual machine.", permissions => { + description => "You need 'VM.PowerMgmt' on /vms/{vmid}, and if you have set 'todisk',". + " you need also 'VM.Config.Disk' on /vms/{vmid} and 'Datastore.AllocateSpace'". + " on the storage for the vmstate.", check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', @@ -2417,6 +2725,20 @@ __PACKAGE__->register_method({ die "Cannot suspend HA managed VM to disk\n" if $todisk && PVE::HA::Config::vm_is_ha_managed($vmid); + # early check for storage permission, for better user feedback + if ($todisk) { + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']); + + if (!$statestorage) { + # get statestorage from config if none is given + my $conf = PVE::QemuConfig->load_config($vmid); + my $storecfg = PVE::Storage::config(); + $statestorage = PVE::QemuServer::find_vmstate_storage($conf, $storecfg); + } + + $rpcenv->check($authuser, "/storage/$statestorage", ['Datastore.AllocateSpace']); + } + my $realcmd = sub { my $upid = shift; @@ -2442,7 +2764,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', @@ -2471,6 +2793,8 @@ __PACKAGE__->register_method({ if $skiplock && $authuser ne 'root@pam'; my $nocheck = extract_param($param, 'nocheck'); + raise_param_exc({ nocheck => "Only root may use this option." }) + if $nocheck && $authuser ne 'root@pam'; my $to_disk_suspended; eval { @@ -2492,7 +2816,7 @@ __PACKAGE__->register_method({ PVE::QemuServer::vm_resume($vmid, $skiplock, $nocheck); } else { my $storecfg = PVE::Storage::config(); - PVE::QemuServer::vm_start($storecfg, $vmid, undef, $skiplock); + PVE::QemuServer::vm_start($storecfg, $vmid, { skiplock => $skiplock }); } return; @@ -2512,7 +2836,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.Console' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', @@ -2556,7 +2880,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid'), @@ -2632,7 +2956,7 @@ __PACKAGE__->register_method({ ] }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), @@ -2693,32 +3017,24 @@ __PACKAGE__->register_method({ my ($param) = @_; my $rpcenv = PVE::RPCEnvironment::get(); - - my $authuser = $rpcenv->get_user(); + my $authuser = $rpcenv->get_user(); my $node = extract_param($param, 'node'); - my $vmid = extract_param($param, 'vmid'); - my $newid = extract_param($param, 'newid'); - my $pool = extract_param($param, 'pool'); - - if (defined($pool)) { - $rpcenv->check_pool_exist($pool); - } + $rpcenv->check_pool_exist($pool) if defined($pool); my $snapname = extract_param($param, 'snapname'); - my $storage = extract_param($param, 'storage'); - my $format = extract_param($param, 'format'); - my $target = extract_param($param, 'target'); my $localnode = PVE::INotify::nodename(); - undef $target if $target && ($target eq $localnode || $target eq 'localhost'); + if ($target && ($target eq $localnode || $target eq 'localhost')) { + undef $target; + } PVE::Cluster::check_node_exists($target) if $target; @@ -2729,40 +3045,30 @@ __PACKAGE__->register_method({ PVE::Storage::storage_check_enabled($storecfg, $storage); if ($target) { # check if storage is available on target node - PVE::Storage::storage_check_node($storecfg, $storage, $target); + PVE::Storage::storage_check_enabled($storecfg, $storage, $target); # clone only works if target storage is shared my $scfg = PVE::Storage::storage_config($storecfg, $storage); die "can't clone to non-shared storage '$storage'\n" if !$scfg->{shared}; } } - PVE::Cluster::check_cfs_quorum(); + PVE::Cluster::check_cfs_quorum(); my $running = PVE::QemuServer::check_running($vmid) || 0; - # exclusive lock if VM is running - else shared lock is enough; - my $shared_lock = $running ? 0 : 1; - my $clonefn = sub { - - # do all tests after lock - # we also try to do all tests before we fork the worker + # do all tests after lock but before forking worker - if possible my $conf = PVE::QemuConfig->load_config($vmid); - PVE::QemuConfig->check_lock($conf); my $verify_running = PVE::QemuServer::check_running($vmid) || 0; - die "unexpected state change\n" if $verify_running != $running; die "snapshot '$snapname' does not exist\n" if $snapname && !defined( $conf->{snapshots}->{$snapname}); - my $full = extract_param($param, 'full'); - if (!defined($full)) { - $full = !PVE::QemuConfig->is_template($conf); - } + my $full = extract_param($param, 'full') // !PVE::QemuConfig->is_template($conf); die "parameter 'storage' not allowed for linked clones\n" if defined($storage) && !$full; @@ -2774,10 +3080,10 @@ __PACKAGE__->register_method({ my $sharedvm = &$check_storage_access_clone($rpcenv, $authuser, $storecfg, $oldconf, $storage); - die "can't clone VM to node '$target' (VM uses local storage)\n" if $target && !$sharedvm; + die "can't clone VM to node '$target' (VM uses local storage)\n" + if $target && !$sharedvm; my $conffile = PVE::QemuConfig->config_file($newid); - die "unable to create VM $newid: config file already exists\n" if -f $conffile; @@ -2818,6 +3124,7 @@ __PACKAGE__->register_method({ if !PVE::Storage::volume_has_feature($storecfg, 'clone', $drive->{file}, $snapname, $running); } $drives->{$opt} = $drive; + next if PVE::QemuServer::drive_is_cloudinit($drive); push @$vollist, $drive->{file}; } } else { @@ -2830,8 +3137,7 @@ __PACKAGE__->register_method({ my $smbios1 = PVE::QemuServer::parse_smbios1($newconf->{smbios1} || ''); $smbios1->{uuid} = PVE::QemuServer::generate_uuid(); $newconf->{smbios1} = PVE::QemuServer::print_smbios1($smbios1); - - # auto generate a new vmgenid if the option was set + # auto generate a new vmgenid only if the option was set for template if ($newconf->{vmgenid}) { $newconf->{vmgenid} = PVE::QemuServer::generate_uuid(); } @@ -2841,11 +3147,7 @@ __PACKAGE__->register_method({ if ($param->{name}) { $newconf->{name} = $param->{name}; } else { - if ($oldconf->{name}) { - $newconf->{name} = "Copy-of-$oldconf->{name}"; - } else { - $newconf->{name} = "Copy-of-VM-$vmid"; - } + $newconf->{name} = "Copy-of-VM-" . ($oldconf->{name} // $vmid); } if ($param->{description}) { @@ -2853,6 +3155,7 @@ __PACKAGE__->register_method({ } # create empty/temp config - this fails if VM already exists on other node + # FIXME use PVE::QemuConfig->create_and_lock_config and adapt code PVE::Tools::file_set_contents($conffile, "# qmclone temporary file\nlock: clone\n"); my $realcmd = sub { @@ -2874,20 +3177,36 @@ __PACKAGE__->register_method({ my $total_jobs = scalar(keys %{$drives}); my $i = 1; - foreach my $opt (keys %$drives) { + foreach my $opt (sort keys %$drives) { my $drive = $drives->{$opt}; my $skipcomplete = ($total_jobs != $i); # finish after last drive + my $completion = $skipcomplete ? 'skip' : 'complete'; my $src_sid = PVE::Storage::parse_volume_id($drive->{file}); my $storage_list = [ $src_sid ]; push @$storage_list, $storage if defined($storage); my $clonelimit = PVE::Storage::get_bandwidth_limit('clone', $storage_list, $bwlimit); - my $newdrive = PVE::QemuServer::clone_disk($storecfg, $vmid, $running, $opt, $drive, $snapname, - $newid, $storage, $format, $fullclone->{$opt}, $newvollist, - $jobs, $skipcomplete, $oldconf->{agent}, $clonelimit); - - $newconf->{$opt} = PVE::QemuServer::print_drive($vmid, $newdrive); + my $newdrive = PVE::QemuServer::clone_disk( + $storecfg, + $vmid, + $running, + $opt, + $drive, + $snapname, + $newid, + $storage, + $format, + $fullclone->{$opt}, + $newvollist, + $jobs, + $completion, + $oldconf->{agent}, + $clonelimit, + $oldconf + ); + + $newconf->{$opt} = PVE::QemuServer::print_drive($newdrive); PVE::QemuConfig->write_config($newid, $newconf); $i++; @@ -2917,16 +3236,18 @@ __PACKAGE__->register_method({ PVE::AccessControl::add_vm_to_pool($newid, $pool) if $pool; }; if (my $err = $@) { - unlink $conffile; - eval { PVE::QemuServer::qemu_blockjobs_cancel($vmid, $jobs) }; - sleep 1; # some storage like rbd need to wait before release volume - really? foreach my $volid (@$newvollist) { eval { PVE::Storage::vdisk_free($storecfg, $volid); }; warn $@ if $@; } + + PVE::Firewall::remove_vmfw_conf($newid); + + unlink $conffile; # avoid races -> last thing before die + die "clone failed: $err"; } @@ -2938,11 +3259,17 @@ __PACKAGE__->register_method({ return $rpcenv->fork_worker('qmclone', $vmid, $authuser, $realcmd); }; - return PVE::QemuConfig->lock_config_mode($vmid, 1, $shared_lock, sub { - # Aquire exclusive lock lock for $newid + # Aquire exclusive lock lock for $newid + my $lock_target_vm = sub { return PVE::QemuConfig->lock_config_full($newid, 1, $clonefn); - }); + }; + # exclusive lock if VM is running - else shared lock is enough; + if ($running) { + return PVE::QemuConfig->lock_config_full($vmid, 1, $lock_target_vm); + } else { + return PVE::QemuConfig->lock_config_shared($vmid, 1, $lock_target_vm); + } }}); __PACKAGE__->register_method({ @@ -2960,14 +3287,14 @@ __PACKAGE__->register_method({ ], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), disk => { type => 'string', description => "The disk you want to move.", - enum => [ PVE::QemuServer::valid_drive_names() ], + enum => [PVE::QemuServer::Drive::valid_drive_names()], }, storage => get_standard_option('pve-storage-id', { description => "Target storage.", @@ -3008,51 +3335,43 @@ __PACKAGE__->register_method({ 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 $digest = extract_param($param, 'digest'); - my $disk = extract_param($param, 'disk'); - my $storeid = extract_param($param, 'storage'); - my $format = extract_param($param, 'format'); my $storecfg = PVE::Storage::config(); my $updatefn = sub { - my $conf = PVE::QemuConfig->load_config($vmid); - PVE::QemuConfig->check_lock($conf); - die "checksum missmatch (file change by other user?)\n" + die "VM config checksum missmatch (file change by other user?)\n" if $digest && $digest ne $conf->{digest}; die "disk '$disk' does not exist\n" if !$conf->{$disk}; my $drive = PVE::QemuServer::parse_drive($disk, $conf->{$disk}); - my $old_volid = $drive->{file} || die "disk '$disk' has no associated volume\n"; - + die "disk '$disk' has no associated volume\n" if !$drive->{file}; die "you can't move a cdrom\n" if PVE::QemuServer::drive_is_cdrom($drive, 1); + my $old_volid = $drive->{file}; my $oldfmt; my ($oldstoreid, $oldvolname) = PVE::Storage::parse_volume_id($old_volid); if ($oldvolname =~ m/\.(raw|qcow2|vmdk)$/){ $oldfmt = $1; } - die "you can't move on the same storage with same format\n" if $oldstoreid eq $storeid && + die "you can't move to the same storage with same format\n" if $oldstoreid eq $storeid && (!$format || !$oldfmt || $oldfmt eq $format); # this only checks snapshots because $disk is passed! - my $snapshotted = PVE::QemuServer::is_volume_in_use($storecfg, $conf, $disk, $old_volid); + my $snapshotted = PVE::QemuServer::Drive::is_volume_in_use($storecfg, $conf, $disk, $old_volid); die "you can't move a disk with snapshots and delete the source\n" if $snapshotted && $param->{delete}; @@ -3063,7 +3382,6 @@ __PACKAGE__->register_method({ PVE::Storage::activate_volumes($storecfg, [ $drive->{file} ]); my $realcmd = sub { - my $newvollist = []; eval { @@ -3078,10 +3396,25 @@ __PACKAGE__->register_method({ my $bwlimit = extract_param($param, 'bwlimit'); my $movelimit = PVE::Storage::get_bandwidth_limit('move', [$oldstoreid, $storeid], $bwlimit); - my $newdrive = PVE::QemuServer::clone_disk($storecfg, $vmid, $running, $disk, $drive, undef, - $vmid, $storeid, $format, 1, $newvollist, undef, undef, undef, $movelimit); - - $conf->{$disk} = PVE::QemuServer::print_drive($vmid, $newdrive); + my $newdrive = PVE::QemuServer::clone_disk( + $storecfg, + $vmid, + $running, + $disk, + $drive, + undef, + $vmid, + $storeid, + $format, + 1, + $newvollist, + undef, + undef, + undef, + $movelimit, + $conf, + ); + $conf->{$disk} = PVE::QemuServer::print_drive($newdrive); PVE::QemuConfig->add_unused_volume($conf, $old_volid) if !$param->{delete}; @@ -3091,8 +3424,9 @@ __PACKAGE__->register_method({ PVE::QemuConfig->write_config($vmid, $conf); - if ($running && PVE::QemuServer::parse_guest_agent($conf)->{fstrim_cloned_disks} && PVE::QemuServer::qga_check_running($vmid)) { - eval { mon_cmd($vmid, "guest-fstrim"); }; + my $do_trim = PVE::QemuServer::get_qga_key($conf, 'fstrim_cloned_disks'); + if ($running && $do_trim && PVE::QemuServer::qga_check_running($vmid)) { + eval { mon_cmd($vmid, "guest-fstrim") }; } eval { @@ -3103,11 +3437,10 @@ __PACKAGE__->register_method({ warn $@ if $@; }; if (my $err = $@) { - - foreach my $volid (@$newvollist) { - eval { PVE::Storage::vdisk_free($storecfg, $volid); }; - warn $@ if $@; - } + foreach my $volid (@$newvollist) { + eval { PVE::Storage::vdisk_free($storecfg, $volid) }; + warn $@ if $@; + } die "storage migration failed: $err"; } @@ -3269,7 +3602,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.Migrate' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), @@ -3303,9 +3636,7 @@ __PACKAGE__->register_method({ description => "Enable live storage migration for local disk", optional => 1, }, - targetstorage => get_standard_option('pve-storage-id', { - description => "Default target storage.", - optional => 1, + targetstorage => get_standard_option('pve-targetstorage', { completion => \&PVE::QemuServer::complete_migration_storage, }), bwlimit => { @@ -3359,18 +3690,49 @@ __PACKAGE__->register_method({ if (PVE::QemuServer::check_running($vmid)) { die "can't migrate running VM without --online\n" if !$param->{online}; + + my $repl_conf = PVE::ReplicationConfig->new(); + my $is_replicated = $repl_conf->check_for_existing_jobs($vmid, 1); + my $is_replicated_to_target = defined($repl_conf->find_local_replication_job($vmid, $target)); + if (!$param->{force} && $is_replicated && !$is_replicated_to_target) { + die "Cannot live-migrate replicated VM to node '$target' - not a replication " . + "target. Use 'force' to override.\n"; + } } else { - warn "VM isn't running. Doing offline migration instead\n." if $param->{online}; + warn "VM isn't running. Doing offline migration instead.\n" if $param->{online}; $param->{online} = 0; } - raise_param_exc({ targetstorage => "Live storage migration can only be done online." }) - if !$param->{online} && $param->{targetstorage}; - my $storecfg = PVE::Storage::config(); - if( $param->{targetstorage}) { - PVE::Storage::storage_check_node($storecfg, $param->{targetstorage}, $target); + if (my $targetstorage = $param->{targetstorage}) { + my $check_storage = sub { + my ($target_sid) = @_; + PVE::Storage::storage_check_enabled($storecfg, $target_sid, $target); + $rpcenv->check($authuser, "/storage/$target_sid", ['Datastore.AllocateSpace']); + my $scfg = PVE::Storage::storage_config($storecfg, $target_sid); + raise_param_exc({ targetstorage => "storage '$target_sid' does not support vm images"}) + if !$scfg->{content}->{images}; + }; + + my $storagemap = eval { PVE::JSONSchema::parse_idmap($targetstorage, 'pve-storage-id') }; + raise_param_exc({ targetstorage => "failed to parse storage map: $@" }) + if $@; + + $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']) + if !defined($storagemap->{identity}); + + foreach my $target_sid (values %{$storagemap->{entries}}) { + $check_storage->($target_sid); + } + + $check_storage->($storagemap->{default}) + if $storagemap->{default}; + + PVE::QemuServer::check_storage_availability($storecfg, $conf, $target) + if $storagemap->{identity}; + + $param->{storagemap} = $storagemap; } else { PVE::QemuServer::check_storage_availability($storecfg, $conf, $target); } @@ -3416,7 +3778,7 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.Monitor' ]], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid'), @@ -3466,15 +3828,15 @@ __PACKAGE__->register_method({ check => ['perm', '/vms/{vmid}', [ 'VM.Config.Disk' ]], }, parameters => { - additionalProperties => 0, - properties => { + additionalProperties => 0, + properties => { node => get_standard_option('pve-node'), vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), skiplock => get_standard_option('skiplock'), disk => { type => 'string', description => "The disk you want to resize.", - enum => [PVE::QemuServer::valid_drive_names()], + enum => [PVE::QemuServer::Drive::valid_drive_names()], }, size => { type => 'string', @@ -3571,13 +3933,13 @@ __PACKAGE__->register_method({ PVE::QemuServer::qemu_block_resize($vmid, "drive-$disk", $storecfg, $volid, $newsize); $drive->{size} = $newsize; - $conf->{$disk} = PVE::QemuServer::print_drive($vmid, $drive); + $conf->{$disk} = PVE::QemuServer::print_drive($drive); PVE::QemuConfig->write_config($vmid, $conf); }; PVE::QemuConfig->lock_config($vmid, $updatefn); - return undef; + return; }}); __PACKAGE__->register_method({ @@ -3591,7 +3953,7 @@ __PACKAGE__->register_method({ proxyto => 'node', protected => 1, # qemu pid files are only readable by root parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), node => get_standard_option('pve-node'), @@ -3715,6 +4077,9 @@ __PACKAGE__->register_method({ die "unable to use snapshot name 'current' (reserved name)\n" if $snapname eq 'current'; + die "unable to use snapshot name 'pending' (reserved name)\n" + if lc($snapname) eq 'pending'; + my $realcmd = sub { PVE::Cluster::log_msg('info', $authuser, "snapshot VM $vmid: $snapname"); PVE::QemuConfig->snapshot_create($vmid, $snapname, $param->{vmstate}, @@ -3733,7 +4098,7 @@ __PACKAGE__->register_method({ user => 'all', }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { vmid => get_standard_option('pve-vmid'), node => get_standard_option('pve-node'), @@ -3794,7 +4159,7 @@ __PACKAGE__->register_method({ my $snapname = extract_param($param, 'snapname'); - return undef if !defined($param->{description}); + return if !defined($param->{description}); my $updatefn = sub { @@ -3813,7 +4178,7 @@ __PACKAGE__->register_method({ PVE::QemuConfig->lock_config($vmid, $updatefn); - return undef; + return; }}); __PACKAGE__->register_method({ @@ -3823,7 +4188,7 @@ __PACKAGE__->register_method({ proxyto => 'node', description => "Get snapshot configuration", permissions => { - check => ['perm', '/vms/{vmid}', [ 'VM.Snapshot', 'VM.Snapshot.Rollback' ], any => 1], + check => ['perm', '/vms/{vmid}', [ 'VM.Snapshot', 'VM.Snapshot.Rollback', 'VM.Audit' ], any => 1], }, parameters => { additionalProperties => 0, @@ -3970,12 +4335,15 @@ __PACKAGE__->register_method({ optional => 1, type => 'string', description => "If you want to convert only 1 disk to base image.", - enum => [PVE::QemuServer::valid_drive_names()], + enum => [PVE::QemuServer::Drive::valid_drive_names()], }, }, }, - returns => { type => 'null'}, + returns => { + type => 'string', + description => "the task ID.", + }, code => sub { my ($param) = @_; @@ -3989,8 +4357,7 @@ __PACKAGE__->register_method({ my $disk = extract_param($param, 'disk'); - my $updatefn = sub { - + my $load_and_check = sub { my $conf = PVE::QemuConfig->load_config($vmid); PVE::QemuConfig->check_lock($conf); @@ -4004,18 +4371,23 @@ __PACKAGE__->register_method({ die "you can't convert a VM to template if VM is running\n" if PVE::QemuServer::check_running($vmid); - my $realcmd = sub { - PVE::QemuServer::template_create($vmid, $conf, $disk); - }; + return $conf; + }; - $conf->{template} = 1; - PVE::QemuConfig->write_config($vmid, $conf); + $load_and_check->(); - return $rpcenv->fork_worker('qmtemplate', $vmid, $authuser, $realcmd); + my $realcmd = sub { + PVE::QemuConfig->lock_config($vmid, sub { + my $conf = $load_and_check->(); + + $conf->{template} = 1; + PVE::QemuConfig->write_config($vmid, $conf); + + PVE::QemuServer::template_create($vmid, $conf, $disk); + }); }; - PVE::QemuConfig->lock_config($vmid, $updatefn); - return undef; + return $rpcenv->fork_worker('qmtemplate', $vmid, $authuser, $realcmd); }}); __PACKAGE__->register_method({