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

config_to_command: refactor/cleanup try for hostpci part

Browse Source 
try to increase variable declaration to use locality, reduce
duplication of same variable names used, and try to cleanup a bit in
general..

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

49
PVE/QemuServer.pm
View File

@ -3761,71 +3761,66 @@ sub config_to_command {
# host pci devices # host pci devices
for (my $i = 0; $i < $MAX_HOSTPCI_DEVICES; $i++) { for (my $i = 0; $i < $MAX_HOSTPCI_DEVICES; $i++) {
my $d = parse_hostpci($conf->{"hostpci$i"}); my $id = "hostpci$i";
my $d = parse_hostpci($conf->{$id});
next if !$d; next if !$d;
my $pcie = $d->{pcie}; if (my $pcie = $d->{pcie}) {
if ($pcie) {
die "q35 machine model is not enabled" if !$q35; die "q35 machine model is not enabled" if !$q35;
# win7 wants to have the pcie devices directly on the pcie bus # win7 wants to have the pcie devices directly on the pcie bus
# instead of in the root port # instead of in the root port
if ($winversion == 7) { if ($winversion == 7) {
$pciaddr = print_pcie_addr("hostpci${i}bus0"); $pciaddr = print_pcie_addr("${id}bus0");
} else { } else {
# add more root ports if needed, 4 are present by default # add more root ports if needed, 4 are present by default
# by pve-q35 cfgs, rest added here on demand.
if ($i > 3) { if ($i > 3) {
push @$devices, '-device', print_pcie_root_port($i); push @$devices, '-device', print_pcie_root_port($i);
} }
$pciaddr = print_pcie_addr("hostpci$i"); $pciaddr = print_pcie_addr($id);
} }
} else { } else {
$pciaddr = print_pci_addr("hostpci$i", $bridges, $arch, $machine_type); $pciaddr = print_pci_addr($id, $bridges, $arch, $machine_type);
} }
my $rombar = defined($d->{rombar}) && !$d->{rombar} ? ',rombar=0' : '';
my $romfile = $d->{romfile};
my $xvga = ''; my $xvga = '';
if ($d->{'x-vga'}) { if ($d->{'x-vga'}) {
$xvga = ',x-vga=on'; $xvga = ',x-vga=on' if !($conf->{bios} && $conf->{bios} eq 'ovmf');
$kvm_off = 1; $kvm_off = 1;
$vga->{type} = 'none' if !defined($conf->{vga}); $vga->{type} = 'none' if !defined($conf->{vga});
$gpu_passthrough = 1; $gpu_passthrough = 1;
if ($conf->{bios} && $conf->{bios} eq 'ovmf') {
$xvga = "";
}
} }
my $pcidevices = $d->{pciid}; my $pcidevices = $d->{pciid};
my $multifunction = 1 if @$pcidevices > 1; my $multifunction = 1 if @$pcidevices > 1;
my $sysfspath; my $sysfspath;
if ($d->{mdev} && scalar(@$pcidevices) == 1) { if ($d->{mdev} && scalar(@$pcidevices) == 1) {
my $id = $pcidevices->[0]->{id}; my $pci_id = $pcidevices->[0]->{id};
my $uuid = PVE::SysFSTools::generate_mdev_uuid($vmid, $i); my $uuid = PVE::SysFSTools::generate_mdev_uuid($vmid, $i);
$sysfspath = "/sys/bus/pci/devices/0000:$id/$uuid"; $sysfspath = "/sys/bus/pci/devices/0000:$pci_id/$uuid";
} elsif ($d->{mdev}) { } elsif ($d->{mdev}) {
warn "ignoring mediated device with multifunction device\n"; warn "ignoring mediated device '$id' with multifunction device\n";
} }
my $j=0; my $j=0;
foreach my $pcidevice (@$pcidevices) { foreach my $pcidevice (@$pcidevices) {
my $id = "hostpci$i";
$id .= ".$j" if $multifunction;
my $addr = $pciaddr;
$addr .= ".$j" if $multifunction;
my $devicestr = "vfio-pci"; my $devicestr = "vfio-pci";
if ($sysfspath) { if ($sysfspath) {
$devicestr .= ",sysfsdev=$sysfspath"; $devicestr .= ",sysfsdev=$sysfspath";
} else { } else {
$devicestr .= ",host=$pcidevice->{id}"; $devicestr .= ",host=$pcidevice->{id}";
} }
$devicestr .= ",id=$id$addr";
if($j == 0){ my $mf_addr = $multifunction ? ".$j" : '';
$devicestr .= "$rombar$xvga"; $devicestr .= ",id=${id}${mf_addr}${pciaddr}${mf_addr}";
if ($j == 0) {
$devicestr .= ',rombar=0' if defined($d->{rombar}) && !$d->{rombar};
$devicestr .= "$xvga";
$devicestr .= ",multifunction=on" if $multifunction; $devicestr .= ",multifunction=on" if $multifunction;
$devicestr .= ",romfile=/usr/share/kvm/$romfile" if $romfile; $devicestr .= ",romfile=/usr/share/kvm/$d->{romfile}" if $d->{romfile};
} }
push @$devices, '-device', $devicestr; push @$devices, '-device', $devicestr;