mirror of
git://git.proxmox.com/git/qemu-server.git
synced 2025-01-06 13:17:56 +03:00
add drive option 'discard'
This commit is contained in:
parent
e4c6e0b88c
commit
8d87f8aa4f
@ -505,7 +505,7 @@ my $drivename_hash;
|
||||
my $idedesc = {
|
||||
optional => 1,
|
||||
type => 'string', format => 'pve-qm-drive',
|
||||
typetext => '[volume=]volume,] [,media=cdrom|disk] [,cyls=c,heads=h,secs=s[,trans=t]] [,snapshot=on|off] [,cache=none|writethrough|writeback|unsafe|directsync] [,format=f] [,backup=yes|no] [,rerror=ignore|report|stop] [,werror=enospc|ignore|report|stop] [,aio=native|threads]',
|
||||
typetext => '[volume=]volume,] [,media=cdrom|disk] [,cyls=c,heads=h,secs=s[,trans=t]] [,snapshot=on|off] [,cache=none|writethrough|writeback|unsafe|directsync] [,format=f] [,backup=yes|no] [,rerror=ignore|report|stop] [,werror=enospc|ignore|report|stop] [,aio=native|threads] [,discard=ignore|on]',
|
||||
description => "Use volume as IDE hard disk or CD-ROM (n is 0 to " .($MAX_IDE_DISKS -1) . ").",
|
||||
};
|
||||
PVE::JSONSchema::register_standard_option("pve-qm-ide", $idedesc);
|
||||
@ -513,7 +513,7 @@ PVE::JSONSchema::register_standard_option("pve-qm-ide", $idedesc);
|
||||
my $scsidesc = {
|
||||
optional => 1,
|
||||
type => 'string', format => 'pve-qm-drive',
|
||||
typetext => '[volume=]volume,] [,media=cdrom|disk] [,cyls=c,heads=h,secs=s[,trans=t]] [,snapshot=on|off] [,cache=none|writethrough|writeback|unsafe|directsync] [,format=f] [,backup=yes|no] [,rerror=ignore|report|stop] [,werror=enospc|ignore|report|stop] [,aio=native|threads]',
|
||||
typetext => '[volume=]volume,] [,media=cdrom|disk] [,cyls=c,heads=h,secs=s[,trans=t]] [,snapshot=on|off] [,cache=none|writethrough|writeback|unsafe|directsync] [,format=f] [,backup=yes|no] [,rerror=ignore|report|stop] [,werror=enospc|ignore|report|stop] [,aio=native|threads] [,discard=ignore|on]',
|
||||
description => "Use volume as SCSI hard disk or CD-ROM (n is 0 to " . ($MAX_SCSI_DISKS - 1) . ").",
|
||||
};
|
||||
PVE::JSONSchema::register_standard_option("pve-qm-scsi", $scsidesc);
|
||||
@ -521,7 +521,7 @@ PVE::JSONSchema::register_standard_option("pve-qm-scsi", $scsidesc);
|
||||
my $satadesc = {
|
||||
optional => 1,
|
||||
type => 'string', format => 'pve-qm-drive',
|
||||
typetext => '[volume=]volume,] [,media=cdrom|disk] [,cyls=c,heads=h,secs=s[,trans=t]] [,snapshot=on|off] [,cache=none|writethrough|writeback|unsafe|directsync] [,format=f] [,backup=yes|no] [,rerror=ignore|report|stop] [,werror=enospc|ignore|report|stop] [,aio=native|threads]',
|
||||
typetext => '[volume=]volume,] [,media=cdrom|disk] [,cyls=c,heads=h,secs=s[,trans=t]] [,snapshot=on|off] [,cache=none|writethrough|writeback|unsafe|directsync] [,format=f] [,backup=yes|no] [,rerror=ignore|report|stop] [,werror=enospc|ignore|report|stop] [,aio=native|threads] [,discard=ignore|on]',
|
||||
description => "Use volume as SATA hard disk or CD-ROM (n is 0 to " . ($MAX_SATA_DISKS - 1). ").",
|
||||
};
|
||||
PVE::JSONSchema::register_standard_option("pve-qm-sata", $satadesc);
|
||||
@ -529,7 +529,7 @@ PVE::JSONSchema::register_standard_option("pve-qm-sata", $satadesc);
|
||||
my $virtiodesc = {
|
||||
optional => 1,
|
||||
type => 'string', format => 'pve-qm-drive',
|
||||
typetext => '[volume=]volume,] [,media=cdrom|disk] [,cyls=c,heads=h,secs=s[,trans=t]] [,snapshot=on|off] [,cache=none|writethrough|writeback|unsafe|directsync] [,format=f] [,backup=yes|no] [,rerror=ignore|report|stop] [,werror=enospc|ignore|report|stop] [,aio=native|threads]',
|
||||
typetext => '[volume=]volume,] [,media=cdrom|disk] [,cyls=c,heads=h,secs=s[,trans=t]] [,snapshot=on|off] [,cache=none|writethrough|writeback|unsafe|directsync] [,format=f] [,backup=yes|no] [,rerror=ignore|report|stop] [,werror=enospc|ignore|report|stop] [,aio=native|threads] [,discard=ignore|on]',
|
||||
description => "Use volume as VIRTIO hard disk (n is 0 to " . ($MAX_VIRTIO_DISKS - 1) . ").",
|
||||
};
|
||||
PVE::JSONSchema::register_standard_option("pve-qm-virtio", $virtiodesc);
|
||||
@ -866,7 +866,7 @@ my $format_size = sub {
|
||||
# ideX = [volume=]volume-id[,media=d][,cyls=c,heads=h,secs=s[,trans=t]]
|
||||
# [,snapshot=on|off][,cache=on|off][,format=f][,backup=yes|no]
|
||||
# [,rerror=ignore|report|stop][,werror=enospc|ignore|report|stop]
|
||||
# [,aio=native|threads]
|
||||
# [,aio=native|threads][,discard=ignore|on]
|
||||
|
||||
sub parse_drive {
|
||||
my ($key, $data) = @_;
|
||||
@ -887,7 +887,7 @@ sub parse_drive {
|
||||
foreach my $p (split (/,/, $data)) {
|
||||
next if $p =~ m/^\s*$/;
|
||||
|
||||
if ($p =~ m/^(file|volume|cyls|heads|secs|trans|media|snapshot|cache|format|rerror|werror|backup|aio|bps|mbps|bps_rd|mbps_rd|bps_wr|mbps_wr|iops|iops_rd|iops_wr|size)=(.+)$/) {
|
||||
if ($p =~ m/^(file|volume|cyls|heads|secs|trans|media|snapshot|cache|format|rerror|werror|backup|aio|bps|mbps|bps_rd|mbps_rd|bps_wr|mbps_wr|iops|iops_rd|iops_wr|size|discard)=(.+)$/) {
|
||||
my ($k, $v) = ($1, $2);
|
||||
|
||||
$k = 'file' if $k eq 'volume';
|
||||
@ -928,7 +928,7 @@ sub parse_drive {
|
||||
return undef if $res->{werror} && $res->{werror} !~ m/^(enospc|ignore|report|stop)$/;
|
||||
return undef if $res->{backup} && $res->{backup} !~ m/^(yes|no)$/;
|
||||
return undef if $res->{aio} && $res->{aio} !~ m/^(native|threads)$/;
|
||||
|
||||
return undef if $res->{discard} && $res->{discard} !~ m/^(ignore|on)$/;
|
||||
|
||||
return undef if $res->{mbps_rd} && $res->{mbps};
|
||||
return undef if $res->{mbps_wr} && $res->{mbps};
|
||||
@ -962,7 +962,7 @@ sub parse_drive {
|
||||
return $res;
|
||||
}
|
||||
|
||||
my @qemu_drive_options = qw(heads secs cyls trans media format cache snapshot rerror werror aio iops iops_rd iops_wr);
|
||||
my @qemu_drive_options = qw(heads secs cyls trans media format cache snapshot rerror werror aio discard iops iops_rd iops_wr);
|
||||
|
||||
sub print_drive {
|
||||
my ($vmid, $drive) = @_;
|
||||
|
@ -9,6 +9,8 @@ qemu-server (3.1-11) unstable; urgency=low
|
||||
|
||||
* add 'vmxnet3' to the list of available network card models (emulate
|
||||
VMware paravirtualized network card)
|
||||
|
||||
* add drive option 'discard'
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 03 Dec 2013 10:48:33 +0100
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user