code cleanup

This commit is contained in:
Dietmar Maurer 2011-12-07 11:41:27 +01:00
parent 46a84fd400
commit 2ed36a412c

View File

@ -872,45 +872,35 @@ sub print_drivedevice_full {
my $device = ''; my $device = '';
my $maxdev = 0; my $maxdev = 0;
if ($drive->{interface} eq 'virtio') { if ($drive->{interface} eq 'virtio') {
my $pciaddr = print_pci_addr("$drive->{interface}$drive->{index}"); my $pciaddr = print_pci_addr("$drive->{interface}$drive->{index}");
$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 = 7; $maxdev = 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 = ''; my $devicetype = 'hd';
if ($drive->{media}) {
if($drive->{media} && $drive->{media} eq 'cdrom') { if($drive->{media} eq 'cdrom') {
$devicetype = "cd"; $devicetype = 'cd';
} elsif ($drive->{media} eq 'block') {
$devicetype = 'block';
} }
elsif ($drive->{media} && $drive->{media} eq 'block') {
$devicetype = $drive->{media};
}
else {
$devicetype = "hd";
} }
$device = "scsi-$devicetype,bus=scsi$controller.0,scsi-id=$unit,drive=drive-$drive->{interface}$drive->{index},id=device-$drive->{interface}$drive->{index}"; $device = "scsi-$devicetype,bus=scsi$controller.0,scsi-id=$unit,drive=drive-$drive->{interface}$drive->{index},id=device-$drive->{interface}$drive->{index}";
} } elsif ($drive->{interface} eq 'ide'){
elsif ($drive->{interface} eq 'ide'){
$maxdev = 2; $maxdev = 2;
my $controller = int($drive->{index} / $maxdev); my $controller = int($drive->{index} / $maxdev);
my $unit = $drive->{index} % $maxdev; my $unit = $drive->{index} % $maxdev;
my $devicetype = ($drive->{media} && $drive->{media} eq 'cdrom') ? "cd" : "hd"; my $devicetype = ($drive->{media} && $drive->{media} eq 'cdrom') ? "cd" : "hd";
$device = "ide-$devicetype,bus=ide.$controller,unit=$unit,drive=drive-$drive->{interface}$drive->{index},id=device-$drive->{interface}$drive->{index}"; $device = "ide-$devicetype,bus=ide.$controller,unit=$unit,drive=drive-$drive->{interface}$drive->{index},id=device-$drive->{interface}$drive->{index}";
} } elsif ($drive->{interface} eq 'usb') {
die "implement me";
if ($drive->{interface} eq 'usb'){
# -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 # -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0
} else {
die "unsupported interface type";
} }
return $device; return $device;