proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-07-09 19:45:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add option iscsi only once

Browse Source 
We simply add option iscsi if we have an initiator name. So we
never add this option multiple times, and it works with hotplug
in case someone plugs an 'iscsi:' drive later.
This commit is contained in:
Dietmar Maurer 2014-05-17 09:14:58 +02:00
parent 46f58b5f03
commit 5881b913c0
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/QemuServer.pm
View File

@ -2590,6 +2590,11 @@ sub config_to_command {
my $ahcicontroller = {}; my $ahcicontroller = {};
my $scsihw = defined($conf->{scsihw}) ? $conf->{scsihw} : $defaults->{scsihw}; my $scsihw = defined($conf->{scsihw}) ? $conf->{scsihw} : $defaults->{scsihw};
# Add iscsi initiator name if available
if (my $initiator = get_initiator_name()) {
push @$devices, '-iscsi', "initiator-name=$initiator";
}
foreach_drive($conf, sub { foreach_drive($conf, sub {
my ($ds, $drive) = @_; my ($ds, $drive) = @_;
@ -2629,14 +2634,6 @@ sub config_to_command {
my $drive_cmd = print_drive_full($storecfg, $vmid, $drive); my $drive_cmd = print_drive_full($storecfg, $vmid, $drive);
push @$devices, '-drive',$drive_cmd; push @$devices, '-drive',$drive_cmd;
# Add iscsi option
my $iscsi_opts = undef;
if ($drive_cmd =~ m|^file=iscsi://|) {
my $initiator = get_initiator_name(); # return undef or string
$iscsi_opts = "initiator-name=$initiator" if $initiator;
}
push @$devices, '-iscsi', $iscsi_opts if $iscsi_opts;
push @$devices, '-device', print_drivedevice_full($storecfg, $conf, $vmid, $drive, $bridges); push @$devices, '-device', print_drivedevice_full($storecfg, $conf, $vmid, $drive, $bridges);
}); });