From ce6e9dbebe4b77a7c89a93ee03cba440aa173dc3 Mon Sep 17 00:00:00 2001
From: "Huawei Technologies Co., Ltd" <alex.chen@huawei.com>
Date: Thu, 21 Jan 2021 15:46:45 +0800
Subject: [PATCH] qapi/block-core: Add retry option for error action

Add a new error action 'retry' to support retry on errors.

Signed-off-by: Jiahui Cen <cenjiahui(a)huawei.com>
Signed-off-by: Ying Fang <fangying1(a)huawei.com>
---
 ...re-Add-retry-option-for-error-action.patch | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 qapi-block-core-Add-retry-option-for-error-action.patch

diff --git a/qapi-block-core-Add-retry-option-for-error-action.patch b/qapi-block-core-Add-retry-option-for-error-action.patch
new file mode 100644
index 0000000..817ff70
--- /dev/null
+++ b/qapi-block-core-Add-retry-option-for-error-action.patch
@@ -0,0 +1,52 @@
+From 9a95d75bdd469c9c7d44c7c72bc16d57ef2f65cc Mon Sep 17 00:00:00 2001
+From: Jiahui Cen <cenjiahui@huawei.com>
+Date: Thu, 21 Jan 2021 15:46:45 +0800
+Subject: [PATCH] qapi/block-core: Add retry option for error action
+
+Add a new error action 'retry' to support retry on errors.
+
+Signed-off-by: Jiahui Cen <cenjiahui(a)huawei.com>
+Signed-off-by: Ying Fang <fangying1(a)huawei.com>
+---
+ blockdev.c           | 2 ++
+ qapi/block-core.json | 4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/blockdev.c b/blockdev.c
+index 4d141e9a1f..0f49fd290e 100644
+--- a/blockdev.c
++++ b/blockdev.c
+@@ -319,6 +319,8 @@ static int parse_block_error_action(const char *buf, bool is_read, Error **errp)
+         return BLOCKDEV_ON_ERROR_STOP;
+     } else if (!strcmp(buf, "report")) {
+         return BLOCKDEV_ON_ERROR_REPORT;
++    } else if (!strcmp(buf, "retry")) {
++        return BLOCKDEV_ON_ERROR_RETRY;
+     } else {
+         error_setg(errp, "'%s' invalid %s error action",
+                    buf, is_read ? "read" : "write");
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 0d43d4f37c..db24f0dfe5 100644
+--- a/qapi/block-core.json
++++ b/qapi/block-core.json
+@@ -1113,7 +1113,7 @@
+ # Since: 1.3
+ ##
+ { 'enum': 'BlockdevOnError',
+-  'data': ['report', 'ignore', 'enospc', 'stop', 'auto'] }
++  'data': ['report', 'ignore', 'enospc', 'stop', 'auto', 'retry'] }
+ 
+ ##
+ # @MirrorSyncMode:
+@@ -4894,7 +4894,7 @@
+ # Since: 2.1
+ ##
+ { 'enum': 'BlockErrorAction',
+-  'data': [ 'ignore', 'report', 'stop' ] }
++  'data': [ 'ignore', 'report', 'stop', 'retry' ] }
+ 
+ 
+ ##
+-- 
+2.27.0
+