]> git.proxmox.com Git - qemu-server.git/blobdiff - PVE/API2/Qemu.pm
projects / qemu-server.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use non SMM ovmf code file for i440fx machines
[qemu-server.git] / PVE / API2 / Qemu.pm
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 4755917c89b78b9854b774d4719f7f6f7237e53a..1ac81e2fc4610337f8fb2e092b389dc801fc845d 100644 (file)
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -24,6 +24,7 @@ use PVE::QemuServer;
 use PVE::QemuServer::Drive;
 use PVE::QemuServer::CPUConfig;
 use PVE::QemuServer::Monitor qw(mon_cmd);
+use PVE::QemuServer::Machine;
 use PVE::QemuMigrate;
 use PVE::RPCEnvironment;
 use PVE::AccessControl;
@@ -183,7 +184,13 @@ my $create_disks = sub {
 
            my $volid;
            if ($ds eq 'efidisk0') {
-               ($volid, $size) = PVE::QemuServer::create_efidisk($storecfg, $storeid, $vmid, $fmt, $arch);
+               my $smm = PVE::QemuServer::Machine::machine_type_is_q35($conf);
+               ($volid, $size) = PVE::QemuServer::create_efidisk(
+                   $storecfg, $storeid, $vmid, $fmt, $arch, $disk, $smm);
+           } elsif ($ds eq 'tpmstate0') {
+               # swtpm can only use raw volumes, and uses a fixed size
+               $size = PVE::Tools::convert_size(PVE::QemuServer::Drive::TPMSTATE_DISK_SIZE, 'b' => 'kb');
+               $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, "raw", undef, $size);
            } else {
                $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, undef, $size);
            }
@@ -424,7 +431,7 @@ __PACKAGE__->register_method({
     proxyto => 'node',
     protected => 1, # qemu pid files are only readable by root
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            full => {
@@ -497,7 +504,7 @@ __PACKAGE__->register_method({
     protected => 1,
     proxyto => 'node',
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => PVE::QemuServer::json_config_properties(
            {
                node => get_standard_option('pve-node'),
@@ -631,8 +638,7 @@ __PACKAGE__->register_method({
            raise_param_exc({ archive => "option conflicts with other options ($keystr)"}) if $keystr;
 
            if ($archive eq '-') {
-               die "pipe requires cli environment\n"
-                   if $rpcenv->{type} ne 'cli';
+               die "pipe requires cli environment\n" if $rpcenv->{type} ne 'cli';
                $archive = { type => 'pipe' };
            } else {
                PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $archive);
@@ -646,6 +652,7 @@ __PACKAGE__->register_method({
        eval { PVE::QemuConfig->create_and_lock_config($vmid, $force) };
        die "$emsg $@" if $@;
 
+       my $restored_data = 0;
        my $restorefn = sub {
            my $conf = PVE::QemuConfig->load_config($vmid);
 
@@ -662,13 +669,16 @@ __PACKAGE__->register_method({
                    live => $live_restore,
                };
                if ($archive->{type} eq 'file' || $archive->{type} eq 'pipe') {
-                   die "live-restore is only compatible with PBS\n" if $live_restore;
+                   die "live-restore is only compatible with backup images from a Proxmox Backup Server\n"
+                       if $live_restore;
                    PVE::QemuServer::restore_file_archive($archive->{path} // '-', $vmid, $authuser, $restore_options);
                } elsif ($archive->{type} eq 'pbs') {
                    PVE::QemuServer::restore_proxmox_backup_archive($archive->{volid}, $vmid, $authuser, $restore_options);
                } else {
                    die "unknown backup archive type\n";
                }
+               $restored_data = 1;
+
                my $restored_conf = PVE::QemuConfig->load_config($vmid);
                # Convert restored VM to template if backup was VM template
                if (PVE::QemuConfig->is_template($restored_conf)) {
@@ -757,6 +767,13 @@ __PACKAGE__->register_method({
                if (my $err = $@) {
                    eval { PVE::QemuConfig->remove_lock($vmid, 'create') };
                    warn $@ if $@;
+                   if ($restored_data) {
+                       warn "error after data was restored, VM disks should be OK but config may "
+                           ."require adaptions. VM $vmid state is NOT cleaned up.\n";
+                   } else {
+                       warn "error before or during data restore, some or all disks were not "
+                           ."completely restored. VM $vmid state is NOT cleaned up.\n";
+                   }
                    die $err;
                }
            };
@@ -788,7 +805,7 @@ __PACKAGE__->register_method({
        user => 'all',
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid'),
@@ -850,7 +867,7 @@ __PACKAGE__->register_method({
     },
     description => "Read VM RRD statistics (returns PNG)",
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid'),
@@ -896,7 +913,7 @@ __PACKAGE__->register_method({
     },
     description => "Read VM RRD statistics",
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid'),
@@ -939,7 +956,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
@@ -1252,6 +1269,17 @@ my $update_vm_api  = sub {
            }
            my $bootorder_deleted = grep {$_ eq 'bootorder'} @delete;
 
+           my $check_drive_perms = sub {
+               my ($opt, $val) = @_;
+               my $drive = PVE::QemuServer::parse_drive($opt, $val);
+               # FIXME: cloudinit: CDROM or Disk?
+               if (PVE::QemuServer::drive_is_cdrom($drive)) { # CDROM
+                   $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.CDROM']);
+               } else {
+                   $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']);
+               }
+           };
+
            foreach my $opt (@delete) {
                $modified->{$opt} = 1;
                $conf = PVE::QemuConfig->load_config($vmid); # update/reload
@@ -1289,12 +1317,7 @@ my $update_vm_api  = sub {
                    }
                } elsif (PVE::QemuServer::is_valid_drivename($opt)) {
                    PVE::QemuConfig->check_protection($conf, "can't remove drive '$opt'");
-                   my $drive = PVE::QemuServer::parse_drive($opt, $val);
-                   if (PVE::QemuServer::drive_is_cdrom($drive)) {
-                       $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.CDROM']);
-                   } else {
-                       $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']);
-                   }
+                   $check_drive_perms->($opt, $val);
                    PVE::QemuServer::vmconfig_register_unused_drive($storecfg, $vmid, $conf, PVE::QemuServer::parse_drive($opt, $val))
                        if $is_pending_val;
                    PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force);
@@ -1329,17 +1352,28 @@ my $update_vm_api  = sub {
                my $arch = PVE::QemuServer::get_vm_arch($conf);
 
                if (PVE::QemuServer::is_valid_drivename($opt)) {
-                   my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt});
-                   # FIXME: cloudinit: CDROM or Disk?
-                   if (PVE::QemuServer::drive_is_cdrom($drive)) { # CDROM
-                       $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.CDROM']);
-                   } else {
-                       $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']);
+                   # old drive
+                   if ($conf->{$opt}) {
+                       $check_drive_perms->($opt, $conf->{$opt});
                    }
+
+                   # new drive
+                   $check_drive_perms->($opt, $param->{$opt});
                    PVE::QemuServer::vmconfig_register_unused_drive($storecfg, $vmid, $conf, PVE::QemuServer::parse_drive($opt, $conf->{pending}->{$opt}))
                        if defined($conf->{pending}->{$opt});
 
                    &$create_disks($rpcenv, $authuser, $conf->{pending}, $arch, $storecfg, $vmid, undef, {$opt => $param->{$opt}});
+
+                   # default legacy boot order implies all cdroms anyway
+                   if (@bootorder) {
+                       # append new CD drives to bootorder to mark them bootable
+                       my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt});
+                       if (PVE::QemuServer::drive_is_cdrom($drive, 1) && !grep(/^$opt$/, @bootorder)) {
+                           push @bootorder, $opt;
+                           $conf->{pending}->{boot} = PVE::QemuServer::print_bootorder(\@bootorder);
+                           $modified->{boot} = 1;
+                       }
+                   }
                } elsif ($opt =~ m/^serial\d+/) {
                    if ((!defined($conf->{$opt}) || $conf->{$opt} eq 'socket') && $param->{$opt} eq 'socket') {
                        $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.HWType']);
@@ -1396,7 +1430,7 @@ my $update_vm_api  = sub {
            if ($running) {
                PVE::QemuServer::vmconfig_hotplug_pending($vmid, $conf, $storecfg, $modified, $errors);
            } else {
-               PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $storecfg, $running, $errors);
+               PVE::QemuServer::vmconfig_apply_pending($vmid, $conf, $storecfg, $errors);
            }
            raise_param_exc($errors) if scalar(keys %$errors);
 
@@ -1427,7 +1461,7 @@ my $update_vm_api  = sub {
 
                if (!$running) {
                    my $status = PVE::Tools::upid_read_status($upid);
-                   return if $status eq 'OK';
+                   return if !PVE::Tools::upid_status_is_error($status);
                    die $status;
                }
            }
@@ -1461,7 +1495,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', $vm_config_perm_list, any => 1],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => PVE::QemuServer::json_config_properties(
            {
                node => get_standard_option('pve-node'),
@@ -1516,7 +1550,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', $vm_config_perm_list, any => 1],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => PVE::QemuServer::json_config_properties(
            {
                node => get_standard_option('pve-node'),
@@ -1566,7 +1600,7 @@ __PACKAGE__->register_method({
        check => [ 'perm', '/vms/{vmid}', ['VM.Allocate']],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid_stopped }),
@@ -1581,7 +1615,7 @@ __PACKAGE__->register_method({
                description => "If set, destroy additionally all disks not referenced in the config"
                 ." but with a matching VMID from all enabled storages.",
                optional => 1,
-               default => 1, # FIXME: replace to false in PVE 7.0, this is dangerous!
+               default => 0,
            },
        },
     },
@@ -1632,8 +1666,7 @@ __PACKAGE__->register_method({
                # repeat, config might have changed
                my $ha_managed = $early_checks->();
 
-               # FIXME: drop fallback to true with 7.0, to dangerous for default
-               my $purge_unreferenced = $param->{'destroy-unreferenced-disks'} // 1;
+               my $purge_unreferenced = $param->{'destroy-unreferenced-disks'};
 
                PVE::QemuServer::destroy_vm(
                    $storecfg,
@@ -1674,7 +1707,7 @@ __PACKAGE__->register_method({
        check => [ 'perm', '/vms/{vmid}', ['VM.Config.Disk']],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
@@ -1729,7 +1762,7 @@ __PACKAGE__->register_method({
     },
     description => "Creates a TCP VNC proxy connections.",
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid'),
@@ -1747,7 +1780,7 @@ __PACKAGE__->register_method({
        },
     },
     returns => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            user => { type => 'string' },
            ticket => { type => 'string' },
@@ -1987,7 +2020,7 @@ __PACKAGE__->register_method({
     },
     description => "Opens a weksocket for VNC traffic.",
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid'),
@@ -2046,7 +2079,7 @@ __PACKAGE__->register_method({
     },
     description => "Returns a SPICE configuration to connect to the VM.",
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid'),
@@ -2090,7 +2123,7 @@ __PACKAGE__->register_method({
        user => 'all',
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid'),
@@ -2136,7 +2169,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid'),
@@ -2190,7 +2223,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid',
@@ -2349,7 +2382,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid',
@@ -2437,7 +2470,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid',
@@ -2488,7 +2521,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid',
@@ -2649,7 +2682,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid',
@@ -2733,7 +2766,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.PowerMgmt' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid',
@@ -2805,7 +2838,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.Console' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid',
@@ -2849,7 +2882,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid'),
@@ -2925,7 +2958,7 @@ __PACKAGE__->register_method({
        ]
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
@@ -3014,7 +3047,7 @@ __PACKAGE__->register_method({
            PVE::Storage::storage_check_enabled($storecfg, $storage);
            if ($target) {
                # check if storage is available on target node
-               PVE::Storage::storage_check_node($storecfg, $storage, $target);
+               PVE::Storage::storage_check_enabled($storecfg, $storage, $target);
                # clone only works if target storage is shared
                my $scfg = PVE::Storage::storage_config($storecfg, $storage);
                die "can't clone to non-shared storage '$storage'\n" if !$scfg->{shared};
@@ -3146,7 +3179,7 @@ __PACKAGE__->register_method({
                    my $total_jobs = scalar(keys %{$drives});
                    my $i = 1;
 
-                   foreach my $opt (keys %$drives) {
+                   foreach my $opt (sort keys %$drives) {
                        my $drive = $drives->{$opt};
                        my $skipcomplete = ($total_jobs != $i); # finish after last drive
                        my $completion = $skipcomplete ? 'skip' : 'complete';
@@ -3256,7 +3289,7 @@ __PACKAGE__->register_method({
            ],
     },
     parameters => {
-        additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
@@ -3571,7 +3604,7 @@ __PACKAGE__->register_method({
        check => ['perm', '/vms/{vmid}', [ 'VM.Migrate' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
@@ -3677,7 +3710,7 @@ __PACKAGE__->register_method({
        if (my $targetstorage = $param->{targetstorage}) {
            my $check_storage = sub {
                my ($target_sid) = @_;
-               PVE::Storage::storage_check_node($storecfg, $target_sid, $target);
+               PVE::Storage::storage_check_enabled($storecfg, $target_sid, $target);
                $rpcenv->check($authuser, "/storage/$target_sid", ['Datastore.AllocateSpace']);
                my $scfg = PVE::Storage::storage_config($storecfg, $target_sid);
                raise_param_exc({ targetstorage => "storage '$target_sid' does not support vm images"})
@@ -3747,7 +3780,7 @@ __PACKAGE__->register_method({
         check => ['perm', '/vms/{vmid}', [ 'VM.Monitor' ]],
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid'),
@@ -3797,8 +3830,8 @@ __PACKAGE__->register_method({
         check => ['perm', '/vms/{vmid}', [ 'VM.Config.Disk' ]],
     },
     parameters => {
-        additionalProperties => 0,
-        properties => {
+       additionalProperties => 0,
+       properties => {
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
            skiplock => get_standard_option('skiplock'),
@@ -3922,7 +3955,7 @@ __PACKAGE__->register_method({
     proxyto => 'node',
     protected => 1, # qemu pid files are only readable by root
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
            node => get_standard_option('pve-node'),
@@ -4067,7 +4100,7 @@ __PACKAGE__->register_method({
        user => 'all',
     },
     parameters => {
-       additionalProperties => 0,
+       additionalProperties => 0,
        properties => {
            vmid => get_standard_option('pve-vmid'),
            node => get_standard_option('pve-node'),
@@ -4309,7 +4342,10 @@ __PACKAGE__->register_method({
 
        },
     },
-    returns => { type => 'null'},
+    returns => {
+       type => 'string',
+       description => "the task ID.",
+    },
     code => sub {
        my ($param) = @_;
 
@@ -4323,8 +4359,7 @@ __PACKAGE__->register_method({
 
        my $disk = extract_param($param, 'disk');
 
-       my $updatefn =  sub {
-
+       my $load_and_check = sub {
            my $conf = PVE::QemuConfig->load_config($vmid);
 
            PVE::QemuConfig->check_lock($conf);
@@ -4338,18 +4373,23 @@ __PACKAGE__->register_method({
            die "you can't convert a VM to template if VM is running\n"
                if PVE::QemuServer::check_running($vmid);
 
-           my $realcmd = sub {
-               PVE::QemuServer::template_create($vmid, $conf, $disk);
-           };
+           return $conf;
+       };
 
-           $conf->{template} = 1;
-           PVE::QemuConfig->write_config($vmid, $conf);
+       $load_and_check->();
 
-           return $rpcenv->fork_worker('qmtemplate', $vmid, $authuser, $realcmd);
+       my $realcmd = sub {
+           PVE::QemuConfig->lock_config($vmid, sub {
+               my $conf = $load_and_check->();
+
+               $conf->{template} = 1;
+               PVE::QemuConfig->write_config($vmid, $conf);
+
+               PVE::QemuServer::template_create($vmid, $conf, $disk);
+           });
        };
 
-       PVE::QemuConfig->lock_config($vmid, $updatefn);
-       return;
+       return $rpcenv->fork_worker('qmtemplate', $vmid, $authuser, $realcmd);
     }});
 
 __PACKAGE__->register_method({
Virtual Machine Manager