gwj / at91sam9263 · Commits

Commit ac67488746cb81fde6b037113770b2b29d0073c4

Authored by aliguori
1 parent 4a55bfdf

Remove tabs from qcow_aio_read_cb(). (Gleb Natapov) 

Fix indentation.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5857 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 32 additions and 32 deletions
block-qcow2.c
  View file @ac67488
... ... @@ -1186,7 +1186,7 @@ static void qcow_aio_read_cb(void *opaque, int ret)
1186 1186  
1187 1187 acb->hd_aiocb = NULL;
1188 1188 if (ret < 0) {
1189   - fail:
  1189 +fail:
1190 1190 acb->common.cb(acb->common.opaque, ret);
1191 1191 qemu_aio_release(acb);
1192 1192 return;
... ... @@ -1232,30 +1232,30 @@ static void qcow_aio_read_cb(void *opaque, int ret)
1232 1232 if (acb->hd_aiocb == NULL)
1233 1233 goto fail;
1234 1234 } else {
1235   - if (acb->bh) {
1236   - ret = -EIO;
1237   - goto fail;
1238   - }
1239   - acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
1240   - if (!acb->bh) {
1241   - ret = -EIO;
1242   - goto fail;
1243   - }
1244   - qemu_bh_schedule(acb->bh);
  1235 + if (acb->bh) {
  1236 + ret = -EIO;
  1237 + goto fail;
  1238 + }
  1239 + acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
  1240 + if (!acb->bh) {
  1241 + ret = -EIO;
  1242 + goto fail;
  1243 + }
  1244 + qemu_bh_schedule(acb->bh);
1245 1245 }
1246 1246 } else {
1247 1247 /* Note: in this case, no need to wait */
1248 1248 memset(acb->buf, 0, 512 * acb->n);
1249   - if (acb->bh) {
1250   - ret = -EIO;
1251   - goto fail;
1252   - }
1253   - acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
1254   - if (!acb->bh) {
1255   - ret = -EIO;
1256   - goto fail;
1257   - }
1258   - qemu_bh_schedule(acb->bh);
  1249 + if (acb->bh) {
  1250 + ret = -EIO;
  1251 + goto fail;
  1252 + }
  1253 + acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
  1254 + if (!acb->bh) {
  1255 + ret = -EIO;
  1256 + goto fail;
  1257 + }
  1258 + qemu_bh_schedule(acb->bh);
1259 1259 }
1260 1260 } else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) {
1261 1261 /* add AIO support for compressed blocks ? */
... ... @@ -1263,16 +1263,16 @@ static void qcow_aio_read_cb(void *opaque, int ret)
1263 1263 goto fail;
1264 1264 memcpy(acb->buf,
1265 1265 s->cluster_cache + index_in_cluster * 512, 512 * acb->n);
1266   - if (acb->bh) {
1267   - ret = -EIO;
1268   - goto fail;
1269   - }
1270   - acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
1271   - if (!acb->bh) {
1272   - ret = -EIO;
1273   - goto fail;
1274   - }
1275   - qemu_bh_schedule(acb->bh);
  1266 + if (acb->bh) {
  1267 + ret = -EIO;
  1268 + goto fail;
  1269 + }
  1270 + acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
  1271 + if (!acb->bh) {
  1272 + ret = -EIO;
  1273 + goto fail;
  1274 + }
  1275 + qemu_bh_schedule(acb->bh);
1276 1276 } else {
1277 1277 if ((acb->cluster_offset & 511) != 0) {
1278 1278 ret = -EIO;
... ... @@ -1551,7 +1551,7 @@ static int qcow_make_empty(BlockDriverState *bs)
1551 1551  
1552 1552 memset(s->l1_table, 0, l1_length);
1553 1553 if (bdrv_pwrite(s->hd, s->l1_table_offset, s->l1_table, l1_length) < 0)
1554   - return -1;
  1554 + return -1;
1555 1555 ret = bdrv_truncate(s->hd, s->l1_table_offset + l1_length);
1556 1556 if (ret < 0)
1557 1557 return ret;
... ...