A future commit will convert bdrv_info() to the QAPI and it won't
provide IOS_INVAL.
Luckily all we have to do is to add a new 'iostatus_enabled'
member to BlockDriverState and use it instead.
Signed-off-by: Luiz Capitulino <lcapitul...@redhat.com>
---
block.c | 5 +++--
block.h | 3 +--
block_int.h | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 9873b57..04f4143 100644
--- a/block.c
+++ b/block.c
@@ -3079,6 +3079,7 @@ int bdrv_in_use(BlockDriverState *bs)
void bdrv_iostatus_enable(BlockDriverState *bs)
{
+ bs->iostatus_enabled = true;
bs->iostatus = BDRV_IOS_OK;
}
@@ -3086,7 +3087,7 @@ void bdrv_iostatus_enable(BlockDriverState *bs)
* enables it _and_ the VM is configured to stop on errors */
bool bdrv_iostatus_is_enabled(const BlockDriverState *bs)
{
- return (bs->iostatus != BDRV_IOS_INVAL &&
+ return (bs->iostatus_enabled &&
(bs->on_write_error == BLOCK_ERR_STOP_ENOSPC ||
bs->on_write_error == BLOCK_ERR_STOP_ANY ||
bs->on_read_error == BLOCK_ERR_STOP_ANY));
@@ -3094,7 +3095,7 @@ bool bdrv_iostatus_is_enabled(const BlockDriverState *bs)
void bdrv_iostatus_disable(BlockDriverState *bs)
{
- bs->iostatus = BDRV_IOS_INVAL;
+ bs->iostatus_enabled = false;
}
void bdrv_iostatus_reset(BlockDriverState *bs)
diff --git a/block.h b/block.h
index e77988e..9c77604 100644
--- a/block.h
+++ b/block.h
@@ -78,8 +78,7 @@ typedef enum {
} BlockMonEventAction;
typedef enum {
- BDRV_IOS_INVAL, BDRV_IOS_OK, BDRV_IOS_FAILED, BDRV_IOS_ENOSPC,
- BDRV_IOS_MAX
+ BDRV_IOS_OK, BDRV_IOS_FAILED, BDRV_IOS_ENOSPC, BDRV_IOS_MAX
} BlockIOStatus;
void bdrv_iostatus_enable(BlockDriverState *bs);
diff --git a/block_int.h b/block_int.h
index f2f4f2d..7ce2150 100644
--- a/block_int.h
+++ b/block_int.h
@@ -199,6 +199,7 @@ struct BlockDriverState {
drivers. They are not used by the block driver */
int cyls, heads, secs, translation;
BlockErrorAction on_read_error, on_write_error;
+ bool iostatus_enabled;
BlockIOStatus iostatus;
char device_name[32];
unsigned long *dirty_bitmap;
--
1.7.7.1.431.g10b2a
