proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-18 08:52:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix hostpci addr

Browse Source 
Signed-off-by: Derumier Alexandre <aderumier@odiso.com>
This commit is contained in:
Derumier Alexandre 2011-10-03 14:53:09 +02:00 committed by Dietmar Maurer
parent 13b5a75337
commit b78ebef7e7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/QemuServer.pm
View File

@ -1945,7 +1945,7 @@ sub config_to_command {
my ($storecfg, $vmid, $conf, $defaults, $migrate_uri) = @_; my ($storecfg, $vmid, $conf, $defaults, $migrate_uri) = @_;
my $cmd = []; my $cmd = [];
my $pciaddr = '';
my $kvmver = kvm_user_version(); my $kvmver = kvm_user_version();
my $vernum = 0; # unknown my $vernum = 0; # unknown
if ($kvmver =~ m/^(\d+)\.(\d+)\.(\d+)$/) { if ($kvmver =~ m/^(\d+)\.(\d+)\.(\d+)$/) {
@ -1986,7 +1986,8 @@ sub config_to_command {
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 $d = parse_hostpci($conf->{"hostpci$i"});
next if !$d; next if !$d;
push @$cmd, '-device', "pci-assign,host=$d->{pciid},id=hostpci$i"; $pciaddr = print_pci_addr("hostpci$i");
push @$cmd, '-device', "pci-assign,host=$d->{pciid},id=hostpci$i$pciaddr";
} }
# usb devices # usb devices
@ -2098,7 +2099,7 @@ sub config_to_command {
#my $soundhw = $conf->{soundhw} || $defaults->{soundhw}; #my $soundhw = $conf->{soundhw} || $defaults->{soundhw};
#push @$cmd, '-soundhw', 'es1370'; #push @$cmd, '-soundhw', 'es1370';
#push @$cmd, '-soundhw', $soundhw if $soundhw; #push @$cmd, '-soundhw', $soundhw if $soundhw;
my $pciaddr = print_pci_addr("balloon0"); $pciaddr = print_pci_addr("balloon0");
push @$cmd, '-device', "virtio-balloon-pci,id=balloon0$pciaddr" if $conf->{balloon}; push @$cmd, '-device', "virtio-balloon-pci,id=balloon0$pciaddr" if $conf->{balloon};
if ($conf->{watchdog}) { if ($conf->{watchdog}) {
@ -2806,6 +2807,9 @@ sub print_pci_addr {
virtio3 => { bus => 0, addr => 13 }, virtio3 => { bus => 0, addr => 13 },
virtio4 => { bus => 0, addr => 14 }, virtio4 => { bus => 0, addr => 14 },
virtio5 => { bus => 0, addr => 15 }, virtio5 => { bus => 0, addr => 15 },
hostpci0 => { bus => 0, addr => 16 },
hostpci1 => { bus => 0, addr => 17 },
}; };
if (defined($devices->{$id}->{bus}) && defined($devices->{$id}->{addr})) { if (defined($devices->{$id}->{bus}) && defined($devices->{$id}->{addr})) {