[pve-devel] [PATCH qemu-server] fix #5543: pci: don't use pci devices when starting templates

[Dominik Csapak <d.csapak@proxmox.com>]

templates can only be started in context of a pbs backup, and there
we don't need or want to use the configured pci devices, since
they cannot be started normally anyway.

Without this, users can get into a situation where the template
cannot be backed up when the pci device is not available, even
if it's actually not needed.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 PVE/QemuServer.pm     | 3 +++
 PVE/QemuServer/PCI.pm | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 7815b608..c1cc27f3 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6137,6 +6137,9 @@ sub get_vm_volumes {
 sub cleanup_pci_devices {
     my ($vmid, $conf) = @_;
 
+    # templates don't use pci devices
+    return if $conf->{template};
+
     foreach my $key (keys %$conf) {
 	next if $key !~ m/^hostpci(\d+)$/;
 	my $hostpciindex = $1;
diff --git a/PVE/QemuServer/PCI.pm b/PVE/QemuServer/PCI.pm
index 1673041b..4aa4a52c 100644
--- a/PVE/QemuServer/PCI.pm
+++ b/PVE/QemuServer/PCI.pm
@@ -576,9 +576,13 @@ sub print_hostpci_devices {
     my $kvm_off = 0;
     my $gpu_passthrough = 0;
     my $legacy_igd = 0;
+    my $pci_devices = {};
+
+    # templates can only start for backup where we don't want pci devices, so return early
+    return ($kvm_off, $gpu_passthrough, $legacy_igd, $pci_devices) if $conf->{template};
 
     my $pciaddr;
-    my $pci_devices = choose_hostpci_devices(parse_hostpci_devices($conf), $vmid);
+    $pci_devices = choose_hostpci_devices(parse_hostpci_devices($conf), $vmid);
 
     for (my $i = 0; $i < $MAX_HOSTPCI_DEVICES; $i++)  {
 	my $id = "hostpci$i";
-- 
2.39.2



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