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

disk: serial no must now be passed to device not drive

Browse Source 
With QEMU 2.10 the serial parameter of the -drive command line option
was deprecated [1], so move the logic which adds this parameter now
to the -drive analogue -device CLI option.

Features marked deprecated will continue to work for two releases[2],
so we need to switch over before 2.12, AFAICT.

[1]: https://wiki.qemu.org/ChangeLog/2.10#Deprecated_options
[2]: https://qemu.weilnetz.de/doc/qemu-doc.html#Deprecated-features

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2018-04-05 10:54:41 +02:00 committed by Wolfgang Bumiller
parent d494009179
commit a70e7e6caf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PVE/QemuServer.pm
View File

@ -1689,6 +1689,12 @@ sub print_drivedevice_full {
$device .= ",bootindex=$drive->{bootindex}" if $drive->{bootindex}; $device .= ",bootindex=$drive->{bootindex}" if $drive->{bootindex};
if (my $serial = $drive->{serial}) {
$serial = URI::Escape::uri_unescape($serial);
$device .= ",serial=$serial";
}
return $device; return $device;
} }
@ -1761,11 +1767,6 @@ sub print_drive_full {
} }
} }
if (my $serial = $drive->{serial}) {
$serial = URI::Escape::uri_unescape($serial);
$opts .= ",serial=$serial";
}
$opts .= ",format=$format" if $format && !$drive->{format}; $opts .= ",format=$format" if $format && !$drive->{format};
my $cache_direct = 0; my $cache_direct = 0;