commit 58e21ef5ab262fb91256435c31cc7bfeead59754
author Luiz Capitulino <lcapitulino@redhat.com> Fri Oct 14 17:22:24 2011 -0300
committer Luiz Capitulino <lcapitulino@redhat.com> Thu Oct 27 11:48:47 2011 -0200
tree 339eeb435a33ff80f6da27f178acd19067c14d1e
parent d6bf279e7a949ad49a48a215f9ec28cb6ceb28aa

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>

block.c

diff --git a/block.c b/block.c
index 4dc2b85..1a4625f 100644
--- a/block.c
+++ b/block.c
@@ -1870,10 +1870,10 @@
     qlist_iter(qobject_to_qlist(data), bdrv_print_dict, mon);
 }
 
-static const char *const io_status_name[BDRV_IOS_MAX] = {
-    [BDRV_IOS_OK] = "ok",
-    [BDRV_IOS_FAILED] = "failed",
-    [BDRV_IOS_ENOSPC] = "nospace",
+static const char *const io_status_name[BLOCK_DEVICE_IO_STATUS_MAX] = {
+    [BLOCK_DEVICE_IO_STATUS_OK] = "ok",
+    [BLOCK_DEVICE_IO_STATUS_FAILED] = "failed",
+    [BLOCK_DEVICE_IO_STATUS_NOSPACE] = "nospace",
 };
 
 void bdrv_info(Monitor *mon, QObject **ret_data)
@@ -3140,7 +3140,7 @@
 void bdrv_iostatus_enable(BlockDriverState *bs)
 {
     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
@@ -3161,7 +3161,7 @@
 void bdrv_iostatus_reset(BlockDriverState *bs)
 {
     if (bdrv_iostatus_is_enabled(bs)) {
-        bs->iostatus = BDRV_IOS_OK;
+        bs->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
     }
 }
 
@@ -3170,9 +3170,11 @@
    possible to implement this without device models being involved */
 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);
-        bs->iostatus = error == ENOSPC ? BDRV_IOS_ENOSPC : BDRV_IOS_FAILED;
+        bs->iostatus = error == ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOSPACE :
+                                         BLOCK_DEVICE_IO_STATUS_FAILED;
     }
 }