Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
 PVE/API2/Qemu.pm | 54 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index aa7ddea..a8029c2 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -26,6 +26,7 @@ use PVE::QemuServer::Drive;
 use PVE::QemuServer::ImportDisk;
 use PVE::QemuServer::Monitor qw(mon_cmd);
 use PVE::QemuServer::Machine;
+use PVE::QemuServer::PCI;
 use PVE::QemuServer::USB qw(parse_usb_device);
 use PVE::QemuMigrate;
 use PVE::RPCEnvironment;
@@ -583,6 +584,26 @@ my $check_vm_create_usb_perm = sub {
     return 1;
 };
 
+my $check_vm_create_hostpci_perm = sub {
+    my ($rpcenv, $authuser, $vmid, $pool, $param) = @_;
+
+    return 1 if $authuser eq 'root@pam';
+
+    foreach my $opt (keys %{$param}) {
+       next if $opt !~ m/^hostpci\d+$/;
+
+       my $device = PVE::JSONSchema::parse_property_string('pve-qm-hostpci', 
$param->{$opt});
+       if ($device->{host} !~ m/:/) {
+           $rpcenv->check_hw_perm($authuser, $device->{host}, 
['Hardware.Use']);
+           $rpcenv->check_vm_perm($authuser, $vmid, $pool, 
['VM.Config.HWType']);
+       } else {
+           die "only root can set '$opt' config for non-mapped devices\n";
+       }
+    }
+
+    return 1;
+};
+
 my $check_vm_modify_config_perm = sub {
     my ($rpcenv, $authuser, $vmid, $pool, $key_list) = @_;
 
@@ -593,7 +614,7 @@ my $check_vm_modify_config_perm = sub {
        # 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+$/;
+       next if $opt =~ m/^(?:unused|serial|usb|hostpci)\d+$/;
 
 
        if ($cpuoptions->{$opt} || $opt =~ m/^numa\d+$/) {
@@ -621,7 +642,7 @@ my $check_vm_modify_config_perm = sub {
            # also needs privileges on the storage, that will be checked later
            $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Disk', 
'VM.PowerMgmt' ]);
        } else {
-           # catches hostpci\d+, args, lock, etc.
+           # catches args, lock, etc.
            # new options will be checked here
            die "only root can set '$opt' config\n";
        }
@@ -856,6 +877,7 @@ __PACKAGE__->register_method({
 
            &$check_vm_create_serial_perm($rpcenv, $authuser, $vmid, $pool, 
$param);
            &$check_vm_create_usb_perm($rpcenv, $authuser, $vmid, $pool, 
$param);
+           &$check_vm_create_hostpci_perm($rpcenv, $authuser, $vmid, $pool, 
$param);
 
            &$check_cpu_model_access($rpcenv, $authuser, $param);
 
@@ -1569,6 +1591,16 @@ my $update_vm_api  = sub {
                    }
                    PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force);
                    PVE::QemuConfig->write_config($vmid, $conf);
+               } elsif ($opt =~ m/^hostpci\d+$/) {
+                   my $olddevice = 
PVE::JSONSchema::parse_property_string('pve-qm-hostpci', $val);
+                   if ($olddevice->{host} !~ m/:/) {
+                       $rpcenv->check_hw_perm($authuser, $olddevice->{host}, 
['Hardware.Use']);
+                       $rpcenv->check_vm_perm($authuser, $vmid, undef, 
['VM.Config.HWType']);
+                   } elsif ($authuser ne 'root@pam') {
+                       die "only root can set '$opt' config for non-mapped 
devices\n";
+                   }
+                   PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force);
+                   PVE::QemuConfig->write_config($vmid, $conf);
                } else {
                    PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force);
                    PVE::QemuConfig->write_config($vmid, $conf);
@@ -1651,6 +1683,24 @@ my $update_vm_api  = sub {
                    } elsif ($authuser ne 'root@pam') {
                        die "only root can modify '$opt' config for real 
devices\n";
                    }
+
+                   $conf->{pending}->{$opt} = $param->{$opt};
+               } elsif ($opt =~ m/^hostpci\d+$/) {
+                   my $olddevice;
+                   if (defined($conf->{$opt})) {
+                       $olddevice = 
PVE::JSONSchema::parse_property_string('pve-qm-hostpci', $conf->{$opt});
+                   }
+                   my $newdevice = 
PVE::JSONSchema::parse_property_string('pve-qm-hostpci', $param->{$opt});
+                   if ((!defined($olddevice) || $olddevice->{host} !~ m/:/) && 
$newdevice->{host} !~ m/:/) {
+                       if (defined($olddevice)) {
+                           $rpcenv->check_hw_perm($authuser, 
$olddevice->{host}, ['Hardware.Use']);
+                       }
+                       $rpcenv->check_hw_perm($authuser, $newdevice->{host}, 
['Hardware.Use']);
+                       $rpcenv->check_vm_perm($authuser, $vmid, undef, 
['VM.Config.HWType']);
+                   } elsif ($authuser ne 'root@pam') {
+                       die "only root can set '$opt' config for non-mapped 
devices\n";
+                   }
+                   PVE::QemuServer::PCI::parse_hostpci($param->{$opt});
                    $conf->{pending}->{$opt} = $param->{$opt};
                } else {
                    $conf->{pending}->{$opt} = $param->{$opt};
-- 
2.30.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Reply via email to