openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: Rename the BlockIOStatus enum values 

The biggest change is to rename its prefix from BDRV_IOS to
BLOCK_DEVICE_IO_STATUS.

Next commit will convert the query-block command to the QAPI
and that's how the enumeration is going to be generated.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2011-10-14 17:22:24 -03:00
parent d6bf279e7a
commit 58e21ef5ab
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
block.c
View File

@ -1870,10 +1870,10 @@ void bdrv_info_print(Monitor *mon, const QObject *data)
qlist_iter(qobject_to_qlist(data), bdrv_print_dict, mon); qlist_iter(qobject_to_qlist(data), bdrv_print_dict, mon);
} }
static const char *const io_status_name[BDRV_IOS_MAX] = { static const char *const io_status_name[BLOCK_DEVICE_IO_STATUS_MAX] = {
[BDRV_IOS_OK] = "ok", [BLOCK_DEVICE_IO_STATUS_OK] = "ok",
[BDRV_IOS_FAILED] = "failed", [BLOCK_DEVICE_IO_STATUS_FAILED] = "failed",
[BDRV_IOS_ENOSPC] = "nospace", [BLOCK_DEVICE_IO_STATUS_NOSPACE] = "nospace",
}; };
void bdrv_info(Monitor *mon, QObject **ret_data) void bdrv_info(Monitor *mon, QObject **ret_data)
@ -3140,7 +3140,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_enabled = true;
bs->iostatus = BDRV_IOS_OK; bs->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
} }
/* The I/O status is only enabled if the drive explicitly /* The I/O status is only enabled if the drive explicitly
@ -3161,7 +3161,7 @@ void bdrv_iostatus_disable(BlockDriverState *bs)
void bdrv_iostatus_reset(BlockDriverState *bs) void bdrv_iostatus_reset(BlockDriverState *bs)
{ {
if (bdrv_iostatus_is_enabled(bs)) { if (bdrv_iostatus_is_enabled(bs)) {
bs->iostatus = BDRV_IOS_OK; bs->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
} }
} }
@ -3170,9 +3170,11 @@ void bdrv_iostatus_reset(BlockDriverState *bs)
possible to implement this without device models being involved */ possible to implement this without device models being involved */
void bdrv_iostatus_set_err(BlockDriverState *bs, int error) void bdrv_iostatus_set_err(BlockDriverState *bs, int error)
{ {
if (bdrv_iostatus_is_enabled(bs) && bs->iostatus == BDRV_IOS_OK) { if (bdrv_iostatus_is_enabled(bs) &&
bs->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
assert(error >= 0); assert(error >= 0);
bs->iostatus = error == ENOSPC ? BDRV_IOS_ENOSPC : BDRV_IOS_FAILED; bs->iostatus = error == ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOSPACE :
BLOCK_DEVICE_IO_STATUS_FAILED;
} }
} }

3
block.h
View File

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