proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-02 03:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PCIe passthrough: fixup: avoid addr conflict and cleanup a bit

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-09-06 19:22:27 +02:00
parent d7d698f60c
commit e2b0d85dda
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
PVE/QemuServer/PCI.pm
View File

@ -193,11 +193,11 @@ sub get_pcie_addr_map {
hostpci8bus0 => { bus => "pcie.0", addr => 13 }, hostpci8bus0 => { bus => "pcie.0", addr => 13 },
hostpci9bus0 => { bus => "pcie.0", addr => 14 }, hostpci9bus0 => { bus => "pcie.0", addr => 14 },
hostpci10bus0 => { bus => "pcie.0", addr => 15 }, hostpci10bus0 => { bus => "pcie.0", addr => 15 },
hostpci11bus0 => { bus => "pcie.0", addr => 20 }, hostpci11bus0 => { bus => "pcie.0", addr => 21 },
hostpci12bus0 => { bus => "pcie.0", addr => 21 }, hostpci12bus0 => { bus => "pcie.0", addr => 22 },
hostpci13bus0 => { bus => "pcie.0", addr => 22 }, hostpci13bus0 => { bus => "pcie.0", addr => 23 },
hostpci14bus0 => { bus => "pcie.0", addr => 23 }, hostpci14bus0 => { bus => "pcie.0", addr => 24 },
hostpci15bus0 => { bus => "pcie.0", addr => 24 }, hostpci15bus0 => { bus => "pcie.0", addr => 25 },
} if !defined($pcie_addr_map); } if !defined($pcie_addr_map);
return $pcie_addr_map; return $pcie_addr_map;
@ -222,15 +222,13 @@ sub print_pcie_root_port {
my ($i) = @_; my ($i) = @_;
my $res = ''; my $res = '';
my $id = $i + 1;
my $root_port_addresses = { my $root_port_addresses = {
4 => "10.0", 4 => "10.0",
5 => "10.1", 5 => "10.1",
6 => "10.2", 6 => "10.2",
7 => "10.3", 7 => "10.3",
8 => "10.4", 8 => "10.4",
9 => "10.5", 9 => "10.5",
10 => "10.6", 10 => "10.6",
11 => "10.7", 11 => "10.7",
12 => "11.0", 12 => "11.0",
@ -240,6 +238,7 @@ sub print_pcie_root_port {
}; };
if (defined($root_port_addresses->{$i})) { if (defined($root_port_addresses->{$i})) {
my $id = $i + 1;
$res = "pcie-root-port,id=ich9-pcie-port-${id}"; $res = "pcie-root-port,id=ich9-pcie-port-${id}";
$res .= ",addr=$root_port_addresses->{$i}"; $res .= ",addr=$root_port_addresses->{$i}";
$res .= ",x-speed=16,x-width=32,multifunction=on,bus=pcie.0"; $res .= ",x-speed=16,x-width=32,multifunction=on,bus=pcie.0";