[pve-devel] [RFC PATCH qemu-server] add win7 pcie quirk

[Dominik Csapak]

win7 is very picky about pcie assignments and fails with
'error 12' the way we add hospci devices

to combat that, we simply give the hostpci device a normal port
instead

since it is not possible to do live migration/snapshots with ram
with pci passthrough, we do not have be particularly careful
with backwards compatibility here

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
sending as rfc, because i am unsure about the way i do it
the alternative would be to expand the parameters of print_pcie_addr
to include e.g. the ostype or config and pull the information there
which seems a big change for a small workaround

 PVE/QemuServer.pm     | 8 +++++++-
 PVE/QemuServer/PCI.pm | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index a162db9..24a9d38 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3524,7 +3524,13 @@ sub config_to_command {
 	my $pcie = $d->{pcie};
 	if($pcie){
 	    die "q35 machine model is not enabled" if !$q35;
-	    $pciaddr = print_pcie_addr("hostpci$i");
+	    # win7 is very picky about pcie assignments
+	    # the way we do it normally does not work there
+	    if ($winversion == 7) {
+		$pciaddr = print_pcie_addr("hostpci${i}win7");
+	    } else {
+		$pciaddr = print_pcie_addr("hostpci$i");
+	    }
 	}else{
 	    $pciaddr = print_pci_addr("hostpci$i", $bridges, $arch, $machine_type);
 	}
diff --git a/PVE/QemuServer/PCI.pm b/PVE/QemuServer/PCI.pm
index 29b8943..2d49070 100644
--- a/PVE/QemuServer/PCI.pm
+++ b/PVE/QemuServer/PCI.pm
@@ -145,6 +145,11 @@ sub print_pcie_addr {
 	hostpci1 => { bus => "ich9-pcie-port-2", addr => 0 },
 	hostpci2 => { bus => "ich9-pcie-port-3", addr => 0 },
 	hostpci3 => { bus => "ich9-pcie-port-4", addr => 0 },
+	# win7 is more picky about pcie assignments
+	hostpci0win7 => { bus => "pcie.0", addr => 16 },
+	hostpci1win7 => { bus => "pcie.0", addr => 17 },
+	hostpci2win7 => { bus => "pcie.0", addr => 18 },
+	hostpci3win7 => { bus => "pcie.0", addr => 19 },
     };
 
     if (defined($devices->{$id}->{bus}) && defined($devices->{$id}->{addr})) {
-- 
2.11.0