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

block: iostatus: Drop BDRV_IOS_INVAL

Browse Source 
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 <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2011-10-14 17:11:23 -03:00
parent de0b36b67e
commit d6bf279e7a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block.c
View File

@ -3139,6 +3139,7 @@ int bdrv_in_use(BlockDriverState *bs)
void bdrv_iostatus_enable(BlockDriverState *bs) void bdrv_iostatus_enable(BlockDriverState *bs)
{ {
bs->iostatus_enabled = true;
bs->iostatus = BDRV_IOS_OK; bs->iostatus = BDRV_IOS_OK;
} }
@ -3146,7 +3147,7 @@ void bdrv_iostatus_enable(BlockDriverState *bs)
* enables it _and_ the VM is configured to stop on errors */ * enables it _and_ the VM is configured to stop on errors */
bool bdrv_iostatus_is_enabled(const BlockDriverState *bs) 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_ENOSPC ||
bs->on_write_error == BLOCK_ERR_STOP_ANY || bs->on_write_error == BLOCK_ERR_STOP_ANY ||
bs->on_read_error == BLOCK_ERR_STOP_ANY)); bs->on_read_error == BLOCK_ERR_STOP_ANY));
@ -3154,7 +3155,7 @@ bool bdrv_iostatus_is_enabled(const BlockDriverState *bs)
void bdrv_iostatus_disable(BlockDriverState *bs) void bdrv_iostatus_disable(BlockDriverState *bs)
{ {
bs->iostatus = BDRV_IOS_INVAL; bs->iostatus_enabled = false;
} }
void bdrv_iostatus_reset(BlockDriverState *bs) void bdrv_iostatus_reset(BlockDriverState *bs)

3
block.h
View File

@ -78,8 +78,7 @@ typedef enum {
} BlockMonEventAction; } BlockMonEventAction;
typedef enum { typedef enum {
BDRV_IOS_INVAL, BDRV_IOS_OK, BDRV_IOS_FAILED, BDRV_IOS_ENOSPC, BDRV_IOS_OK, BDRV_IOS_FAILED, BDRV_IOS_ENOSPC, BDRV_IOS_MAX
BDRV_IOS_MAX
} BlockIOStatus; } BlockIOStatus;
void bdrv_iostatus_enable(BlockDriverState *bs); void bdrv_iostatus_enable(BlockDriverState *bs);

1
block_int.h
View File

@ -202,6 +202,7 @@ struct BlockDriverState {
drivers. They are not used by the block driver */ drivers. They are not used by the block driver */
int cyls, heads, secs, translation; int cyls, heads, secs, translation;
BlockErrorAction on_read_error, on_write_error; BlockErrorAction on_read_error, on_write_error;
bool iostatus_enabled;
BlockIOStatus iostatus; BlockIOStatus iostatus;
char device_name[32]; char device_name[32];
unsigned long *dirty_bitmap; unsigned long *dirty_bitmap;