From: Gleb Natapov <gleb@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 1/5] Remove tabs from qcow_aio_read_cb(). Fix indentation.
Date: Sun, 23 Nov 2008 16:52:58 +0200 [thread overview]
Message-ID: <20081123145257.22178.1698.stgit@dhcp-1-237.tlv.redhat.com> (raw)
In-Reply-To: <20081123145248.22178.36228.stgit@dhcp-1-237.tlv.redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
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;
next prev parent reply other threads:[~2008-11-23 14:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-23 14:52 [Qemu-devel] [PATCH 0/5] QCOW2 small cleanups and changing metadata update order Gleb Natapov
2008-11-23 14:52 ` Gleb Natapov [this message]
2008-11-24 16:31 ` [Qemu-devel] [PATCH 1/5] Remove tabs from qcow_aio_read_cb(). Fix indentation Anthony Liguori
2008-11-24 20:03 ` Gleb Natapov
2008-11-23 14:53 ` [Qemu-devel] [PATCH 2/5] Introduce new helper function qcow_shedule_bh() Gleb Natapov
2008-11-24 16:32 ` Anthony Liguori
2008-11-24 20:05 ` Gleb Natapov
2008-11-23 14:53 ` [Qemu-devel] [PATCH 3/5] Write table offset and size in one syscall Gleb Natapov
2008-11-24 16:42 ` Anthony Liguori
2008-11-24 20:11 ` Gleb Natapov
2008-11-23 14:53 ` [Qemu-devel] [PATCH 4/5] Cleanup {alloc|get}_cluster_offset() Gleb Natapov
2008-11-24 16:47 ` Anthony Liguori
2008-11-23 14:53 ` [Qemu-devel] [PATCH 5/5] Change order of metadata update to prevent loosing guest data because of unexpected exit Gleb Natapov
2008-11-24 16:49 ` Anthony Liguori
2008-11-24 20:19 ` Gleb Natapov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081123145257.22178.1698.stgit@dhcp-1-237.tlv.redhat.com \
--to=gleb@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).