proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-21 23:01:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add 'lsi53c810' to the list of scsi controllers

Browse Source
This commit is contained in:
Dietmar Maurer 2013-12-04 09:11:36 +01:00
parent 8d87f8aa4f
commit 5b952ff541
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/QemuServer.pm
View File

@ -234,7 +234,7 @@ my $confdesc = {
optional => 1, optional => 1,
type => 'string', type => 'string',
description => "scsi controller model", description => "scsi controller model",
enum => [qw(lsi virtio-scsi-pci megasas pvscsi)], enum => [qw(lsi lsi53c810 virtio-scsi-pci megasas pvscsi)],
default => 'lsi', default => 'lsi',
}, },
description => { description => {
@ -1050,7 +1050,7 @@ sub print_drivedevice_full {
my $pciaddr = print_pci_addr("$drive->{interface}$drive->{index}", $bridges); my $pciaddr = print_pci_addr("$drive->{interface}$drive->{index}", $bridges);
$device = "virtio-blk-pci,drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}$pciaddr"; $device = "virtio-blk-pci,drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}$pciaddr";
} elsif ($drive->{interface} eq 'scsi') { } elsif ($drive->{interface} eq 'scsi') {
$maxdev = ($conf->{scsihw} && $conf->{scsihw} ne 'lsi') ? 256 : 7; $maxdev = ($conf->{scsihw} && ($conf->{scsihw} !~ m/^lsi/)) ? 256 : 7;
my $controller = int($drive->{index} / $maxdev); my $controller = int($drive->{index} / $maxdev);
my $unit = $drive->{index} % $maxdev; my $unit = $drive->{index} % $maxdev;
my $devicetype = 'hd'; my $devicetype = 'hd';
@ -1077,8 +1077,8 @@ sub print_drivedevice_full {
} }
} }
if (!$conf->{scsihw} || $conf->{scsihw} eq 'lsi'){ if (!$conf->{scsihw} || ($conf->{scsihw} =~ m/^lsi/)){
$device = "scsi-$devicetype,bus=scsihw$controller.0,scsi-id=$unit,drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}" if !$conf->{scsihw} || $conf->{scsihw} eq 'lsi'; $device = "scsi-$devicetype,bus=scsihw$controller.0,scsi-id=$unit,drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}";
} else { } else {
$device = "scsi-$devicetype,bus=scsihw$controller.0,channel=0,scsi-id=0,lun=$drive->{index},drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}"; $device = "scsi-$devicetype,bus=scsihw$controller.0,channel=0,scsi-id=0,lun=$drive->{index},drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}";
} }
@ -2551,7 +2551,7 @@ sub config_to_command {
if ($drive->{interface} eq 'scsi') { if ($drive->{interface} eq 'scsi') {
my $maxdev = ($scsihw ne 'lsi') ? 256 : 7; my $maxdev = ($scsihw !~ m/^lsi/) ? 256 : 7;
my $controller = int($drive->{index} / $maxdev); my $controller = int($drive->{index} / $maxdev);
$pciaddr = print_pci_addr("scsihw$controller", $bridges); $pciaddr = print_pci_addr("scsihw$controller", $bridges);
push @$devices, '-device', "$scsihw,id=scsihw$controller$pciaddr" if !$scsicontroller->{$controller}; push @$devices, '-device', "$scsihw,id=scsihw$controller$pciaddr" if !$scsicontroller->{$controller};
@ -2708,7 +2708,7 @@ sub vm_deviceplug {
} }
if ($deviceid =~ m/^(scsi)(\d+)$/) { if ($deviceid =~ m/^(scsi)(\d+)$/) {
return 1 if ($conf->{scsihw} && $conf->{scsihw} ne 'lsi'); #virtio-scsi not yet support hotplug return 1 if ($conf->{scsihw} && ($conf->{scsihw} !~ m/^lsi/)); #virtio-scsi not yet support hotplug
return undef if !qemu_findorcreatescsihw($storecfg,$conf, $vmid, $device); return undef if !qemu_findorcreatescsihw($storecfg,$conf, $vmid, $device);
return undef if !qemu_driveadd($storecfg, $vmid, $device); return undef if !qemu_driveadd($storecfg, $vmid, $device);
my $devicefull = print_drivedevice_full($storecfg, $conf, $vmid, $device); my $devicefull = print_drivedevice_full($storecfg, $conf, $vmid, $device);
@ -2853,7 +2853,7 @@ sub qemu_devicedelverify {
sub qemu_findorcreatescsihw { sub qemu_findorcreatescsihw {
my ($storecfg, $conf, $vmid, $device) = @_; my ($storecfg, $conf, $vmid, $device) = @_;
my $maxdev = ($conf->{scsihw} && $conf->{scsihw} ne 'lsi') ? 256 : 7; my $maxdev = ($conf->{scsihw} && ($conf->{scsihw} !~ m/^lsi/)) ? 256 : 7;
my $controller = int($device->{index} / $maxdev); my $controller = int($device->{index} / $maxdev);
my $scsihwid="scsihw$controller"; my $scsihwid="scsihw$controller";
my $devices_list = vm_devices_list($vmid); my $devices_list = vm_devices_list($vmid);

3
changelog.Debian
View File

@ -7,6 +7,9 @@ qemu-server (3.1-11) unstable; urgency=low
* add 'pvscsi' to the list of scsi controllers (emulate the VMware * add 'pvscsi' to the list of scsi controllers (emulate the VMware
PVSCSI device) PVSCSI device)
* add 'lsi53c810' to the list of scsi controllers (supported on some
very old Windows NT versions)
* add 'vmxnet3' to the list of available network card models (emulate * add 'vmxnet3' to the list of available network card models (emulate
VMware paravirtualized network card) VMware paravirtualized network card)