]> git.proxmox.com Git - qemu-server.git/blobdiff - PVE/API2/Qemu.pm
add migration precondition api endpoint
[qemu-server.git] / PVE / API2 / Qemu.pm
index 67bcb74217fc6d4347e52e14f7aa7437a7c94cbb..c9b2f677e8b6d1edbca4e31d92378ab14207d107 100644 (file)
@@ -5,6 +5,9 @@ use warnings;
 use Cwd 'abs_path';
 use Net::SSLeay;
 use UUID;
+use POSIX;
+use IO::Socket::IP;
+use URI::Escape;
 
 use PVE::Cluster qw (cfs_read_file cfs_write_file);;
 use PVE::SafeSyslog;
@@ -13,14 +16,27 @@ use PVE::Exception qw(raise raise_param_exc raise_perm_exc);
 use PVE::Storage;
 use PVE::JSONSchema qw(get_standard_option);
 use PVE::RESTHandler;
+use PVE::ReplicationConfig;
+use PVE::GuestHelpers;
+use PVE::QemuConfig;
 use PVE::QemuServer;
 use PVE::QemuMigrate;
 use PVE::RPCEnvironment;
 use PVE::AccessControl;
 use PVE::INotify;
 use PVE::Network;
+use PVE::Firewall;
 use PVE::API2::Firewall::VM;
-use PVE::HA::Config;
+use PVE::API2::Qemu::Agent;
+
+BEGIN {
+    if (!$ENV{PVE_GENERATING_DOCS}) {
+       require PVE::HA::Env::PVE2;
+       import PVE::HA::Env::PVE2;
+       require PVE::HA::Config;
+       import PVE::HA::Config;
+    }
+}
 
 use Data::Dumper; # fixme: remove
 
@@ -38,22 +54,7 @@ my $resolve_cdrom_alias = sub {
     }
 };
 
-my $test_deallocate_drive = sub {
-    my ($storecfg, $vmid, $key, $drive, $force) = @_;
-
-    if (!PVE::QemuServer::drive_is_cdrom($drive)) {
-       my $volid = $drive->{file};
-       if ( PVE::QemuServer::vm_is_volid_owner($storecfg, $vmid, $volid)) {
-           if ($force || $key =~ m/^unused/) {
-               my $sid = PVE::Storage::parse_volume_id($volid);
-               return $sid;
-           }
-       }
-    }
-
-    return undef;
-};
-
+my $NEW_DISK_RE = qr!^(([^/:\s]+):)?(\d+(\.\d+)?)$!;
 my $check_storage_access = sub {
    my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage) = @_;
 
@@ -64,18 +65,26 @@ my $check_storage_access = sub {
 
        my $volid = $drive->{file};
 
-       if (!$volid || $volid eq 'none') {
+       if (!$volid || ($volid eq 'none' || $volid eq 'cloudinit')) {
+           # nothing to check
+       } elsif ($volid =~ m/^(([^:\s]+):)?(cloudinit)$/) {
            # nothing to check
        } elsif ($isCDROM && ($volid eq 'cdrom')) {
            $rpcenv->check($authuser, "/", ['Sys.Console']);
-       } elsif (!$isCDROM && ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/)) {
+       } elsif (!$isCDROM && ($volid =~ $NEW_DISK_RE)) {
            my ($storeid, $size) = ($2 || $default_storage, $3);
            die "no storage ID specified (and no default storage)\n" if !$storeid;
            $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']);
+           my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
+           raise_param_exc({ storage => "storage '$storeid' does not support vm images"})
+               if !$scfg->{content}->{images};
        } else {
-           $rpcenv->check_volume_access($authuser, $storecfg, $vmid, $volid);
+           PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid);
        }
     });
+
+   $rpcenv->check($authuser, "/storage/$settings->{vmstatestorage}", ['Datastore.AllocateSpace'])
+       if defined($settings->{vmstatestorage});
 };
 
 my $check_storage_access_clone = sub {
@@ -112,18 +121,22 @@ my $check_storage_access_clone = sub {
        }
     });
 
+   $rpcenv->check($authuser, "/storage/$conf->{vmstatestorage}", ['Datastore.AllocateSpace'])
+       if defined($conf->{vmstatestorage});
+
    return $sharedvm;
 };
 
 # Note: $pool is only needed when creating a VM, because pool permissions
 # are automatically inherited if VM already exists inside a pool.
 my $create_disks = sub {
-    my ($rpcenv, $authuser, $conf, $storecfg, $vmid, $pool, $settings, $default_storage) = @_;
+    my ($rpcenv, $authuser, $conf, $arch, $storecfg, $vmid, $pool, $settings, $default_storage) = @_;
 
     my $vollist = [];
 
     my $res = {};
-    PVE::QemuServer::foreach_drive($settings, sub {
+
+    my $code = sub {
        my ($ds, $disk) = @_;
 
        my $volid = $disk->{file};
@@ -131,21 +144,50 @@ my $create_disks = sub {
        if (!$volid || $volid eq 'none' || $volid eq 'cdrom') {
            delete $disk->{size};
            $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
-       } elsif ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/) {
+       } elsif ($volid =~ m!^(?:([^/:\s]+):)?cloudinit$!) {
+           my $storeid = $1 || $default_storage;
+           die "no storage ID specified (and no default storage)\n" if !$storeid;
+           my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
+           my $name = "vm-$vmid-cloudinit";
+
+           my $fmt = undef;
+           if ($scfg->{path}) {
+               $fmt = $disk->{format} // "qcow2";
+               $name .= ".$fmt";
+           } else {
+               $fmt = $disk->{format} // "raw";
+           }
+
+           # Initial disk created with 4 MB and aligned to 4MB on regeneration
+           my $ci_size = PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE;
+           my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, $name, $ci_size/1024);
+           $disk->{file} = $volid;
+           $disk->{media} = 'cdrom';
+           push @$vollist, $volid;
+           delete $disk->{format}; # no longer needed
+           $res->{$ds} = PVE::QemuServer::print_drive($vmid, $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;
            my $defformat = PVE::Storage::storage_default_format($storecfg, $storeid);
            my $fmt = $disk->{format} || $defformat;
-           my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid,
-                                                 $fmt, undef, $size*1024*1024);
-           $disk->{file} = $volid;
-           $disk->{size} = $size*1024*1024*1024;
+
+           $size = PVE::Tools::convert_size($size, 'gb' => 'kb'); # vdisk_alloc uses kb
+
+           my $volid;
+           if ($ds eq 'efidisk0') {
+               ($volid, $size) = PVE::QemuServer::create_efidisk($storecfg, $storeid, $vmid, $fmt, $arch);
+           } else {
+               $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, undef, $size);
+           }
            push @$vollist, $volid;
+           $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);
        } else {
 
-           $rpcenv->check_volume_access($authuser, $storecfg, $vmid, $volid);
+           PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid);
 
            my $volid_is_new = 1;
 
@@ -169,7 +211,9 @@ my $create_disks = sub {
 
            $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
        }
-    });
+    };
+
+    eval { PVE::QemuServer::foreach_drive($settings, $code); };
 
     # free allocated images on error
     if (my $err = $@) {
@@ -189,32 +233,73 @@ my $create_disks = sub {
     return $vollist;
 };
 
-my $delete_drive = sub {
-    my ($conf, $storecfg, $vmid, $key, $drive, $force) = @_;
+my $cpuoptions = {
+    'cores' => 1,
+    'cpu' => 1,
+    'cpulimit' => 1,
+    'cpuunits' => 1,
+    'numa' => 1,
+    'smp' => 1,
+    'sockets' => 1,
+    'vcpus' => 1,
+};
+
+my $memoryoptions = {
+    'memory' => 1,
+    'balloon' => 1,
+    'shares' => 1,
+};
 
-    if (!PVE::QemuServer::drive_is_cdrom($drive)) {
-       my $volid = $drive->{file};
+my $hwtypeoptions = {
+    'acpi' => 1,
+    'hotplug' => 1,
+    'kvm' => 1,
+    'machine' => 1,
+    'scsihw' => 1,
+    'smbios1' => 1,
+    'tablet' => 1,
+    'vga' => 1,
+    'watchdog' => 1,
+};
 
-       if (PVE::QemuServer::vm_is_volid_owner($storecfg, $vmid, $volid)) {
-           if ($force || $key =~ m/^unused/) {
-               eval {
-                   # check if the disk is really unused
-                   my $used_paths = PVE::QemuServer::get_used_paths($vmid, $storecfg, $conf, 1, $key);
-                   my $path = PVE::Storage::path($storecfg, $volid);
+my $generaloptions = {
+    'agent' => 1,
+    'autostart' => 1,
+    'bios' => 1,
+    'description' => 1,
+    'keyboard' => 1,
+    'localtime' => 1,
+    'migrate_downtime' => 1,
+    'migrate_speed' => 1,
+    'name' => 1,
+    'onboot' => 1,
+    'ostype' => 1,
+    'protection' => 1,
+    'reboot' => 1,
+    'startdate' => 1,
+    'startup' => 1,
+    'tdf' => 1,
+    'template' => 1,
+};
 
-                   die "unable to delete '$volid' - volume is still in use (snapshot?)\n"
-                       if $used_paths->{$path};
+my $vmpoweroptions = {
+    'freeze' => 1,
+};
 
-                   PVE::Storage::vdisk_free($storecfg, $volid);
-               };
-               die $@ if $@;
-           } else {
-               PVE::QemuServer::add_unused_volume($conf, $volid, $vmid);
-           }
-       }
-    }
+my $diskoptions = {
+    'boot' => 1,
+    'bootdisk' => 1,
+    'vmstatestorage' => 1,
+};
 
-    delete $conf->{$key};
+my $cloudinitoptions = {
+    cicustom => 1,
+    cipassword => 1,
+    citype => 1,
+    ciuser => 1,
+    nameserver => 1,
+    searchdomain => 1,
+    sshkeys => 1,
 };
 
 my $check_vm_modify_config_perm = sub {
@@ -223,26 +308,35 @@ my $check_vm_modify_config_perm = sub {
     return 1 if $authuser eq 'root@pam';
 
     foreach my $opt (@$key_list) {
-       # disk checks need to be done somewhere else
-       next if PVE::QemuServer::valid_drivename($opt);
+       # some checks (e.g., disk, serial port, usb) need to be done somewhere
+       # else, as there the permission can be value dependend
+       next if PVE::QemuServer::is_valid_drivename($opt);
+       next if $opt eq 'cdrom';
+       next if $opt =~ m/^(?:unused|serial|usb)\d+$/;
+
 
-       if ($opt eq 'sockets' || $opt eq 'cores' ||
-           $opt eq 'cpu' || $opt eq 'smp' || $opt eq 'vcpus' ||
-           $opt eq 'cpulimit' || $opt eq 'cpuunits') {
+       if ($cpuoptions->{$opt} || $opt =~ m/^numa\d+$/) {
            $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.CPU']);
-       } elsif ($opt eq 'boot' || $opt eq 'bootdisk') {
-           $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Disk']);
-       } elsif ($opt eq 'memory' || $opt eq 'balloon' || $opt eq 'shares') {
+       } elsif ($memoryoptions->{$opt}) {
            $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Memory']);
-       } elsif ($opt eq 'args' || $opt eq 'lock') {
-           die "only root can set '$opt' config\n";
-       } elsif ($opt eq 'cpu' || $opt eq 'kvm' || $opt eq 'acpi' || $opt eq 'machine' ||
-                $opt eq 'vga' || $opt eq 'watchdog' || $opt eq 'tablet' || $opt eq 'smbios1') {
+       } elsif ($hwtypeoptions->{$opt}) {
            $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.HWType']);
-       } elsif ($opt =~ m/^net\d+$/) {
+       } elsif ($generaloptions->{$opt}) {
+           $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Options']);
+           # special case for startup since it changes host behaviour
+           if ($opt eq 'startup') {
+               $rpcenv->check_full($authuser, "/", ['Sys.Modify']);
+           }
+       } elsif ($vmpoweroptions->{$opt}) {
+           $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+$/)) {
            $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Network']);
        } else {
-           $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Options']);
+           # catches hostpci\d+, args, lock, etc.
+           # new options will be checked here
+           die "only root can set '$opt' config\n";
        }
     }
 
@@ -264,13 +358,18 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
+           full => {
+               type => 'boolean',
+               optional => 1,
+               description => "Determine the full status of active VMs.",
+           },
        },
     },
     returns => {
        type => 'array',
        items => {
            type => "object",
-           properties => {},
+           properties => $PVE::QemuServer::vmstatus_return_properties,
        },
        links => [ { rel => 'child', href => "{vmid}" } ],
     },
@@ -280,14 +379,13 @@ __PACKAGE__->register_method({
        my $rpcenv = PVE::RPCEnvironment::get();
        my $authuser = $rpcenv->get_user();
 
-       my $vmstatus = PVE::QemuServer::vmstatus();
+       my $vmstatus = PVE::QemuServer::vmstatus(undef, $param->{full});
 
        my $res = [];
        foreach my $vmid (keys %$vmstatus) {
            next if !$rpcenv->check($authuser, "/vms/$vmid", [ 'VM.Audit' ], 1);
 
            my $data = $vmstatus->{$vmid};
-           $data->{vmid} = int($vmid);
            push @$res, $data;
        }
 
@@ -314,16 +412,18 @@ __PACKAGE__->register_method({
        properties => PVE::QemuServer::json_config_properties(
            {
                node => get_standard_option('pve-node'),
-               vmid => get_standard_option('pve-vmid'),
+               vmid => get_standard_option('pve-vmid', { completion => \&PVE::Cluster::complete_next_vmid }),
                archive => {
                    description => "The backup file.",
                    type => 'string',
                    optional => 1,
                    maxLength => 255,
+                   completion => \&PVE::QemuServer::complete_backup_archives,
                },
                storage => get_standard_option('pve-storage-id', {
                    description => "Default storage.",
                    optional => 1,
+                   completion => \&PVE::QemuServer::complete_storage,
                }),
                force => {
                    optional => 1,
@@ -342,6 +442,19 @@ __PACKAGE__->register_method({
                    type => 'string', format => 'pve-poolid',
                    description => "Add the VM to the specified pool.",
                },
+               bwlimit => {
+                   description => "Override I/O bandwidth limit (in KiB/s).",
+                   optional => 1,
+                   type => 'integer',
+                   minimum => '0',
+                   default => 'restore limit from datacenter or storage config',
+               },
+               start => {
+                   optional => 1,
+                   type => 'boolean',
+                   default => 0,
+                   description => "Start VM after it was created successfully.",
+               },
            }),
     },
     returns => {
@@ -359,6 +472,7 @@ __PACKAGE__->register_method({
        my $vmid = extract_param($param, 'vmid');
 
        my $archive = extract_param($param, 'archive');
+       my $is_restore = !!$archive;
 
        my $storage = extract_param($param, 'storage');
 
@@ -368,10 +482,19 @@ __PACKAGE__->register_method({
 
        my $pool = extract_param($param, 'pool');
 
-       my $filename = PVE::QemuServer::config_file($vmid);
+       my $bwlimit = extract_param($param, 'bwlimit');
+
+       my $start_after_create = extract_param($param, 'start');
+
+       my $filename = PVE::QemuConfig->config_file($vmid);
 
        my $storecfg = PVE::Storage::config();
 
+       if (defined(my $ssh_keys = $param->{sshkeys})) {
+               $ssh_keys = URI::Escape::uri_unescape($ssh_keys);
+               PVE::Tools::validate_ssh_public_keys($ssh_keys);
+       }
+
        PVE::Cluster::check_cfs_quorum();
 
        if (defined($pool)) {
@@ -400,7 +523,7 @@ __PACKAGE__->register_method({
            &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, $pool, [ keys %$param]);
 
            foreach my $opt (keys %$param) {
-               if (PVE::QemuServer::valid_drivename($opt)) {
+               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;
 
@@ -418,39 +541,55 @@ __PACKAGE__->register_method({
                die "pipe requires cli environment\n"
                    if $rpcenv->{type} ne 'cli';
            } else {
-               $rpcenv->check_volume_access($authuser, $storecfg, $vmid, $archive);
+               PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $archive);
                $archive = PVE::Storage::abs_filesystem_path($storecfg, $archive);
            }
        }
 
+       my $emsg = $is_restore ? "unable to restore VM $vmid -" : "unable to create VM $vmid -";
+
+       eval { PVE::QemuConfig->create_and_lock_config($vmid, $force) };
+       die "$emsg $@" if $@;
+
        my $restorefn = sub {
+           my $conf = PVE::QemuConfig->load_config($vmid);
 
-           # fixme: this test does not work if VM exists on other node!
-           if (-f $filename) {
-               die "unable to restore vm $vmid: config file already exists\n"
-                   if !$force;
+           PVE::QemuConfig->check_protection($conf, $emsg);
 
-               die "unable to restore vm $vmid: vm is running\n"
-                   if PVE::QemuServer::check_running($vmid);
-           }
+           die "$emsg vm is running\n" if PVE::QemuServer::check_running($vmid);
 
            my $realcmd = sub {
                PVE::QemuServer::restore_archive($archive, $vmid, $authuser, {
                    storage => $storage,
                    pool => $pool,
-                   unique => $unique });
+                   unique => $unique,
+                   bwlimit => $bwlimit,
+               });
+               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)) {
+                   warn "Convert to template.\n";
+                   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 $@;
+               }
            };
 
-           return $rpcenv->fork_worker('qmrestore', $vmid, $authuser, $realcmd);
+           # ensure no old replication state are exists
+           PVE::ReplicationState::delete_guest_states($vmid);
+
+           return PVE::QemuConfig->lock_config_full($vmid, 1, $realcmd);
        };
 
        my $createfn = sub {
-
-           # test after locking
-           die "unable to create vm $vmid: config file already exists\n"
-               if -f $filename;
+           # ensure no old replication state are exists
+           PVE::ReplicationState::delete_guest_states($vmid);
 
            my $realcmd = sub {
 
@@ -458,33 +597,27 @@ __PACKAGE__->register_method({
 
                my $conf = $param;
 
-               eval {
+               my ($arch, undef) = PVE::QemuServer::get_basic_machine_info($conf);
 
-                   $vollist = &$create_disks($rpcenv, $authuser, $conf, $storecfg, $vmid, $pool, $param, $storage);
+               eval {
 
-                   # try to be smart about bootdisk
-                   my @disks = PVE::QemuServer::disknames();
-                   my $firstdisk;
-                   foreach my $ds (reverse @disks) {
-                       next if !$conf->{$ds};
-                       my $disk = PVE::QemuServer::parse_drive($ds, $conf->{$ds});
-                       next if PVE::QemuServer::drive_is_cdrom($disk);
-                       $firstdisk = $ds;
-                   }
+                   $vollist = &$create_disks($rpcenv, $authuser, $conf, $arch, $storecfg, $vmid, $pool, $param, $storage);
 
-                   if (!$conf->{bootdisk} && $firstdisk) {
-                       $conf->{bootdisk} = $firstdisk;
+                   if (!$conf->{bootdisk}) {
+                       my $firstdisk = PVE::QemuServer::resolve_first_disk($conf);
+                       $conf->{bootdisk} = $firstdisk if $firstdisk;
                    }
 
                    # auto generate uuid if user did not specify smbios1 option
                    if (!$conf->{smbios1}) {
-                       my ($uuid, $uuid_str);
-                       UUID::generate($uuid);
-                       UUID::unparse($uuid, $uuid_str);
-                       $conf->{smbios1} = "uuid=$uuid_str";
+                       $conf->{smbios1} = PVE::QemuServer::generate_smbios1_uuid();
+                   }
+
+                   if ((!defined($conf->{vmgenid}) || $conf->{vmgenid} eq '1') && $arch ne 'aarch64') {
+                       $conf->{vmgenid} = PVE::QemuServer::generate_uuid();
                    }
 
-                   PVE::QemuServer::update_config_nolock($vmid, $conf);
+                   PVE::QemuConfig->write_config($vmid, $conf);
 
                };
                my $err = $@;
@@ -494,16 +627,48 @@ __PACKAGE__->register_method({
                        eval { PVE::Storage::vdisk_free($storecfg, $volid); };
                        warn $@ if $@;
                    }
-                   die "create failed - $err";
+                   die "$emsg $err";
                }
 
                PVE::AccessControl::add_vm_to_pool($vmid, $pool) if $pool;
            };
 
-           return $rpcenv->fork_worker('qmcreate', $vmid, $authuser, $realcmd);
+           PVE::QemuConfig->lock_config_full($vmid, 1, $realcmd);
+
+           if ($start_after_create) {
+               print "Execute autostart\n";
+               eval { PVE::API2::Qemu->vm_start({vmid => $vmid, node => $node}) };
+               warn $@ if $@;
+           }
        };
 
-       return PVE::QemuServer::lock_config_full($vmid, 1, $archive ? $restorefn : $createfn);
+       my ($code, $worker_name);
+       if ($is_restore) {
+           $worker_name = 'qmrestore';
+           $code = sub {
+               eval { $restorefn->() };
+               if (my $err = $@) {
+                   eval { PVE::QemuConfig->remove_lock($vmid, 'create') };
+                   warn $@ if $@;
+                   die $err;
+               }
+           };
+       } else {
+           $worker_name = 'qmcreate';
+           $code = sub {
+               eval { $createfn->() };
+               if (my $err = $@) {
+                   eval {
+                       my $conffile = PVE::QemuConfig->config_file($vmid);
+                       unlink($conffile) or die "failed to remove config file: $!\n";
+                   };
+                   warn $@ if $@;
+                   die $err;
+               }
+           };
+       }
+
+       return $rpcenv->fork_worker($worker_name, $vmid, $authuser, $code);
     }});
 
 __PACKAGE__->register_method({
@@ -541,12 +706,14 @@ __PACKAGE__->register_method({
            { subdir => 'status' },
            { subdir => 'unlink' },
            { subdir => 'vncproxy' },
+           { subdir => 'termproxy' },
            { subdir => 'migrate' },
            { subdir => 'resize' },
            { subdir => 'move' },
            { subdir => 'rrd' },
            { subdir => 'rrddata' },
            { subdir => 'monitor' },
+           { subdir => 'agent' },
            { subdir => 'snapshot' },
            { subdir => 'spiceproxy' },
            { subdir => 'sendkey' },
@@ -561,6 +728,11 @@ __PACKAGE__->register_method ({
     path => '{vmid}/firewall',
 });
 
+__PACKAGE__->register_method ({
+    subclass => "PVE::API2::Qemu::Agent",
+    path => '{vmid}/agent',
+});
+
 __PACKAGE__->register_method({
     name => 'rrd',
     path => '{vmid}/rrd',
@@ -662,28 +834,46 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
-            current => {
-                description => "Get current values (instead of pending values).",
-                optional => 1,
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
+           current => {
+               description => "Get current values (instead of pending values).",
+               optional => 1,
                default => 0,
                type => 'boolean',
-            },
+           },
+           snapshot => get_standard_option('pve-snapshot-name', {
+               description => "Fetch config values from given snapshot.",
+               optional => 1,
+               completion => sub {
+                   my ($cmd, $pname, $cur, $args) = @_;
+                   PVE::QemuConfig->snapshot_list($args->[0]);
+               },
+           }),
        },
     },
     returns => {
+       description => "The current VM configuration.",
        type => "object",
-       properties => {
+       properties => PVE::QemuServer::json_config_properties({
            digest => {
                type => 'string',
                description => 'SHA1 digest of configuration file. This can be used to prevent concurrent modifications.',
            }
-       },
+       }),
     },
     code => sub {
        my ($param) = @_;
 
-       my $conf = PVE::QemuServer::load_config($param->{vmid});
+       my $conf = PVE::QemuConfig->load_config($param->{vmid});
+
+       if (my $snapname = $param->{snapshot}) {
+           my $snapshot = $conf->{snapshots}->{$snapname};
+           die "snapshot '$snapname' does not exist\n" if !defined($snapshot);
+
+           $snapshot->{digest} = $conf->{digest}; # keep file digest for API
+
+           $conf = $snapshot;
+       }
 
        delete $conf->{snapshots};
 
@@ -694,13 +884,19 @@ __PACKAGE__->register_method({
                next if ref($value); # just to be sure
                $conf->{$opt} = $value;
            }
-           foreach my $opt (PVE::Tools::split_list($conf->{pending}->{delete})) {
+           my $pending_delete_hash = PVE::QemuServer::split_flagged_list($conf->{pending}->{delete});
+           foreach my $opt (keys %$pending_delete_hash) {
                delete $conf->{$opt} if $conf->{$opt};
            }
        }
 
        delete $conf->{pending};
 
+       # hide cloudinit password
+       if ($conf->{cipassword}) {
+           $conf->{cipassword} = '**********';
+       }
+
        return $conf;
     }});
 
@@ -717,7 +913,7 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
        },
     },
     returns => {
@@ -740,8 +936,11 @@ __PACKAGE__->register_method({
                    optional => 1,
                },
                delete => {
-                   description => "Indicated a pending delete request.",
-                   type => 'boolean',
+                   description => "Indicates a pending delete request if present and not 0. " .
+                                  "The value 2 indicates a force-delete request.",
+                   type => 'integer',
+                   minimum => 0,
+                   maximum => 2,
                    optional => 1,
                },
            },
@@ -750,12 +949,9 @@ __PACKAGE__->register_method({
     code => sub {
        my ($param) = @_;
 
-       my $conf = PVE::QemuServer::load_config($param->{vmid});
+       my $conf = PVE::QemuConfig->load_config($param->{vmid});
 
-       my $pending_delete_hash = {};
-       foreach my $opt (PVE::Tools::split_list($conf->{pending}->{delete})) {
-           $pending_delete_hash->{$opt} = 1;
-       }
+       my $pending_delete_hash = PVE::QemuServer::split_flagged_list($conf->{pending}->{delete});
 
        my $res = [];
 
@@ -764,7 +960,14 @@ __PACKAGE__->register_method({
            my $item = { key => $opt };
            $item->{value} = $conf->{$opt} if defined($conf->{$opt});
            $item->{pending} = $conf->{pending}->{$opt} if defined($conf->{pending}->{$opt});
-           $item->{delete} = 1 if $pending_delete_hash->{$opt};
+           $item->{delete} = ($pending_delete_hash->{$opt} ? 2 : 1) if exists $pending_delete_hash->{$opt};
+
+           # hide cloudinit password
+           if ($opt eq 'cipassword') {
+               $item->{value} = '**********' if defined($item->{value});
+               # the trailing space so that the pending string is different
+               $item->{pending} = '********** ' if defined($item->{pending});
+           }
            push @$res, $item;
        }
 
@@ -774,13 +977,18 @@ __PACKAGE__->register_method({
            next if defined($conf->{$opt});
            my $item = { key => $opt };
            $item->{pending} = $conf->{pending}->{$opt};
+
+           # hide cloudinit password
+           if ($opt eq 'cipassword') {
+               $item->{pending} = '**********' if defined($item->{pending});
+           }
            push @$res, $item;
        }
 
-       foreach my $opt (PVE::Tools::split_list($conf->{pending}->{delete})) {
+       while (my ($opt, $force) = each %$pending_delete_hash) {
            next if $conf->{pending}->{$opt}; # just to be sure
            next if $conf->{$opt};
-           my $item = { key => $opt, delete => 1};
+           my $item = { key => $opt, delete => ($force ? 2 : 1)};
            push @$res, $item;
        }
 
@@ -814,9 +1022,16 @@ my $update_vm_api  = sub {
 
     my $background_delay = extract_param($param, 'background_delay');
 
+    if (defined(my $cipassword = $param->{cipassword})) {
+       # Same logic as in cloud-init (but with the regex fixed...)
+       $param->{cipassword} = PVE::Tools::encrypt_pw($cipassword)
+           if $cipassword !~ /^\$(?:[156]|2[ay])(\$.+){2}/;
+    }
+
     my @paramarr = (); # used for log message
-    foreach my $key (keys %$param) {
-       push @paramarr, "-$key", $param->{$key};
+    foreach my $key (sort keys %$param) {
+       my $value = $key eq 'cipassword' ? '<hidden>' : $param->{$key};
+       push @paramarr, "-$key", $value;
     }
 
     my $skiplock = extract_param($param, 'skiplock');
@@ -829,6 +1044,11 @@ my $update_vm_api  = sub {
 
     my $force = extract_param($param, 'force');
 
+    if (defined(my $ssh_keys = $param->{sshkeys})) {
+       $ssh_keys = URI::Escape::uri_unescape($ssh_keys);
+       PVE::Tools::validate_ssh_public_keys($ssh_keys);
+    }
+
     die "no options specified\n" if !$delete_str && !$revert_str && !scalar(keys %$param);
 
     my $storecfg = PVE::Storage::config();
@@ -871,16 +1091,47 @@ my $update_vm_api  = sub {
        push @delete, $opt;
     }
 
+    my $repl_conf = PVE::ReplicationConfig->new();
+    my $is_replicated = $repl_conf->check_for_existing_jobs($vmid, 1);
+    my $check_replication = sub {
+       my ($drive) = @_;
+       return if !$is_replicated;
+       my $volid = $drive->{file};
+       return if !$volid || !($drive->{replicate}//1);
+       return if PVE::QemuServer::drive_is_cdrom($drive);
+       my ($storeid, $format);
+       if ($volid =~ $NEW_DISK_RE) {
+           $storeid = $2;
+           $format = $drive->{format} || PVE::Storage::storage_default_format($storecfg, $storeid);
+       } else {
+           ($storeid, undef) = PVE::Storage::parse_volume_id($volid, 1);
+           $format = (PVE::Storage::parse_volname($storecfg, $volid))[6];
+       }
+       return if PVE::Storage::storage_can_replicate($storecfg, $storeid, $format);
+       my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
+       return if $scfg->{shared};
+       die "cannot add non-replicatable volume to a replicated VM\n";
+    };
+
     foreach my $opt (keys %$param) {
-       if (PVE::QemuServer::valid_drivename($opt)) {
+       if (PVE::QemuServer::is_valid_drivename($opt)) {
            # cleanup drive path
            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);
+           $check_replication->($drive);
            $param->{$opt} = PVE::QemuServer::print_drive($vmid, $drive);
        } elsif ($opt =~ m/^net(\d+)$/) {
            # add macaddr
            my $net = PVE::QemuServer::parse_net($param->{$opt});
            $param->{$opt} = PVE::QemuServer::print_net($net);
+       } elsif ($opt eq 'vmgenid') {
+           if ($param->{$opt} eq '1') {
+               $param->{$opt} = PVE::QemuServer::generate_uuid();
+           }
+       } elsif ($opt eq 'hookscript') {
+           eval { PVE::GuestHelpers::check_hookscript($param->{$opt}, $storecfg); };
+           raise_param_exc({ $opt => $@ }) if $@;
        }
     }
 
@@ -892,12 +1143,12 @@ my $update_vm_api  = sub {
 
     my $updatefn =  sub {
 
-       my $conf = PVE::QemuServer::load_config($vmid);
+       my $conf = PVE::QemuConfig->load_config($vmid);
 
        die "checksum missmatch (file change by other user?)\n"
            if $digest && $digest ne $conf->{digest};
 
-       PVE::QemuServer::check_lock($conf) if !$skiplock;
+       PVE::QemuConfig->check_lock($conf) if !$skiplock;
 
        foreach my $opt (keys %$revert) {
            if (defined($conf->{$opt})) {
@@ -927,34 +1178,60 @@ my $update_vm_api  = sub {
 
            foreach my $opt (@delete) {
                $modified->{$opt} = 1;
-               $conf = PVE::QemuServer::load_config($vmid); # update/reload
+               $conf = PVE::QemuConfig->load_config($vmid); # update/reload
+               if (!defined($conf->{$opt}) && !defined($conf->{pending}->{$opt})) {
+                   warn "cannot delete '$opt' - not set in current configuration!\n";
+                   $modified->{$opt} = 0;
+                   next;
+               }
+
                if ($opt =~ m/^unused/) {
-                   $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']);
                    my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
-                   if (my $sid = &$test_deallocate_drive($storecfg, $vmid, $opt, $drive, $force)) {
-                       $rpcenv->check($authuser, "/storage/$sid", ['Datastore.AllocateSpace']);
-                       &$delete_drive($conf, $storecfg, $vmid, $opt, $drive);
-                       PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+                   PVE::QemuConfig->check_protection($conf, "can't remove unused disk '$drive->{file}'");
+                   $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']);
+                   if (PVE::QemuServer::try_deallocate_drive($storecfg, $vmid, $conf, $opt, $drive, $rpcenv, $authuser)) {
+                       delete $conf->{$opt};
+                       PVE::QemuConfig->write_config($vmid, $conf);
                    }
-               } elsif (PVE::QemuServer::valid_drivename($opt)) {
+               } 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']);
                    PVE::QemuServer::vmconfig_register_unused_drive($storecfg, $vmid, $conf, PVE::QemuServer::parse_drive($opt, $conf->{pending}->{$opt}))
                        if defined($conf->{pending}->{$opt});
-                   PVE::QemuServer::vmconfig_delete_pending_option($conf, $opt);
-                   PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+                   PVE::QemuServer::vmconfig_delete_pending_option($conf, $opt, $force);
+                   PVE::QemuConfig->write_config($vmid, $conf);
+               } elsif ($opt =~ m/^serial\d+$/) {
+                   if ($conf->{$opt} eq 'socket') {
+                       $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']);
+                   } elsif ($authuser ne 'root@pam') {
+                       die "only root can delete '$opt' config for real devices\n";
+                   }
+                   PVE::QemuServer::vmconfig_delete_pending_option($conf, $opt, $force);
+                   PVE::QemuConfig->write_config($vmid, $conf);
+               } elsif ($opt =~ m/^usb\d+$/) {
+                   if ($conf->{$opt} =~ m/spice/) {
+                       $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']);
+                   } elsif ($authuser ne 'root@pam') {
+                       die "only root can delete '$opt' config for real devices\n";
+                   }
+                   PVE::QemuServer::vmconfig_delete_pending_option($conf, $opt, $force);
+                   PVE::QemuConfig->write_config($vmid, $conf);
                } else {
-                   PVE::QemuServer::vmconfig_delete_pending_option($conf, $opt);
-                   PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+                   PVE::QemuServer::vmconfig_delete_pending_option($conf, $opt, $force);
+                   PVE::QemuConfig->write_config($vmid, $conf);
                }
            }
 
            foreach my $opt (keys %$param) { # add/change
                $modified->{$opt} = 1;
-               $conf = PVE::QemuServer::load_config($vmid); # update/reload
+               $conf = PVE::QemuConfig->load_config($vmid); # update/reload
                next if defined($conf->{pending}->{$opt}) && ($param->{$opt} eq $conf->{pending}->{$opt}); # skip if nothing changed
 
-               if (PVE::QemuServer::valid_drivename($opt)) {
+               my ($arch, undef) = PVE::QemuServer::get_basic_machine_info($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 {
@@ -963,18 +1240,32 @@ my $update_vm_api  = sub {
                    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}, $storecfg, $vmid, undef, {$opt => $param->{$opt}});
+                   &$create_disks($rpcenv, $authuser, $conf->{pending}, $arch, $storecfg, $vmid, undef, {$opt => $param->{$opt}});
+               } 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']);
+                   } elsif ($authuser ne 'root@pam') {
+                       die "only root can modify '$opt' config for real devices\n";
+                   }
+                   $conf->{pending}->{$opt} = $param->{$opt};
+               } elsif ($opt =~ m/^usb\d+/) {
+                   if ((!defined($conf->{$opt}) || $conf->{$opt} =~ m/spice/) && $param->{$opt} =~ m/spice/) {
+                       $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']);
+                   } elsif ($authuser ne 'root@pam') {
+                       die "only root can modify '$opt' config for real devices\n";
+                   }
+                   $conf->{pending}->{$opt} = $param->{$opt};
                } else {
                    $conf->{pending}->{$opt} = $param->{$opt};
                }
                PVE::QemuServer::vmconfig_undelete_pending_option($conf, $opt);
-               PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+               PVE::QemuConfig->write_config($vmid, $conf);
            }
 
            # remove pending changes when nothing changed
-           $conf = PVE::QemuServer::load_config($vmid); # update/reload
+           $conf = PVE::QemuConfig->load_config($vmid); # update/reload
            my $changes = PVE::QemuServer::vmconfig_cleanup_pending($conf);
-           PVE::QemuServer::update_config_nolock($vmid, $conf, 1) if $changes;
+           PVE::QemuConfig->write_config($vmid, $conf) if $changes;
 
            return if !scalar(keys %{$conf->{pending}});
 
@@ -982,7 +1273,7 @@ my $update_vm_api  = sub {
 
            # apply pending changes
 
-           $conf = PVE::QemuServer::load_config($vmid); # update/reload
+           $conf = PVE::QemuConfig->load_config($vmid); # update/reload
 
            if ($running) {
                my $errors = {};
@@ -1028,7 +1319,7 @@ my $update_vm_api  = sub {
        }
     };
 
-    return PVE::QemuServer::lock_config($vmid, $updatefn);
+    return PVE::QemuConfig->lock_config($vmid, $updatefn);
 };
 
 my $vm_config_perm_list = [
@@ -1111,7 +1402,7 @@ __PACKAGE__->register_method({
        properties => PVE::QemuServer::json_config_properties(
            {
                node => get_standard_option('pve-node'),
-               vmid => get_standard_option('pve-vmid'),
+               vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
                skiplock => get_standard_option('skiplock'),
                delete => {
                    type => 'string', format => 'pve-configid-list',
@@ -1160,7 +1451,7 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid_stopped }),
            skiplock => get_standard_option('skiplock'),
        },
     },
@@ -1181,20 +1472,22 @@ __PACKAGE__->register_method({
            if $skiplock && $authuser ne 'root@pam';
 
        # test if VM exists
-       my $conf = PVE::QemuServer::load_config($vmid);
+       my $conf = PVE::QemuConfig->load_config($vmid);
 
        my $storecfg = PVE::Storage::config();
 
-       my $delVMfromPoolFn = sub {
-           my $usercfg = cfs_read_file("user.cfg");
-           if (my $pool = $usercfg->{vms}->{$vmid}) {
-               if (my $data = $usercfg->{pools}->{$pool}) {
-                   delete $data->{vms}->{$vmid};
-                   delete $usercfg->{vms}->{$vmid};
-                   cfs_write_file("user.cfg", $usercfg);
-               }
-           }
-       };
+       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);
+
+       # do not allow destroy if there are replication jobs
+       my $repl_conf = PVE::ReplicationConfig->new();
+       $repl_conf->check_for_existing_jobs($vmid);
+
+       # early tests (repeat after locking)
+       die "VM $vmid is running - destroy failed\n"
+           if PVE::QemuServer::check_running($vmid);
 
        my $realcmd = sub {
            my $upid = shift;
@@ -1203,7 +1496,9 @@ __PACKAGE__->register_method({
 
            PVE::QemuServer::vm_destroy($storecfg, $vmid, $skiplock);
 
-           PVE::AccessControl::remove_vm_from_pool($vmid);
+           PVE::AccessControl::remove_vm_access($vmid);
+
+            PVE::Firewall::remove_vmfw_conf($vmid);
        };
 
        return $rpcenv->fork_worker('qmdestroy', $vmid, $authuser, $realcmd);
@@ -1223,7 +1518,7 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
            idlist => {
                type => 'string', format => 'pve-configid-list',
                description => "A list of disk IDs you want to delete.",
@@ -1290,7 +1585,8 @@ __PACKAGE__->register_method({
        my $node = $param->{node};
        my $websocket = $param->{websocket};
 
-       my $conf = PVE::QemuServer::load_config($vmid, $node); # check if VM exists
+       my $conf = PVE::QemuConfig->load_config($vmid, $node); # check if VM exists
+       my $use_serial = ($conf->{vga} && ($conf->{vga} =~ m/^serial\d+$/));
 
        my $authpath = "/vms/$vmid";
 
@@ -1299,17 +1595,20 @@ __PACKAGE__->register_method({
        $sslcert = PVE::Tools::file_get_contents("/etc/pve/pve-root-ca.pem", 8192)
            if !$sslcert;
 
-       my $port = PVE::Tools::next_vnc_port();
-
-       my $remip;
+       my $family;
        my $remcmd = [];
 
        if ($node ne 'localhost' && $node ne PVE::INotify::nodename()) {
-           $remip = PVE::Cluster::remote_node_ip($node);
+           (undef, $family) = PVE::Cluster::remote_node_ip($node);
+           my $sshinfo = PVE::Cluster::get_ssh_info($node);
            # NOTE: kvm VNC traffic is already TLS encrypted or is known unsecure
-           $remcmd = ['/usr/bin/ssh', '-T', '-o', 'BatchMode=yes', $remip];
+           $remcmd = PVE::Cluster::ssh_info_to_command($sshinfo, $use_serial ? '-t' : '-T');
+       } else {
+           $family = PVE::Tools::get_host_address_family($node);
        }
 
+       my $port = PVE::Tools::next_vnc_port($family);
+
        my $timeout = 10;
 
        my $realcmd = sub {
@@ -1319,33 +1618,153 @@ __PACKAGE__->register_method({
 
            my $cmd;
 
-           if ($conf->{vga} && ($conf->{vga} =~ m/^serial\d+$/)) {
+           if ($use_serial) {
 
-               die "Websocket mode is not supported in vga serial mode!" if $websocket;
+               my $termcmd = [ '/usr/sbin/qm', 'terminal', $vmid, '-iface', $conf->{vga}, '-escape', '0' ];
 
-               my $termcmd = [ '/usr/sbin/qm', 'terminal', $vmid, '-iface', $conf->{vga} ];
-               #my $termcmd = "/usr/bin/qm terminal -iface $conf->{vga}";
                $cmd = ['/usr/bin/vncterm', '-rfbport', $port,
                        '-timeout', $timeout, '-authpath', $authpath,
-                       '-perm', 'Sys.Console', '-c', @$remcmd, @$termcmd];
+                       '-perm', 'Sys.Console'];
+
+               if ($param->{websocket}) {
+                   $ENV{PVE_VNC_TICKET} = $ticket; # pass ticket to vncterm
+                   push @$cmd, '-notls', '-listen', 'localhost';
+               }
+
+               push @$cmd, '-c', @$remcmd, @$termcmd;
+
+               PVE::Tools::run_command($cmd);
+
            } else {
 
                $ENV{LC_PVE_TICKET} = $ticket if $websocket; # set ticket with "qm vncproxy"
 
-               my $qmcmd = [@$remcmd, "/usr/sbin/qm", 'vncproxy', $vmid];
+               $cmd = [@$remcmd, "/usr/sbin/qm", 'vncproxy', $vmid];
+
+               my $sock = IO::Socket::IP->new(
+                   ReuseAddr => 1,
+                   Listen => 1,
+                   LocalPort => $port,
+                   Proto => 'tcp',
+                   GetAddrInfoFlags => 0,
+                   ) or die "failed to create socket: $!\n";
+               # Inside the worker we shouldn't have any previous alarms
+               # running anyway...:
+               alarm(0);
+               local $SIG{ALRM} = sub { die "connection timed out\n" };
+               alarm $timeout;
+               accept(my $cli, $sock) or die "connection failed: $!\n";
+               alarm(0);
+               close($sock);
+               if (PVE::Tools::run_command($cmd,
+                   output => '>&'.fileno($cli),
+                   input => '<&'.fileno($cli),
+                   noerr => 1) != 0)
+               {
+                   die "Failed to run vncproxy.\n";
+               }
+           }
+
+           return;
+       };
+
+       my $upid = $rpcenv->fork_worker('vncproxy', $vmid, $authuser, $realcmd, 1);
+
+       PVE::Tools::wait_for_vnc_port($port);
+
+       return {
+           user => $authuser,
+           ticket => $ticket,
+           port => $port,
+           upid => $upid,
+           cert => $sslcert,
+       };
+    }});
+
+__PACKAGE__->register_method({
+    name => 'termproxy',
+    path => '{vmid}/termproxy',
+    method => 'POST',
+    protected => 1,
+    permissions => {
+       check => ['perm', '/vms/{vmid}', [ 'VM.Console' ]],
+    },
+    description => "Creates a TCP proxy connections.",
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           vmid => get_standard_option('pve-vmid'),
+           serial=> {
+               optional => 1,
+               type => 'string',
+               enum => [qw(serial0 serial1 serial2 serial3)],
+               description => "opens a serial terminal (defaults to display)",
+           },
+       },
+    },
+    returns => {
+       additionalProperties => 0,
+       properties => {
+           user => { type => 'string' },
+           ticket => { type => 'string' },
+           port => { type => 'integer' },
+           upid => { type => 'string' },
+       },
+    },
+    code => sub {
+       my ($param) = @_;
+
+       my $rpcenv = PVE::RPCEnvironment::get();
+
+       my $authuser = $rpcenv->get_user();
+
+       my $vmid = $param->{vmid};
+       my $node = $param->{node};
+       my $serial = $param->{serial};
 
-               my $qmstr = join(' ', @$qmcmd);
+       my $conf = PVE::QemuConfig->load_config($vmid, $node); # check if VM exists
 
-               # also redirect stderr (else we get RFB protocol errors)
-               $cmd = ['/bin/nc', '-l', '-p', $port, '-w', $timeout, '-c', "$qmstr 2>/dev/null"];
+       if (!defined($serial)) {
+           if ($conf->{vga} && $conf->{vga} =~ m/^serial\d+$/) {
+               $serial = $conf->{vga};
            }
+       }
 
-           PVE::Tools::run_command($cmd);
+       my $authpath = "/vms/$vmid";
 
-           return;
+       my $ticket = PVE::AccessControl::assemble_vnc_ticket($authuser, $authpath);
+
+       my $family;
+       my $remcmd = [];
+
+       if ($node ne 'localhost' && $node ne PVE::INotify::nodename()) {
+           (undef, $family) = PVE::Cluster::remote_node_ip($node);
+           my $sshinfo = PVE::Cluster::get_ssh_info($node);
+           $remcmd = PVE::Cluster::ssh_info_to_command($sshinfo, '-t');
+           push @$remcmd, '--';
+       } else {
+           $family = PVE::Tools::get_host_address_family($node);
+       }
+
+       my $port = PVE::Tools::next_vnc_port($family);
+
+       my $termcmd = [ '/usr/sbin/qm', 'terminal', $vmid, '-escape', '0'];
+       push @$termcmd, '-iface', $serial if $serial;
+
+       my $realcmd = sub {
+           my $upid = shift;
+
+           syslog('info', "starting qemu termproxy $upid\n");
+
+           my $cmd = ['/usr/bin/termproxy', $port, '--path', $authpath,
+                      '--perm', 'VM.Console', '--'];
+           push @$cmd, @$remcmd, @$termcmd;
+
+           PVE::Tools::run_command($cmd);
        };
 
-       my $upid = $rpcenv->fork_worker('vncproxy', $vmid, $authuser, $realcmd);
+       my $upid = $rpcenv->fork_worker('vncproxy', $vmid, $authuser, $realcmd, 1);
 
        PVE::Tools::wait_for_vnc_port($port);
 
@@ -1354,7 +1773,6 @@ __PACKAGE__->register_method({
            ticket => $ticket,
            port => $port,
            upid => $upid,
-           cert => $sslcert,
        };
     }});
 
@@ -1405,7 +1823,7 @@ __PACKAGE__->register_method({
 
        PVE::AccessControl::verify_vnc_ticket($param->{vncticket}, $authuser, $authpath);
 
-       my $conf = PVE::QemuServer::load_config($vmid, $node); # VM exists ?
+       my $conf = PVE::QemuConfig->load_config($vmid, $node); # VM exists ?
 
        # Note: VNC ports are acessible from outside, so we do not gain any
        # security if we verify that $param->{port} belongs to VM $vmid. This
@@ -1446,8 +1864,9 @@ __PACKAGE__->register_method({
        my $node = $param->{node};
        my $proxy = $param->{proxy};
 
-       my $conf = PVE::QemuServer::load_config($vmid, $node);
-       my $title = "VM $vmid - $conf->{'name'}",
+       my $conf = PVE::QemuConfig->load_config($vmid, $node);
+       my $title = "VM $vmid";
+       $title .= " - ". $conf->{name} if $conf->{name};
 
        my $port = PVE::QemuServer::spice_port($vmid);
 
@@ -1490,7 +1909,7 @@ __PACKAGE__->register_method({
        my ($param) = @_;
 
        # test if VM exists
-       my $conf = PVE::QemuServer::load_config($param->{vmid});
+       my $conf = PVE::QemuConfig->load_config($param->{vmid});
 
        my $res = [
            { subdir => 'current' },
@@ -1518,19 +1937,39 @@ __PACKAGE__->register_method({
            vmid => get_standard_option('pve-vmid'),
        },
     },
-    returns => { type => 'object' },
+    returns => {
+       type => 'object',
+       properties => {
+           %$PVE::QemuServer::vmstatus_return_properties,
+           ha => {
+               description => "HA manager service status.",
+               type => 'object',
+           },
+           spice => {
+               description => "Qemu VGA configuration supports spice.",
+               type => 'boolean',
+               optional => 1,
+           },
+           agent => {
+               description => "Qemu GuestAgent enabled in config.",
+               type => 'boolean',
+               optional => 1,
+           },
+       },
+    },
     code => sub {
        my ($param) = @_;
 
        # test if VM exists
-       my $conf = PVE::QemuServer::load_config($param->{vmid});
+       my $conf = PVE::QemuConfig->load_config($param->{vmid});
 
        my $vmstatus = PVE::QemuServer::vmstatus($param->{vmid}, 1);
        my $status = $vmstatus->{$param->{vmid}};
 
-       $status->{ha} = PVE::HA::Config::vm_is_ha_managed($param->{vmid});
+       $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});
 
        return $status;
     }});
@@ -1549,11 +1988,30 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid',
+                                       { completion => \&PVE::QemuServer::complete_vmid_stopped }),
            skiplock => get_standard_option('skiplock'),
            stateuri => get_standard_option('pve-qm-stateuri'),
            migratedfrom => get_standard_option('pve-node',{ optional => 1 }),
+           migration_type => {
+               type => 'string',
+               enum => ['secure', 'insecure'],
+               description => "Migration traffic is encrypted using an SSH " .
+                 "tunnel by default. On secure, completely private networks " .
+                 "this can be disabled to increase performance.",
+               optional => 1,
+           },
+           migration_network => {
+               type => 'string', format => 'CIDR',
+               description => "CIDR of the (sub) network that is used for migration.",
+               optional => 1,
+           },
            machine => get_standard_option('pve-qm-machine'),
+           targetstorage => {
+               description => "Target storage for the migration. (Can be '1' to use the same storage id as on the source node.)",
+               type => 'string',
+               optional => 1
+           }
        },
     },
     returns => {
@@ -1563,52 +2021,51 @@ __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 $machine = extract_param($param, 'machine');
 
-       my $stateuri = extract_param($param, 'stateuri');
-       raise_param_exc({ stateuri => "Only root may use this option." })
-           if $stateuri && $authuser ne 'root@pam';
+       my $get_root_param = sub {
+           my $value = extract_param($param, $_[0]);
+           raise_param_exc({ "$_[0]" => "Only root may use this option." })
+               if $value && $authuser ne 'root@pam';
+           return $value;
+       };
 
-       my $skiplock = extract_param($param, 'skiplock');
-       raise_param_exc({ skiplock => "Only root may use this option." })
-           if $skiplock && $authuser ne 'root@pam';
+       my $stateuri = $get_root_param->('stateuri');
+       my $skiplock = $get_root_param->('skiplock');
+       my $migratedfrom = $get_root_param->('migratedfrom');
+       my $migration_type = $get_root_param->('migration_type');
+       my $migration_network = $get_root_param->('migration_network');
+       my $targetstorage = $get_root_param->('targetstorage');
 
-       my $migratedfrom = extract_param($param, 'migratedfrom');
-       raise_param_exc({ migratedfrom => "Only root may use this option." })
-           if $migratedfrom && $authuser ne 'root@pam';
+       raise_param_exc({ targetstorage => "targetstorage can only by used with migratedfrom." })
+           if $targetstorage && !$migratedfrom;
 
        # read spice ticket from STDIN
        my $spice_ticket;
        if ($stateuri && ($stateuri eq 'tcp') && $migratedfrom && ($rpcenv->{type} eq 'cli')) {
-           if (defined(my $line = <>)) {
+           if (defined(my $line = <STDIN>)) {
                chomp $line;
                $spice_ticket = $line;
            }
        }
 
-       my $storecfg = PVE::Storage::config();
+       PVE::Cluster::check_cfs_quorum();
 
-       if (PVE::HA::Config::vm_is_ha_managed($vmid) && !$stateuri &&
-           $rpcenv->{type} ne 'ha') {
+       my $storecfg = PVE::Storage::config();
 
+       if (PVE::HA::Config::vm_is_ha_managed($vmid) && !$stateuri &&  $rpcenv->{type} ne 'ha') {
            my $hacmd = sub {
                my $upid = shift;
 
-               my $service = "vm:$vmid";
-
-               my $cmd = ['ha-manager', 'enable', $service];
-
-               print "Executing HA start for VM $vmid\n";
+               print "Requesting HA start for VM $vmid\n";
 
+               my $cmd = ['ha-manager', 'set',  "vm:$vmid", '--state', 'started'];
                PVE::Tools::run_command($cmd);
-
                return;
            };
 
@@ -1622,8 +2079,7 @@ __PACKAGE__->register_method({
                syslog('info', "start VM $vmid: $upid\n");
 
                PVE::QemuServer::vm_start($storecfg, $vmid, $stateuri, $skiplock, $migratedfrom, undef,
-                                         $machine, $spice_ticket);
-
+                                         $machine, $spice_ticket, $migration_network, $migration_type, $targetstorage);
                return;
            };
 
@@ -1637,7 +2093,8 @@ __PACKAGE__->register_method({
     method => 'POST',
     protected => 1,
     proxyto => 'node',
-    description => "Stop virtual machine.",
+    description => "Stop virtual machine. The qemu process will exit immediately. This" .
+       "is akin to pulling the power plug of a running computer and may damage the VM data",
     permissions => {
        check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]],
     },
@@ -1645,7 +2102,8 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid',
+                                       { completion => \&PVE::QemuServer::complete_vmid_running }),
            skiplock => get_standard_option('skiplock'),
            migratedfrom => get_standard_option('pve-node', { optional => 1 }),
            timeout => {
@@ -1655,7 +2113,7 @@ __PACKAGE__->register_method({
                optional => 1,
            },
            keepActive => {
-               description => "Do not decativate storage volumes.",
+               description => "Do not deactivate storage volumes.",
                type => 'boolean',
                optional => 1,
                default => 0,
@@ -1669,11 +2127,9 @@ __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 $skiplock = extract_param($param, 'skiplock');
@@ -1696,14 +2152,10 @@ __PACKAGE__->register_method({
            my $hacmd = sub {
                my $upid = shift;
 
-               my $service = "vm:$vmid";
-
-               my $cmd = ['ha-manager', 'disable', $service];
-
-               print "Executing HA stop for VM $vmid\n";
+               print "Requesting HA stop for VM $vmid\n";
 
+               my $cmd = ['ha-manager', 'set',  "vm:$vmid", '--state', 'stopped'];
                PVE::Tools::run_command($cmd);
-
                return;
            };
 
@@ -1717,7 +2169,6 @@ __PACKAGE__->register_method({
 
                PVE::QemuServer::vm_stop($storecfg, $vmid, $skiplock, 0,
                                         $param->{timeout}, 0, 1, $keepActive, $migratedfrom);
-
                return;
            };
 
@@ -1739,7 +2190,8 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid',
+                                       { completion => \&PVE::QemuServer::complete_vmid_running }),
            skiplock => get_standard_option('skiplock'),
        },
     },
@@ -1780,7 +2232,8 @@ __PACKAGE__->register_method({
     method => 'POST',
     protected => 1,
     proxyto => 'node',
-    description => "Shutdown virtual machine.",
+    description => "Shutdown virtual machine. This is similar to pressing the power button on a physical machine." .
+       "This will send an ACPI event for the guest OS, which should then proceed to a clean shutdown.",
     permissions => {
        check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]],
     },
@@ -1788,7 +2241,8 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid',
+                                       { completion => \&PVE::QemuServer::complete_vmid_running }),
            skiplock => get_standard_option('skiplock'),
            timeout => {
                description => "Wait maximal timeout seconds.",
@@ -1803,7 +2257,7 @@ __PACKAGE__->register_method({
                default => 0,
            },
            keepActive => {
-               description => "Do not decativate storage volumes.",
+               description => "Do not deactivate storage volumes.",
                type => 'boolean',
                optional => 1,
                default => 0,
@@ -1817,11 +2271,9 @@ __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 $skiplock = extract_param($param, 'skiplock');
@@ -1834,18 +2286,56 @@ __PACKAGE__->register_method({
 
        my $storecfg = PVE::Storage::config();
 
-       my $realcmd = sub {
-           my $upid = shift;
+       my $shutdown = 1;
 
-           syslog('info', "shutdown VM $vmid: $upid\n");
+       # if vm is paused, do not shutdown (but stop if forceStop = 1)
+       # otherwise, we will infer a shutdown command, but run into the timeout,
+       # then when the vm is resumed, it will instantly shutdown
+       #
+       # 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::QemuServer::vm_qmp_command($vmid, { execute => "query-status" }, 0);
+       };
+       my $err = $@ if $@;
 
-           PVE::QemuServer::vm_stop($storecfg, $vmid, $skiplock, 0, $param->{timeout},
-                                    1, $param->{forceStop}, $keepActive);
+       if (!$err && $qmpstatus->{status} eq "paused") {
+           if ($param->{forceStop}) {
+               warn "VM is paused - stop instead of shutdown\n";
+               $shutdown = 0;
+           } else {
+               die "VM is paused - cannot shutdown\n";
+           }
+       }
 
-           return;
-       };
+       if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
+
+           my $hacmd = sub {
+               my $upid = shift;
+
+               print "Requesting HA stop for VM $vmid\n";
+
+               my $cmd = ['ha-manager', 'set', "vm:$vmid", '--state', 'stopped'];
+               PVE::Tools::run_command($cmd);
+               return;
+           };
+
+           return $rpcenv->fork_worker('hastop', $vmid, $authuser, $hacmd);
+
+       } else {
+
+           my $realcmd = sub {
+               my $upid = shift;
+
+               syslog('info', "shutdown VM $vmid: $upid\n");
 
-       return $rpcenv->fork_worker('qmshutdown', $vmid, $authuser, $realcmd);
+               PVE::QemuServer::vm_stop($storecfg, $vmid, $skiplock, 0, $param->{timeout},
+                                        $shutdown, $param->{forceStop}, $keepActive);
+               return;
+           };
+
+           return $rpcenv->fork_worker('qmshutdown', $vmid, $authuser, $realcmd);
+       }
     }});
 
 __PACKAGE__->register_method({
@@ -1862,8 +2352,21 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid',
+                                       { completion => \&PVE::QemuServer::complete_vmid_running }),
            skiplock => get_standard_option('skiplock'),
+           todisk => {
+               type => 'boolean',
+               default => 0,
+               optional => 1,
+               description => 'If set, suspends the VM to disk. Will be resumed on next VM start.',
+           },
+           statestorage => get_standard_option('pve-storage-id', {
+               description => "The storage for the VM state",
+               requires => 'todisk',
+               optional => 1,
+               completion => \&PVE::Storage::complete_storage_enabled,
+           }),
        },
     },
     returns => {
@@ -1873,30 +2376,36 @@ __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 $todisk = extract_param($param, 'todisk') // 0;
+
+       my $statestorage = extract_param($param, 'statestorage');
+
        my $skiplock = extract_param($param, 'skiplock');
        raise_param_exc({ skiplock => "Only root may use this option." })
            if $skiplock && $authuser ne 'root@pam';
 
        die "VM $vmid not running\n" if !PVE::QemuServer::check_running($vmid);
 
+       die "Cannot suspend HA managed VM to disk\n"
+           if $todisk && PVE::HA::Config::vm_is_ha_managed($vmid);
+
        my $realcmd = sub {
            my $upid = shift;
 
            syslog('info', "suspend VM $vmid: $upid\n");
 
-           PVE::QemuServer::vm_suspend($vmid, $skiplock);
+           PVE::QemuServer::vm_suspend($vmid, $skiplock, $todisk, $statestorage);
 
            return;
        };
 
-       return $rpcenv->fork_worker('qmsuspend', $vmid, $authuser, $realcmd);
+       my $taskname = $todisk ? 'qmsuspend' : 'qmpause';
+       return $rpcenv->fork_worker($taskname, $vmid, $authuser, $realcmd);
     }});
 
 __PACKAGE__->register_method({
@@ -1913,8 +2422,11 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid',
+                                       { completion => \&PVE::QemuServer::complete_vmid_running }),
            skiplock => get_standard_option('skiplock'),
+           nocheck => { type => 'boolean', optional => 1 },
+
        },
     },
     returns => {
@@ -1935,14 +2447,30 @@ __PACKAGE__->register_method({
        raise_param_exc({ skiplock => "Only root may use this option." })
            if $skiplock && $authuser ne 'root@pam';
 
-       die "VM $vmid not running\n" if !PVE::QemuServer::check_running($vmid);
+       my $nocheck = extract_param($param, 'nocheck');
+
+       my $to_disk_suspended;
+       eval {
+           PVE::QemuConfig->lock_config($vmid, sub {
+               my $conf = PVE::QemuConfig->load_config($vmid);
+               $to_disk_suspended = PVE::QemuConfig->has_lock($conf, 'suspended');
+           });
+       };
+
+       die "VM $vmid not running\n"
+           if !$to_disk_suspended && !PVE::QemuServer::check_running($vmid, $nocheck);
 
        my $realcmd = sub {
            my $upid = shift;
 
            syslog('info', "resume VM $vmid: $upid\n");
 
-           PVE::QemuServer::vm_resume($vmid, $skiplock);
+           if (!$to_disk_suspended) {
+               PVE::QemuServer::vm_resume($vmid, $skiplock, $nocheck);
+           } else {
+               my $storecfg = PVE::Storage::config();
+               PVE::QemuServer::vm_start($storecfg, $vmid, undef, $skiplock);
+           }
 
            return;
        };
@@ -1964,7 +2492,8 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid',
+                                       { completion => \&PVE::QemuServer::complete_vmid_running }),
            skiplock => get_standard_option('skiplock'),
            key => {
                description => "The key (qemu monitor encoding).",
@@ -2041,7 +2570,7 @@ __PACKAGE__->register_method({
 
        my $running = PVE::QemuServer::check_running($vmid);
 
-       my $conf = PVE::QemuServer::load_config($vmid);
+       my $conf = PVE::QemuConfig->load_config($vmid);
 
        if($snapname){
            my $snap = $conf->{snapshots}->{$snapname};
@@ -2051,7 +2580,7 @@ __PACKAGE__->register_method({
        my $storecfg = PVE::Storage::config();
 
        my $nodelist = PVE::QemuServer::shared_nodes($conf, $storecfg);
-       my $hasFeature = PVE::QemuServer::has_feature($feature, $conf, $storecfg, $snapname, $running);
+       my $hasFeature = PVE::QemuConfig->has_feature($feature, $conf, $storecfg, $snapname, $running);
 
        return {
            hasFeature => $hasFeature,
@@ -2083,8 +2612,10 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
-           newid => get_standard_option('pve-vmid', { description => 'VMID for the clone.' }),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
+           newid => get_standard_option('pve-vmid', {
+               completion => \&PVE::Cluster::complete_next_vmid,
+               description => 'VMID for the clone.' }),
            name => {
                optional => 1,
                type => 'string', format => 'dns-name',
@@ -2105,12 +2636,10 @@ __PACKAGE__->register_method({
             }),
            storage => get_standard_option('pve-storage-id', {
                description => "Target storage for full clone.",
-               requires => 'full',
                optional => 1,
            }),
            'format' => {
-               description => "Target format for file storage.",
-               requires => 'full',
+               description => "Target format for file storage. Only valid for full clone.",
                type => 'string',
                optional => 1,
                enum => [ 'raw', 'qcow2', 'vmdk'],
@@ -2118,14 +2647,20 @@ __PACKAGE__->register_method({
            full => {
                optional => 1,
                type => 'boolean',
-               description => "Create a full copy of all disk. This is always done when " .
+               description => "Create a full copy of all disks. This is always done when " .
                    "you clone a normal VM. For VM templates, we try to create a linked clone by default.",
-               default => 0,
            },
            target => get_standard_option('pve-node', {
                description => "Target node. Only allowed if the original VM is on shared storage.",
                optional => 1,
            }),
+           bwlimit => {
+               description => "Override I/O bandwidth limit (in KiB/s).",
+               optional => 1,
+               type => 'integer',
+               minimum => '0',
+               default => 'clone limit from datacenter or storage config',
+           },
         },
     },
     returns => {
@@ -2190,9 +2725,9 @@ __PACKAGE__->register_method({
            # do all tests after lock
            # we also try to do all tests before we fork the worker
 
-           my $conf = PVE::QemuServer::load_config($vmid);
+           my $conf = PVE::QemuConfig->load_config($vmid);
 
-           PVE::QemuServer::check_lock($conf);
+           PVE::QemuConfig->check_lock($conf);
 
            my $verify_running = PVE::QemuServer::check_running($vmid) || 0;
 
@@ -2201,19 +2736,31 @@ __PACKAGE__->register_method({
            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);
+           }
+
+           die "parameter 'storage' not allowed for linked clones\n"
+               if defined($storage) && !$full;
+
+           die "parameter 'format' not allowed for linked clones\n"
+               if defined($format) && !$full;
+
            my $oldconf = $snapname ? $conf->{snapshots}->{$snapname} : $conf;
 
            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;
 
-           my $conffile = PVE::QemuServer::config_file($newid);
+           my $conffile = PVE::QemuConfig->config_file($newid);
 
            die "unable to create VM $newid: config file already exists\n"
                if -f $conffile;
 
            my $newconf = { lock => 'clone' };
            my $drives = {};
+           my $fullclone = {};
            my $vollist = [];
 
            foreach my $opt (keys %$oldconf) {
@@ -2223,24 +2770,28 @@ __PACKAGE__->register_method({
                next if $opt eq 'snapshots' ||  $opt eq 'parent' || $opt eq 'snaptime' ||
                    $opt eq 'vmstate' || $opt eq 'snapstate';
 
+               # no need to copy unused images, because VMID(owner) changes anyways
+               next if $opt =~ m/^unused\d+$/;
+
                # always change MAC! address
                if ($opt =~ m/^net(\d+)$/) {
                    my $net = PVE::QemuServer::parse_net($value);
-                   $net->{macaddr} =  PVE::Tools::random_ether_addr();
+                   my $dc = PVE::Cluster::cfs_read_file('datacenter.cfg');
+                   $net->{macaddr} =  PVE::Tools::random_ether_addr($dc->{mac_prefix});
                    $newconf->{$opt} = PVE::QemuServer::print_net($net);
-               } elsif (PVE::QemuServer::valid_drivename($opt)) {
+               } elsif (PVE::QemuServer::is_valid_drivename($opt)) {
                    my $drive = PVE::QemuServer::parse_drive($opt, $value);
                    die "unable to parse drive options for '$opt'\n" if !$drive;
-                   if (PVE::QemuServer::drive_is_cdrom($drive)) {
+                   if (PVE::QemuServer::drive_is_cdrom($drive, 1)) {
                        $newconf->{$opt} = $value; # simply copy configuration
                    } else {
-                       if ($param->{full}) {
-                           die "Full clone feature is not available"
+                       if ($full || PVE::QemuServer::drive_is_cloudinit($drive)) {
+                           die "Full clone feature is not supported for drive '$opt'\n"
                                if !PVE::Storage::volume_has_feature($storecfg, 'copy', $drive->{file}, $snapname, $running);
-                           $drive->{full} = 1;
+                           $fullclone->{$opt} = 1;
                        } else {
                            # not full means clone instead of copy
-                           die "Linked clone feature is not available"
+                           die "Linked clone feature is not supported for drive '$opt'\n"
                                if !PVE::Storage::volume_has_feature($storecfg, 'clone', $drive->{file}, $snapname, $running);
                        }
                        $drives->{$opt} = $drive;
@@ -2253,13 +2804,15 @@ __PACKAGE__->register_method({
            }
 
             # auto generate a new uuid
-            my ($uuid, $uuid_str);
-            UUID::generate($uuid);
-            UUID::unparse($uuid, $uuid_str);
            my $smbios1 = PVE::QemuServer::parse_smbios1($newconf->{smbios1} || '');
-           $smbios1->{uuid} = $uuid_str;
+           $smbios1->{uuid} = PVE::QemuServer::generate_uuid();
            $newconf->{smbios1} = PVE::QemuServer::print_smbios1($smbios1);
 
+           # auto generate a new vmgenid if the option was set
+           if ($newconf->{vmgenid}) {
+               $newconf->{vmgenid} = PVE::QemuServer::generate_uuid();
+           }
+
            delete $newconf->{template};
 
            if ($param->{name}) {
@@ -2283,31 +2836,57 @@ __PACKAGE__->register_method({
                my $upid = shift;
 
                my $newvollist = [];
+               my $jobs = {};
 
                eval {
-                   local $SIG{INT} = $SIG{TERM} = $SIG{QUIT} = $SIG{HUP} = sub { die "interrupted by signal\n"; };
+                   local $SIG{INT} =
+                       local $SIG{TERM} =
+                       local $SIG{QUIT} =
+                       local $SIG{HUP} = sub { die "interrupted by signal\n"; };
+
+                   PVE::Storage::activate_volumes($storecfg, $vollist, $snapname);
 
-                   PVE::Storage::activate_volumes($storecfg, $vollist);
+                   my $bwlimit = extract_param($param, 'bwlimit');
+
+                   my $total_jobs = scalar(keys %{$drives});
+                   my $i = 1;
 
                    foreach my $opt (keys %$drives) {
                        my $drive = $drives->{$opt};
+                       my $skipcomplete = ($total_jobs != $i); # finish after last drive
+
+                       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, $drive->{full}, $newvollist);
+                                                                  $newid, $storage, $format, $fullclone->{$opt}, $newvollist,
+                                                                  $jobs, $skipcomplete, $oldconf->{agent}, $clonelimit);
 
                        $newconf->{$opt} = PVE::QemuServer::print_drive($vmid, $newdrive);
 
-                       PVE::QemuServer::update_config_nolock($newid, $newconf, 1);
+                       PVE::QemuConfig->write_config($newid, $newconf);
+                       $i++;
                    }
 
                    delete $newconf->{lock};
-                   PVE::QemuServer::update_config_nolock($newid, $newconf, 1);
+
+                   # do not write pending changes
+                   if (my @changes = keys %{$newconf->{pending}}) {
+                       my $pending = join(',', @changes);
+                       warn "found pending changes for '$pending', discarding for clone\n";
+                       delete $newconf->{pending};
+                   }
+
+                   PVE::QemuConfig->write_config($newid, $newconf);
 
                     if ($target) {
                        # always deactivate volumes - avoid lvm LVs to be active on several nodes
-                       PVE::Storage::deactivate_volumes($storecfg, $vollist);
+                       PVE::Storage::deactivate_volumes($storecfg, $vollist, $snapname) if !$running;
+                       PVE::Storage::deactivate_volumes($storecfg, $newvollist);
 
-                       my $newconffile = PVE::QemuServer::config_file($newid, $target);
+                       my $newconffile = PVE::QemuConfig->config_file($newid, $target);
                        die "Failed to move config to node '$target' - rename failed: $!\n"
                            if !rename($conffile, $newconffile);
                    }
@@ -2317,6 +2896,8 @@ __PACKAGE__->register_method({
                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) {
@@ -2329,12 +2910,14 @@ __PACKAGE__->register_method({
                return;
            };
 
+           PVE::Firewall::clone_vmfw_conf($vmid, $newid);
+
            return $rpcenv->fork_worker('qmclone', $vmid, $authuser, $realcmd);
        };
 
-       return PVE::QemuServer::lock_config_mode($vmid, 1, $shared_lock, sub {
+       return PVE::QemuConfig->lock_config_mode($vmid, 1, $shared_lock, sub {
            # Aquire exclusive lock lock for $newid
-           return PVE::QemuServer::lock_config_full($newid, 1, $clonefn);
+           return PVE::QemuConfig->lock_config_full($newid, 1, $clonefn);
        });
 
     }});
@@ -2347,25 +2930,26 @@ __PACKAGE__->register_method({
     proxyto => 'node',
     description => "Move volume to different storage.",
     permissions => {
-       description => "You need 'VM.Config.Disk' permissions on /vms/{vmid}, " .
-           "and 'Datastore.AllocateSpace' permissions on the storage.",
-       check =>
-       [ 'and',
-         ['perm', '/vms/{vmid}', [ 'VM.Config.Disk' ]],
-         ['perm', '/storage/{storage}', [ 'Datastore.AllocateSpace' ]],
-       ],
+       description => "You need 'VM.Config.Disk' permissions on /vms/{vmid}, and 'Datastore.AllocateSpace' permissions on the storage.",
+       check => [ 'and',
+                  ['perm', '/vms/{vmid}', [ 'VM.Config.Disk' ]],
+                  ['perm', '/storage/{storage}', [ 'Datastore.AllocateSpace' ]],
+           ],
     },
     parameters => {
         additionalProperties => 0,
-        properties => {
+       properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
            disk => {
                type => 'string',
                description => "The disk you want to move.",
-               enum => [ PVE::QemuServer::disknames() ],
+               enum => [ PVE::QemuServer::valid_drive_names() ],
            },
-            storage => get_standard_option('pve-storage-id', { description => "Target Storage." }),
+            storage => get_standard_option('pve-storage-id', {
+               description => "Target storage.",
+               completion => \&PVE::QemuServer::complete_storage,
+            }),
             'format' => {
                 type => 'string',
                 description => "Target Format.",
@@ -2384,6 +2968,13 @@ __PACKAGE__->register_method({
                maxLength => 40,
                optional => 1,
            },
+           bwlimit => {
+               description => "Override I/O bandwidth limit (in KiB/s).",
+               optional => 1,
+               type => 'integer',
+               minimum => '0',
+               default => 'move limit from datacenter or storage config',
+           },
        },
     },
     returns => {
@@ -2413,7 +3004,9 @@ __PACKAGE__->register_method({
 
        my $updatefn =  sub {
 
-           my $conf = PVE::QemuServer::load_config($vmid);
+           my $conf = PVE::QemuConfig->load_config($vmid);
+
+           PVE::QemuConfig->check_lock($conf);
 
            die "checksum missmatch (file change by other user?)\n"
                if $digest && $digest ne $conf->{digest};
@@ -2424,7 +3017,7 @@ __PACKAGE__->register_method({
 
            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, 1);
 
            my $oldfmt;
            my ($oldstoreid, $oldvolname) = PVE::Storage::parse_volume_id($old_volid);
@@ -2435,6 +3028,11 @@ __PACKAGE__->register_method({
            die "you can't move on 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);
+           die "you can't move a disk with snapshots and delete the source\n"
+               if $snapshotted && $param->{delete};
+
            PVE::Cluster::log_msg('info', $authuser, "move disk VM $vmid: move --disk $disk --storage $storeid");
 
            my $running = PVE::QemuServer::check_running($vmid);
@@ -2446,16 +3044,33 @@ __PACKAGE__->register_method({
                my $newvollist = [];
 
                eval {
-                   local $SIG{INT} = $SIG{TERM} = $SIG{QUIT} = $SIG{HUP} = sub { die "interrupted by signal\n"; };
+                   local $SIG{INT} =
+                       local $SIG{TERM} =
+                       local $SIG{QUIT} =
+                       local $SIG{HUP} = sub { die "interrupted by signal\n"; };
+
+                   warn "moving disk with snapshots, snapshots will not be moved!\n"
+                       if $snapshotted;
+
+                   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);
+                                                              $vmid, $storeid, $format, 1, $newvollist, undef, undef, undef, $movelimit);
 
                    $conf->{$disk} = PVE::QemuServer::print_drive($vmid, $newdrive);
 
-                   PVE::QemuServer::add_unused_volume($conf, $old_volid) if !$param->{delete};
+                   PVE::QemuConfig->add_unused_volume($conf, $old_volid) if !$param->{delete};
 
-                   PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+                   # convert moved disk to base if part of template
+                   PVE::QemuServer::template_create($vmid, $conf, $disk)
+                       if PVE::QemuConfig->is_template($conf);
+
+                   PVE::QemuConfig->write_config($vmid, $conf);
+
+                   if ($running && PVE::QemuServer::parse_guest_agent($conf)->{fstrim_cloned_disks} && PVE::QemuServer::qga_check_running($vmid)) {
+                       eval { PVE::QemuServer::vm_mon_cmd($vmid, "guest-fstrim"); };
+                   }
 
                    eval {
                        # try to deactivate volumes - avoid lvm LVs to be active on several nodes
@@ -2474,23 +3089,139 @@ __PACKAGE__->register_method({
                 }
 
                if ($param->{delete}) {
-                    my $used_paths = PVE::QemuServer::get_used_paths($vmid, $storecfg, $conf, 1, 1);
-                    my $path = PVE::Storage::path($storecfg, $old_volid);
-                   if ($used_paths->{$path}){
-                       warn "volume $old_volid have snapshots. Can't delete it\n";
-                       PVE::QemuServer::add_unused_volume($conf, $old_volid);
-                       PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
-                   } else {
-                       eval { PVE::Storage::vdisk_free($storecfg, $old_volid); };
-                       warn $@ if $@;
-                   }
+                   eval {
+                       PVE::Storage::deactivate_volumes($storecfg, [$old_volid]);
+                       PVE::Storage::vdisk_free($storecfg, $old_volid);
+                   };
+                   warn $@ if $@;
                }
            };
 
             return $rpcenv->fork_worker('qmmove', $vmid, $authuser, $realcmd);
        };
 
-       return PVE::QemuServer::lock_config($vmid, $updatefn);
+       return PVE::QemuConfig->lock_config($vmid, $updatefn);
+    }});
+
+my $check_vm_disks_local = sub {
+    my ($storecfg, $vmconf, $vmid) = @_;
+
+    my $local_disks = {};
+
+    # add some more information to the disks e.g. cdrom
+    PVE::QemuServer::foreach_volid($vmconf, sub {
+       my ($volid, $attr) = @_;
+
+       my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
+       if ($storeid) {
+           my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
+           return if $scfg->{shared};
+       }
+       # The shared attr here is just a special case where the vdisk
+       # is marked as shared manually
+       return if $attr->{shared};
+       return if $attr->{cdrom} and $volid eq "none";
+
+       if (exists $local_disks->{$volid}) {
+           @{$local_disks->{$volid}}{keys %$attr} = values %$attr
+       } else {
+           $local_disks->{$volid} = $attr;
+           # ensure volid is present in case it's needed
+           $local_disks->{$volid}->{volid} = $volid;
+       }
+    });
+
+    return $local_disks;
+};
+
+__PACKAGE__->register_method({
+    name => 'migrate_vm_precondition',
+    path => '{vmid}/migrate',
+    method => 'GET',
+    protected => 1,
+    proxyto => 'node',
+    description => "Get preconditions for migration.",
+    permissions => {
+       check => ['perm', '/vms/{vmid}', [ 'VM.Migrate' ]],
+    },
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
+           target => get_standard_option('pve-node', {
+               description => "Target node.",
+               completion =>  \&PVE::Cluster::complete_migration_target,
+               optional => 1,
+           }),
+       },
+    },
+    returns => {
+       type => "object",
+       properties => {
+           running => { type => 'boolean' },
+           allowed_nodes => {
+               type => 'array',
+               optional => 1,
+               description => "List nodes allowed for offline migration with same local storage as source node, only passed if VM is offline"
+           },
+           local_disks => {
+               type => 'array',
+               description => "List local disks including CD-Rom, unsused and not referenced disks"
+           },
+           local_resources => {
+               type => 'array',
+               description => "List local resources e.g. pci, usb"
+           }
+       },
+    },
+    code => sub {
+       my ($param) = @_;
+
+       my $rpcenv = PVE::RPCEnvironment::get();
+
+       my $authuser = $rpcenv->get_user();
+
+       PVE::Cluster::check_cfs_quorum();
+
+       my $res = {};
+
+       my $vmid = extract_param($param, 'vmid');
+       my $target = extract_param($param, 'target');
+       my $localnode = PVE::INotify::nodename();
+
+
+       # test if VM exists
+       my $vmconf = PVE::QemuConfig->load_config($vmid);
+       my $storecfg = PVE::Storage::config();
+
+
+       # try to detect errors early
+       PVE::QemuConfig->check_lock($vmconf);
+
+       $res->{running} = PVE::QemuServer::check_running($vmid) ? 1:0;
+
+       # if vm is not running, return target nodes where local storage is available
+       # for offline migration
+       if (!$res->{running}) {
+           my $shared_nodes = PVE::QemuServer::shared_nodes($vmconf, $storecfg);
+
+           delete $shared_nodes->{$localnode} if $shared_nodes->{$localnode};
+
+           $res->{allowed_nodes} = [ keys %$shared_nodes ];
+       }
+
+
+       my $local_disks = &$check_vm_disks_local($storecfg, $vmconf, $vmid);
+       $res->{local_disks} = [ values %$local_disks ];;
+
+       my $local_resources =  PVE::QemuServer::check_local_resources($vmconf, 1);
+
+       $res->{local_resources} = $local_resources;
+
+       return $res;
+
+
     }});
 
 __PACKAGE__->register_method({
@@ -2507,8 +3238,11 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
-           target => get_standard_option('pve-node', { description => "Target node." }),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
+           target => get_standard_option('pve-node', {
+               description => "Target node.",
+               completion =>  \&PVE::Cluster::complete_migration_target,
+            }),
            online => {
                type => 'boolean',
                description => "Use online/live migration.",
@@ -2519,6 +3253,34 @@ __PACKAGE__->register_method({
                description => "Allow to migrate VMs which use local devices. Only root may use this option.",
                optional => 1,
            },
+           migration_type => {
+               type => 'string',
+               enum => ['secure', 'insecure'],
+               description => "Migration traffic is encrypted using an SSH tunnel by default. On secure, completely private networks this can be disabled to increase performance.",
+               optional => 1,
+           },
+           migration_network => {
+               type => 'string', format => 'CIDR',
+               description => "CIDR of the (sub) network that is used for migration.",
+               optional => 1,
+           },
+           "with-local-disks" => {
+               type => 'boolean',
+               description => "Enable live storage migration for local disk",
+               optional => 1,
+           },
+            targetstorage => get_standard_option('pve-storage-id', {
+               description => "Default target storage.",
+               optional => 1,
+               completion => \&PVE::QemuServer::complete_storage,
+            }),
+           bwlimit => {
+               description => "Override I/O bandwidth limit (in KiB/s).",
+               optional => 1,
+               type => 'integer',
+               minimum => '0',
+               default => 'migrate limit from datacenter or storage config',
+           },
        },
     },
     returns => {
@@ -2529,7 +3291,6 @@ __PACKAGE__->register_method({
        my ($param) = @_;
 
        my $rpcenv = PVE::RPCEnvironment::get();
-
        my $authuser = $rpcenv->get_user();
 
        my $target = extract_param($param, 'target');
@@ -2545,15 +3306,25 @@ __PACKAGE__->register_method({
 
        my $vmid = extract_param($param, 'vmid');
 
+       raise_param_exc({ targetstorage => "Live storage migration can only be done online." })
+           if !$param->{online} && $param->{targetstorage};
+
        raise_param_exc({ force => "Only root may use this option." })
            if $param->{force} && $authuser ne 'root@pam';
 
+       raise_param_exc({ migration_type => "Only root may use this option." })
+           if $param->{migration_type} && $authuser ne 'root@pam';
+
+       # allow root only until better network permissions are available
+       raise_param_exc({ migration_network => "Only root may use this option." })
+           if $param->{migration_network} && $authuser ne 'root@pam';
+
        # test if VM exists
-       my $conf = PVE::QemuServer::load_config($vmid);
+       my $conf = PVE::QemuConfig->load_config($vmid);
 
        # try to detect errors early
 
-       PVE::QemuServer::check_lock($conf);
+       PVE::QemuConfig->check_lock($conf);
 
        if (PVE::QemuServer::check_running($vmid)) {
            die "cant migrate running VM without --online\n"
@@ -2561,21 +3332,22 @@ __PACKAGE__->register_method({
        }
 
        my $storecfg = PVE::Storage::config();
-       PVE::QemuServer::check_storage_availability($storecfg, $conf, $target);
+
+       if( $param->{targetstorage}) {
+           PVE::Storage::storage_check_node($storecfg, $param->{targetstorage}, $target);
+        } else {
+           PVE::QemuServer::check_storage_availability($storecfg, $conf, $target);
+       }
 
        if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
 
            my $hacmd = sub {
                my $upid = shift;
 
-               my $service = "vm:$vmid";
-
-               my $cmd = ['ha-manager', 'migrate', $service, $target];
-
-               print "Executing HA migrate for VM $vmid to node $target\n";
+               print "Requesting HA migration for VM $vmid to node $target\n";
 
+               my $cmd = ['ha-manager', 'migrate', "vm:$vmid", $target];
                PVE::Tools::run_command($cmd);
-
                return;
            };
 
@@ -2584,12 +3356,14 @@ __PACKAGE__->register_method({
        } else {
 
            my $realcmd = sub {
-               my $upid = shift;
-
                PVE::QemuMigrate->migrate($target, $targetip, $vmid, $param);
            };
 
-           return $rpcenv->fork_worker('qmigrate', $vmid, $authuser, $realcmd);
+           my $worker = sub {
+               return PVE::GuestHelpers::guest_migration_lock($vmid, 10, $realcmd);
+           };
+
+           return $rpcenv->fork_worker('qmigrate', $vmid, $authuser, $worker);
        }
 
     }});
@@ -2602,7 +3376,8 @@ __PACKAGE__->register_method({
     proxyto => 'node',
     description => "Execute Qemu monitor commands.",
     permissions => {
-       check => ['perm', '/vms/{vmid}', [ 'VM.Monitor' ]],
+       description => "Sys.Modify is required for (sub)commands which are not read-only ('info *' and 'help')",
+        check => ['perm', '/vms/{vmid}', [ 'VM.Monitor' ]],
     },
     parameters => {
        additionalProperties => 0,
@@ -2619,9 +3394,21 @@ __PACKAGE__->register_method({
     code => sub {
        my ($param) = @_;
 
+       my $rpcenv = PVE::RPCEnvironment::get();
+       my $authuser = $rpcenv->get_user();
+
+       my $is_ro = sub {
+           my $command = shift;
+           return $command =~ m/^\s*info(\s+|$)/
+               || $command =~ m/^\s*help\s*$/;
+       };
+
+       $rpcenv->check_full($authuser, "/", ['Sys.Modify'])
+           if !&$is_ro($param->{command});
+
        my $vmid = $param->{vmid};
 
-       my $conf = PVE::QemuServer::load_config ($vmid); # check if VM exists
+       my $conf = PVE::QemuConfig->load_config ($vmid); # check if VM exists
 
        my $res = '';
        eval {
@@ -2646,17 +3433,17 @@ __PACKAGE__->register_method({
         additionalProperties => 0,
         properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           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::disknames()],
+               enum => [PVE::QemuServer::valid_drive_names()],
            },
            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.",
+               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',
@@ -2692,16 +3479,22 @@ __PACKAGE__->register_method({
 
         my $updatefn =  sub {
 
-            my $conf = PVE::QemuServer::load_config($vmid);
+            my $conf = PVE::QemuConfig->load_config($vmid);
 
             die "checksum missmatch (file change by other user?)\n"
                 if $digest && $digest ne $conf->{digest};
-            PVE::QemuServer::check_lock($conf) if !$skiplock;
+            PVE::QemuConfig->check_lock($conf) if !$skiplock;
 
            die "disk '$disk' does not exist\n" if !$conf->{$disk};
 
            my $drive = PVE::QemuServer::parse_drive($disk, $conf->{$disk});
 
+           my (undef, undef, undef, undef, undef, undef, $format) =
+               PVE::Storage::parse_volname($storecfg, $drive->{file});
+
+           die "can't resize volume: $disk if snapshot exists\n"
+               if %{$conf->{snapshots}} && $format eq 'qcow2';
+
            my $volid = $drive->{file};
 
            die "disk '$disk' has no associated volume\n" if !$volid;
@@ -2712,6 +3505,7 @@ __PACKAGE__->register_method({
 
            $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']);
 
+           PVE::Storage::activate_volumes($storecfg, [$volid]);
            my $size = PVE::Storage::volume_size_info($storecfg, $volid, 5);
 
            die "internal error" if $sizestr !~ m/^(\+)?(\d+(\.\d+)?)([KMGT])?$/;
@@ -2730,7 +3524,7 @@ __PACKAGE__->register_method({
            $newsize += $size if $ext;
            $newsize = int($newsize);
 
-           die "unable to skrink disk size\n" if $newsize < $size;
+           die "shrinking disks is not supported\n" if $newsize < $size;
 
            return if $size == $newsize;
 
@@ -2741,10 +3535,10 @@ __PACKAGE__->register_method({
            $drive->{size} = $newsize;
            $conf->{$disk} = PVE::QemuServer::print_drive($vmid, $drive);
 
-           PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+           PVE::QemuConfig->write_config($vmid, $conf);
        };
 
-        PVE::QemuServer::lock_config($vmid, $updatefn);
+        PVE::QemuConfig->lock_config($vmid, $updatefn);
         return undef;
     }});
 
@@ -2761,7 +3555,7 @@ __PACKAGE__->register_method({
     parameters => {
        additionalProperties => 0,
        properties => {
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
            node => get_standard_option('pve-node'),
        },
     },
@@ -2769,7 +3563,32 @@ __PACKAGE__->register_method({
        type => 'array',
        items => {
            type => "object",
-           properties => {},
+           properties => {
+               name => {
+                   description => "Snapshot identifier. Value 'current' identifies the current VM.",
+                   type => 'string',
+               },
+               vmstate => {
+                   description => "Snapshot includes RAM.",
+                   type => 'boolean',
+                   optional => 1,
+               },
+               description => {
+                   description => "Snapshot description.",
+                   type => 'string',
+               },
+               snaptime => {
+                   description => "Snapshot creation time",
+                   type => 'integer',
+                   renderer => 'timestamp',
+                   optional => 1,
+               },
+               parent => {
+                   description => "Parent snapshot identifier.",
+                   type => 'string',
+                   optional => 1,
+               },
+           },
        },
        links => [ { rel => 'child', href => "{name}" } ],
     },
@@ -2778,7 +3597,7 @@ __PACKAGE__->register_method({
 
        my $vmid = $param->{vmid};
 
-       my $conf = PVE::QemuServer::load_config($vmid);
+       my $conf = PVE::QemuConfig->load_config($vmid);
        my $snaphash = $conf->{snapshots} || {};
 
        my $res = [];
@@ -2797,7 +3616,12 @@ __PACKAGE__->register_method({
        }
 
        my $running = PVE::QemuServer::check_running($vmid, 1) ? 1 : 0;
-       my $current = { name => 'current', digest => $conf->{digest}, running => $running };
+       my $current = {
+           name => 'current',
+           digest => $conf->{digest},
+           running => $running,
+           description => "You are here!",
+       };
        $current->{parent} = $conf->{parent} if $conf->{parent};
 
        push @$res, $current;
@@ -2819,7 +3643,7 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
            snapname => get_standard_option('pve-snapshot-name'),
            vmstate => {
                optional => 1,
@@ -2855,7 +3679,7 @@ __PACKAGE__->register_method({
 
        my $realcmd = sub {
            PVE::Cluster::log_msg('info', $authuser, "snapshot VM $vmid: $snapname");
-           PVE::QemuServer::snapshot_create($vmid, $snapname, $param->{vmstate}, 
+           PVE::QemuConfig->snapshot_create($vmid, $snapname, $param->{vmstate},
                                             $param->{description});
        };
 
@@ -2936,9 +3760,9 @@ __PACKAGE__->register_method({
 
        my $updatefn =  sub {
 
-           my $conf = PVE::QemuServer::load_config($vmid);
+           my $conf = PVE::QemuConfig->load_config($vmid);
 
-           PVE::QemuServer::check_lock($conf);
+           PVE::QemuConfig->check_lock($conf);
 
            my $snap = $conf->{snapshots}->{$snapname};
 
@@ -2946,10 +3770,10 @@ __PACKAGE__->register_method({
 
            $snap->{description} = $param->{description} if defined($param->{description});
 
-            PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+            PVE::QemuConfig->write_config($vmid, $conf);
        };
 
-       PVE::QemuServer::lock_config($vmid, $updatefn);
+       PVE::QemuConfig->lock_config($vmid, $updatefn);
 
        return undef;
     }});
@@ -2961,7 +3785,7 @@ __PACKAGE__->register_method({
     proxyto => 'node',
     description => "Get snapshot configuration",
     permissions => {
-       check => ['perm', '/vms/{vmid}', [ 'VM.Snapshot' ]],
+       check => ['perm', '/vms/{vmid}', [ 'VM.Snapshot', 'VM.Snapshot.Rollback' ], any => 1],
     },
     parameters => {
        additionalProperties => 0,
@@ -2983,7 +3807,7 @@ __PACKAGE__->register_method({
 
        my $snapname = extract_param($param, 'snapname');
 
-       my $conf = PVE::QemuServer::load_config($vmid);
+       my $conf = PVE::QemuConfig->load_config($vmid);
 
        my $snap = $conf->{snapshots}->{$snapname};
 
@@ -3000,13 +3824,13 @@ __PACKAGE__->register_method({
     proxyto => 'node',
     description => "Rollback VM state to specified snapshot.",
     permissions => {
-       check => ['perm', '/vms/{vmid}', [ 'VM.Snapshot' ]],
+       check => ['perm', '/vms/{vmid}', [ 'VM.Snapshot', 'VM.Snapshot.Rollback' ], any => 1],
     },
     parameters => {
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
            snapname => get_standard_option('pve-snapshot-name'),
        },
     },
@@ -3029,10 +3853,15 @@ __PACKAGE__->register_method({
 
        my $realcmd = sub {
            PVE::Cluster::log_msg('info', $authuser, "rollback snapshot VM $vmid: $snapname");
-           PVE::QemuServer::snapshot_rollback($vmid, $snapname);
+           PVE::QemuConfig->snapshot_rollback($vmid, $snapname);
+       };
+
+       my $worker = sub {
+           # hold migration lock, this makes sure that nobody create replication snapshots
+           return PVE::GuestHelpers::guest_migration_lock($vmid, 10, $realcmd);
        };
 
-       return $rpcenv->fork_worker('qmrollback', $vmid, $authuser, $realcmd);
+       return $rpcenv->fork_worker('qmrollback', $vmid, $authuser, $worker);
     }});
 
 __PACKAGE__->register_method({
@@ -3049,7 +3878,7 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
            snapname => get_standard_option('pve-snapshot-name'),
            force => {
                optional => 1,
@@ -3077,7 +3906,7 @@ __PACKAGE__->register_method({
 
        my $realcmd = sub {
            PVE::Cluster::log_msg('info', $authuser, "delete snapshot VM $vmid: $snapname");
-           PVE::QemuServer::snapshot_delete($vmid, $snapname, $param->{force});
+           PVE::QemuConfig->snapshot_delete($vmid, $snapname, $param->{force});
        };
 
        return $rpcenv->fork_worker('qmdelsnapshot', $vmid, $authuser, $realcmd);
@@ -3098,12 +3927,12 @@ __PACKAGE__->register_method({
        additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
-           vmid => get_standard_option('pve-vmid'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid_stopped }),
            disk => {
                optional => 1,
                type => 'string',
                description => "If you want to convert only 1 disk to base image.",
-               enum => [PVE::QemuServer::disknames()],
+               enum => [PVE::QemuServer::valid_drive_names()],
            },
 
        },
@@ -3124,15 +3953,15 @@ __PACKAGE__->register_method({
 
        my $updatefn =  sub {
 
-           my $conf = PVE::QemuServer::load_config($vmid);
+           my $conf = PVE::QemuConfig->load_config($vmid);
 
-           PVE::QemuServer::check_lock($conf);
+           PVE::QemuConfig->check_lock($conf);
 
            die "unable to create template, because VM contains snapshots\n"
                if $conf->{snapshots} && scalar(keys %{$conf->{snapshots}});
 
            die "you can't convert a template to a template\n"
-               if PVE::QemuServer::is_template($conf) && !$disk;
+               if PVE::QemuConfig->is_template($conf) && !$disk;
 
            die "you can't convert a VM to template if VM is running\n"
                if PVE::QemuServer::check_running($vmid);
@@ -3142,13 +3971,45 @@ __PACKAGE__->register_method({
            };
 
            $conf->{template} = 1;
-           PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+           PVE::QemuConfig->write_config($vmid, $conf);
 
            return $rpcenv->fork_worker('qmtemplate', $vmid, $authuser, $realcmd);
        };
 
-       PVE::QemuServer::lock_config($vmid, $updatefn);
+       PVE::QemuConfig->lock_config($vmid, $updatefn);
        return undef;
     }});
 
+__PACKAGE__->register_method({
+    name => 'cloudinit_generated_config_dump',
+    path => '{vmid}/cloudinit/dump',
+    method => 'GET',
+    proxyto => 'node',
+    description => "Get automatically generated cloudinit config.",
+    permissions => {
+       check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]],
+    },
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
+           type => {
+               description => 'Config type.',
+               type => 'string',
+               enum => ['user', 'network', 'meta'],
+           },
+       },
+    },
+    returns => {
+       type => 'string',
+    },
+    code => sub {
+       my ($param) = @_;
+
+       my $conf = PVE::QemuConfig->load_config($param->{vmid});
+
+       return PVE::QemuServer::Cloudinit::dump_cloudinit_config($conf, $param->{vmid}, $param->{type});
+    }});
+
 1;