proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-07 11:10:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix aio O_DIRECT check for cdrom drives

Browse Source 
Only non-cdrom drives default to cache=none, so the check
for whether to default to aio=native needs to take the same
condition into account.
I combined them close together to make their relation more
visible.
This commit is contained in:
Wolfgang Bumiller 2015-06-02 16:04:26 +02:00 committed by Dietmar Maurer
parent c6f773b818
commit b2ee900e3c
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
PVE/QemuServer.pm
View File

@ -1164,16 +1164,6 @@ sub print_drive_full {
$opts .= ",$o=" . int($v*1024*1024) if $v; $opts .= ",$o=" . int($v*1024*1024) if $v;
} }
# aio native works only with O_DIRECT
if (!$drive->{aio}) {
if(!$drive->{cache} || $drive->{cache} eq 'none' || $drive->{cache} eq 'directsync') {
$opts .= ",aio=native";
} else {
$opts .= ",aio=threads";
}
}
my $path; my $path;
my $volid = $drive->{file}; my $volid = $drive->{file};
if (drive_is_cdrom($drive)) { if (drive_is_cdrom($drive)) {
@ -1186,7 +1176,23 @@ sub print_drive_full {
} }
} }
$opts .= ",cache=none" if !$drive->{cache} && !drive_is_cdrom($drive); my $cache_direct = 0;
if (my $cache = $drive->{cache}) {
$cache_direct = $cache =~ /^(?:off|none|directsync)$/;
} elsif (!drive_is_cdrom($drive)) {
$opts .= ",cache=none";
$cache_direct = 1;
}
# aio native works only with O_DIRECT
if (!$drive->{aio}) {
if($cache_direct) {
$opts .= ",aio=native";
} else {
$opts .= ",aio=threads";
}
}
my $detectzeroes = $drive->{discard} ? "unmap" : "on"; my $detectzeroes = $drive->{discard} ? "unmap" : "on";
$opts .= ",detect-zeroes=$detectzeroes" if !drive_is_cdrom($drive); $opts .= ",detect-zeroes=$detectzeroes" if !drive_is_cdrom($drive);