remove $vmid param from print_drive

[qemu-server.git] / PVE / API2 / Qemu.pm

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 4dd329ab959d111373ef374d996bfe853e8d106d..fbf036ae7d4d19061c6717489ae86342262c0426 100644 (file)
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -70,7 +70,7 @@ my $check_storage_access = sub {
        my $volid = $drive->{file};
        my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
 
-       if (!$volid || ($volid eq 'none' || $volid eq 'cloudinit' || $volname eq 'cloudinit')) {
+       if (!$volid || ($volid eq 'none' || $volid eq 'cloudinit' || (defined($volname) && $volname eq 'cloudinit'))) {
            # nothing to check
        } elsif ($isCDROM && ($volid eq 'cdrom')) {
            $rpcenv->check($authuser, "/", ['Sys.Console']);
@@ -147,8 +147,8 @@ my $create_disks = sub {
 
        if (!$volid || $volid eq 'none' || $volid eq 'cdrom') {
            delete $disk->{size};
-           $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
-       } elsif ($volname eq 'cloudinit') {
+           $res->{$ds} = PVE::QemuServer::print_drive($disk);
+       } elsif (defined($volname) && $volname eq 'cloudinit') {
            $storeid = $storeid // $default_storage;
            die "no storage ID specified (and no default storage)\n" if !$storeid;
            my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
@@ -169,7 +169,7 @@ my $create_disks = sub {
            $disk->{media} = 'cdrom';
            push @$vollist, $volid;
            delete $disk->{format}; # no longer needed
-           $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
+           $res->{$ds} = PVE::QemuServer::print_drive($disk);
        } elsif ($volid =~ $NEW_DISK_RE) {
            my ($storeid, $size) = ($2 || $default_storage, $3);
            die "no storage ID specified (and no default storage)\n" if !$storeid;
@@ -188,7 +188,7 @@ my $create_disks = sub {
            $disk->{file} = $volid;
            $disk->{size} = PVE::Tools::convert_size($size, 'kb' => 'b');
            delete $disk->{format}; # no longer needed
-           $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
+           $res->{$ds} = PVE::QemuServer::print_drive($disk);
        } else {
 
            PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid);
@@ -211,7 +211,7 @@ my $create_disks = sub {
                $disk->{size} = $size;
            }
 
-           $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
+           $res->{$ds} = PVE::QemuServer::print_drive($disk);
        }
     };
 
@@ -315,6 +315,7 @@ my $check_vm_modify_config_perm = sub {
        # 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 'vmstate';
        next if $opt eq 'cdrom';
        next if $opt =~ m/^(?:unused|serial|usb)\d+$/;
 
@@ -524,7 +525,7 @@ __PACKAGE__->register_method({
                    raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive;
 
                    PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive);
-                   $param->{$opt} = PVE::QemuServer::print_drive($vmid, $drive);
+                   $param->{$opt} = PVE::QemuServer::print_drive($drive);
                }
            }
 
@@ -593,7 +594,7 @@ __PACKAGE__->register_method({
 
                my $conf = $param;
 
-               my ($arch, undef) = PVE::QemuServer::get_basic_machine_info($conf);
+               my $arch = PVE::QemuServer::get_vm_arch($conf);
 
                eval {
 
@@ -1062,7 +1063,7 @@ my $update_vm_api  = sub {
            raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive;
            PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive);
            $check_replication->($drive);
-           $param->{$opt} = PVE::QemuServer::print_drive($vmid, $drive);
+           $param->{$opt} = PVE::QemuServer::print_drive($drive);
        } elsif ($opt =~ m/^net(\d+)$/) {
            # add macaddr
            my $net = PVE::QemuServer::parse_net($param->{$opt});
@@ -1090,6 +1091,15 @@ my $update_vm_api  = sub {
        die "checksum missmatch (file change by other user?)\n"
            if $digest && $digest ne $conf->{digest};
 
+       # FIXME: 'suspended' lock should probabyl be a state or "weak" lock?!
+       if (scalar(@delete) && grep { $_ eq 'vmstate'} @delete) {
+           if (defined($conf->{lock}) && $conf->{lock} eq 'suspended') {
+               delete $conf->{lock}; # for check lock check, not written out
+               push @delete, 'lock'; # this is the real deal to write it out
+           }
+           push @delete, 'runningmachine' if $conf->{runningmachine};
+       }
+
        PVE::QemuConfig->check_lock($conf) if !$skiplock;
 
        foreach my $opt (keys %$revert) {
@@ -1140,6 +1150,14 @@ my $update_vm_api  = sub {
                        delete $conf->{$opt};
                        PVE::QemuConfig->write_config($vmid, $conf);
                    }
+               } elsif ($opt eq 'vmstate') {
+                   PVE::QemuConfig->check_protection($conf, "can't remove vmstate '$val'");
+                   # the user needs Disk and PowerMgmt privileges to remove the vmstate
+                   $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk', 'VM.PowerMgmt' ]);
+                   if (PVE::QemuServer::try_deallocate_drive($storecfg, $vmid, $conf, $opt, { file => $val }, $rpcenv, $authuser, 1)) {
+                       delete $conf->{$opt};
+                       PVE::QemuConfig->write_config($vmid, $conf);
+                   }
                } elsif (PVE::QemuServer::is_valid_drivename($opt)) {
                    PVE::QemuConfig->check_protection($conf, "can't remove drive '$opt'");
                    $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']);
@@ -1174,7 +1192,7 @@ my $update_vm_api  = sub {
                $conf = PVE::QemuConfig->load_config($vmid); # update/reload
                next if defined($conf->{pending}->{$opt}) && ($param->{$opt} eq $conf->{pending}->{$opt}); # skip if nothing changed
 
-               my ($arch, undef) = PVE::QemuServer::get_basic_machine_info($conf);
+               my $arch = PVE::QemuServer::get_vm_arch($conf);
 
                if (PVE::QemuServer::is_valid_drivename($opt)) {
                    my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt});
@@ -1968,7 +1986,7 @@ __PACKAGE__->register_method({
                description => "CIDR of the (sub) network that is used for migration.",
                optional => 1,
            },
-           machine => get_standard_option('pve-qm-machine'),
+           machine => get_standard_option('pve-qemu-machine'),
            targetstorage => {
                description => "Target storage for the migration. (Can be '1' to use the same storage id as on the source node.)",
                type => 'string',
@@ -2887,7 +2905,7 @@ __PACKAGE__->register_method({
                                                                   $newid, $storage, $format, $fullclone->{$opt}, $newvollist,
                                                                   $jobs, $skipcomplete, $oldconf->{agent}, $clonelimit);
 
-                       $newconf->{$opt} = PVE::QemuServer::print_drive($vmid, $newdrive);
+                       $newconf->{$opt} = PVE::QemuServer::print_drive($newdrive);
 
                        PVE::QemuConfig->write_config($newid, $newconf);
                        $i++;
@@ -3081,7 +3099,7 @@ __PACKAGE__->register_method({
                    my $newdrive = PVE::QemuServer::clone_disk($storecfg, $vmid, $running, $disk, $drive, undef,
                                                               $vmid, $storeid, $format, 1, $newvollist, undef, undef, undef, $movelimit);
 
-                   $conf->{$disk} = PVE::QemuServer::print_drive($vmid, $newdrive);
+                   $conf->{$disk} = PVE::QemuServer::print_drive($newdrive);
 
                    PVE::QemuConfig->add_unused_volume($conf, $old_volid) if !$param->{delete};
 
@@ -3571,7 +3589,7 @@ __PACKAGE__->register_method({
            PVE::QemuServer::qemu_block_resize($vmid, "drive-$disk", $storecfg, $volid, $newsize);
 
            $drive->{size} = $newsize;
-           $conf->{$disk} = PVE::QemuServer::print_drive($vmid, $drive);
+           $conf->{$disk} = PVE::QemuServer::print_drive($drive);
 
            PVE::QemuConfig->write_config($vmid, $conf);
        };
@@ -3715,6 +3733,9 @@ __PACKAGE__->register_method({
        die "unable to use snapshot name 'current' (reserved name)\n"
            if $snapname eq 'current';
 
+       die "unable to use snapshot name 'pending' (reserved name)\n"
+           if lc($snapname) eq 'pending';
+
        my $realcmd = sub {
            PVE::Cluster::log_msg('info', $authuser, "snapshot VM $vmid: $snapname");
            PVE::QemuConfig->snapshot_create($vmid, $snapname, $param->{vmstate},