qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 1/5] Remove tabs from qcow_aio_read_cb(). Fix indent


From: Gleb Natapov
Subject: [Qemu-devel] [PATCH 1/5] Remove tabs from qcow_aio_read_cb(). Fix indentation.
Date: Sun, 23 Nov 2008 16:52:58 +0200
User-agent: StGIT/0.14.2

Signed-off-by: Gleb Natapov <address@hidden>
---

 block-qcow2.c |   78 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/block-qcow2.c b/block-qcow2.c
index dc73769..ab19a4e 100644
--- a/block-qcow2.c
+++ b/block-qcow2.c
@@ -1186,7 +1186,7 @@ static void qcow_aio_read_cb(void *opaque, int ret)
 
     acb->hd_aiocb = NULL;
     if (ret < 0) {
-    fail:
+fail:
         acb->common.cb(acb->common.opaque, ret);
         qemu_aio_release(acb);
         return;
@@ -1200,8 +1200,8 @@ static void qcow_aio_read_cb(void *opaque, int ret)
     } else {
         if (s->crypt_method) {
             encrypt_sectors(s, acb->sector_num, acb->buf, acb->buf,
-                            acb->n, 0,
-                            &s->aes_decrypt_key);
+                    acb->n, 0,
+                    &s->aes_decrypt_key);
         }
     }
 
@@ -1225,62 +1225,62 @@ static void qcow_aio_read_cb(void *opaque, int ret)
         if (bs->backing_hd) {
             /* read from the base image */
             n1 = backing_read1(bs->backing_hd, acb->sector_num,
-                               acb->buf, acb->n);
+                    acb->buf, acb->n);
             if (n1 > 0) {
                 acb->hd_aiocb = bdrv_aio_read(bs->backing_hd, acb->sector_num,
-                                    acb->buf, acb->n, qcow_aio_read_cb, acb);
+                        acb->buf, acb->n, qcow_aio_read_cb, acb);
                 if (acb->hd_aiocb == NULL)
                     goto fail;
             } else {
-               if (acb->bh) {
-                   ret = -EIO;
-                   goto fail;
-               }
-               acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
-               if (!acb->bh) {
-                   ret = -EIO;
-                   goto fail;
-               }
-               qemu_bh_schedule(acb->bh);
+                if (acb->bh) {
+                    ret = -EIO;
+                    goto fail;
+                }
+                acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
+                if (!acb->bh) {
+                    ret = -EIO;
+                    goto fail;
+                }
+                qemu_bh_schedule(acb->bh);
             }
         } else {
             /* Note: in this case, no need to wait */
             memset(acb->buf, 0, 512 * acb->n);
-           if (acb->bh) {
-               ret = -EIO;
-               goto fail;
-           }
-           acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
-           if (!acb->bh) {
-               ret = -EIO;
-               goto fail;
-           }
-           qemu_bh_schedule(acb->bh);
+            if (acb->bh) {
+                ret = -EIO;
+                goto fail;
+            }
+            acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
+            if (!acb->bh) {
+                ret = -EIO;
+                goto fail;
+            }
+            qemu_bh_schedule(acb->bh);
         }
     } else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) {
         /* add AIO support for compressed blocks ? */
         if (decompress_cluster(s, acb->cluster_offset) < 0)
             goto fail;
         memcpy(acb->buf,
-               s->cluster_cache + index_in_cluster * 512, 512 * acb->n);
-       if (acb->bh) {
-           ret = -EIO;
-           goto fail;
-       }
-       acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
-       if (!acb->bh) {
-           ret = -EIO;
-           goto fail;
-       }
-       qemu_bh_schedule(acb->bh);
+                s->cluster_cache + index_in_cluster * 512, 512 * acb->n);
+        if (acb->bh) {
+            ret = -EIO;
+            goto fail;
+        }
+        acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
+        if (!acb->bh) {
+            ret = -EIO;
+            goto fail;
+        }
+        qemu_bh_schedule(acb->bh);
     } else {
         if ((acb->cluster_offset & 511) != 0) {
             ret = -EIO;
             goto fail;
         }
         acb->hd_aiocb = bdrv_aio_read(s->hd,
-                            (acb->cluster_offset >> 9) + index_in_cluster,
-                            acb->buf, acb->n, qcow_aio_read_cb, acb);
+                (acb->cluster_offset >> 9) + index_in_cluster,
+                acb->buf, acb->n, qcow_aio_read_cb, acb);
         if (acb->hd_aiocb == NULL)
             goto fail;
     }
@@ -1551,7 +1551,7 @@ static int qcow_make_empty(BlockDriverState *bs)
 
     memset(s->l1_table, 0, l1_length);
     if (bdrv_pwrite(s->hd, s->l1_table_offset, s->l1_table, l1_length) < 0)
-       return -1;
+    return -1;
     ret = bdrv_truncate(s->hd, s->l1_table_offset + l1_length);
     if (ret < 0)
         return ret;





reply via email to

[Prev in Thread] Current Thread [Next in Thread]