[pve-devel] applied: [PATCH] add rerror for all drives

[Wolfgang Bumiller]

applied to master & stable-4

On Fri, Apr 28, 2017 at 09:30:55AM +0200, Alexandre Derumier wrote:
> it was missing for scsi, and it's supported for all kind of drive
> 
> Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
> ---
>  PVE/QemuServer.pm | 19 ++++++-------------
>  1 file changed, 6 insertions(+), 13 deletions(-)
> 
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 64ecd8d..ba3c603 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -747,6 +747,12 @@ my %drivedesc_base = (
>  	description => "Whether the drive should be included when making backups.",
>  	optional => 1,
>      },
> +    rerror => {
> +	type => 'string',
> +	enum => [qw(ignore report stop)],
> +	description => 'Read error action.',
> +	optional => 1,
> +    },
>      werror => {
>  	type => 'string',
>  	enum => [qw(enospc ignore report stop)],
> @@ -780,15 +786,6 @@ my %drivedesc_base = (
>      }
>  );
>  
> -my %rerror_fmt = (
> -    rerror => {
> -	type => 'string',
> -	enum => [qw(ignore report stop)],
> -	description => 'Read error action.',
> -	optional => 1,
> -    },
> -);
> -
>  my %iothread_fmt = ( iothread => {
>  	type => 'boolean',
>  	description => "Whether to use iothreads for this drive",
> @@ -864,7 +861,6 @@ $add_throttle_desc->('iops_wr_length',  'integer', 'length of write I/O bursts',
>  
>  my $ide_fmt = {
>      %drivedesc_base,
> -    %rerror_fmt,
>      %model_fmt,
>  };
>  PVE::JSONSchema::register_format("pve-qm-ide", $ide_fmt);
> @@ -891,7 +887,6 @@ PVE::JSONSchema::register_standard_option("pve-qm-scsi", $scsidesc);
>  
>  my $sata_fmt = {
>      %drivedesc_base,
> -    %rerror_fmt,
>  };
>  my $satadesc = {
>      optional => 1,
> @@ -903,7 +898,6 @@ PVE::JSONSchema::register_standard_option("pve-qm-sata", $satadesc);
>  my $virtio_fmt = {
>      %drivedesc_base,
>      %iothread_fmt,
> -    %rerror_fmt,
>  };
>  my $virtiodesc = {
>      optional => 1,
> @@ -914,7 +908,6 @@ PVE::JSONSchema::register_standard_option("pve-qm-virtio", $virtiodesc);
>  
>  my $alldrive_fmt = {
>      %drivedesc_base,
> -    %rerror_fmt,
>      %iothread_fmt,
>      %model_fmt,
>      %queues_fmt,
> -- 
> 2.11.0