From: John Snow <jsnow@redhat.com>
To: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: kwolf@redhat.com, mreitz@redhat.com
Subject: Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] qcow2: fix indentation after previous patch
Date: Fri, 8 Dec 2017 13:53:06 -0500 [thread overview]
Message-ID: <e9d782a3-ecb2-950e-6e5a-526afb13c965@redhat.com> (raw)
In-Reply-To: <20171130164750.47320-3-vsementsov@virtuozzo.com>
On 11/30/2017 11:47 AM, Vladimir Sementsov-Ogievskiy wrote:
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
> block/qcow2.h | 34 +++++++++++++++++-----------------
> block/qcow2.c | 16 ++++++++--------
> 2 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/block/qcow2.h b/block/qcow2.h
> index 8f226a3609..896ad08e5b 100644
> --- a/block/qcow2.h
> +++ b/block/qcow2.h
> @@ -399,29 +399,29 @@ typedef enum QCow2ClusterType {
> } QCow2ClusterType;
>
> typedef enum QCow2MetadataOverlap {
> - QCOW2_OL_MAIN_HEADER_BITNR = 0,
> - QCOW2_OL_ACTIVE_L1_BITNR = 1,
> - QCOW2_OL_ACTIVE_L2_BITNR = 2,
> - QCOW2_OL_REFCOUNT_TABLE_BITNR = 3,
> - QCOW2_OL_REFCOUNT_BLOCK_BITNR = 4,
> - QCOW2_OL_SNAPSHOT_TABLE_BITNR = 5,
> - QCOW2_OL_INACTIVE_L1_BITNR = 6,
> - QCOW2_OL_INACTIVE_L2_BITNR = 7,
> + QCOW2_OL_MAIN_HEADER_BITNR = 0,
> + QCOW2_OL_ACTIVE_L1_BITNR = 1,
> + QCOW2_OL_ACTIVE_L2_BITNR = 2,
> + QCOW2_OL_REFCOUNT_TABLE_BITNR = 3,
> + QCOW2_OL_REFCOUNT_BLOCK_BITNR = 4,
> + QCOW2_OL_SNAPSHOT_TABLE_BITNR = 5,
> + QCOW2_OL_INACTIVE_L1_BITNR = 6,
> + QCOW2_OL_INACTIVE_L2_BITNR = 7,
> QCOW2_OL_BITMAP_DIRECTORY_BITNR = 8,
>
> QCOW2_OL_MAX_BITNR = 9,
>
> - QCOW2_OL_NONE = 0,
> - QCOW2_OL_MAIN_HEADER = (1 << QCOW2_OL_MAIN_HEADER_BITNR),
> - QCOW2_OL_ACTIVE_L1 = (1 << QCOW2_OL_ACTIVE_L1_BITNR),
> - QCOW2_OL_ACTIVE_L2 = (1 << QCOW2_OL_ACTIVE_L2_BITNR),
> - QCOW2_OL_REFCOUNT_TABLE = (1 << QCOW2_OL_REFCOUNT_TABLE_BITNR),
> - QCOW2_OL_REFCOUNT_BLOCK = (1 << QCOW2_OL_REFCOUNT_BLOCK_BITNR),
> - QCOW2_OL_SNAPSHOT_TABLE = (1 << QCOW2_OL_SNAPSHOT_TABLE_BITNR),
> - QCOW2_OL_INACTIVE_L1 = (1 << QCOW2_OL_INACTIVE_L1_BITNR),
> + QCOW2_OL_NONE = 0,
> + QCOW2_OL_MAIN_HEADER = (1 << QCOW2_OL_MAIN_HEADER_BITNR),
> + QCOW2_OL_ACTIVE_L1 = (1 << QCOW2_OL_ACTIVE_L1_BITNR),
> + QCOW2_OL_ACTIVE_L2 = (1 << QCOW2_OL_ACTIVE_L2_BITNR),
> + QCOW2_OL_REFCOUNT_TABLE = (1 << QCOW2_OL_REFCOUNT_TABLE_BITNR),
> + QCOW2_OL_REFCOUNT_BLOCK = (1 << QCOW2_OL_REFCOUNT_BLOCK_BITNR),
> + QCOW2_OL_SNAPSHOT_TABLE = (1 << QCOW2_OL_SNAPSHOT_TABLE_BITNR),
> + QCOW2_OL_INACTIVE_L1 = (1 << QCOW2_OL_INACTIVE_L1_BITNR),
> /* NOTE: Checking overlaps with inactive L2 tables will result in bdrv
> * reads. */
> - QCOW2_OL_INACTIVE_L2 = (1 << QCOW2_OL_INACTIVE_L2_BITNR),
> + QCOW2_OL_INACTIVE_L2 = (1 << QCOW2_OL_INACTIVE_L2_BITNR),
> QCOW2_OL_BITMAP_DIRECTORY = (1 << QCOW2_OL_BITMAP_DIRECTORY_BITNR),
> } QCow2MetadataOverlap;
>
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 8278c0e124..23f36a67c7 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -687,14 +687,14 @@ static QemuOptsList qcow2_runtime_opts = {
> };
>
> static const char *overlap_bool_option_names[QCOW2_OL_MAX_BITNR] = {
> - [QCOW2_OL_MAIN_HEADER_BITNR] = QCOW2_OPT_OVERLAP_MAIN_HEADER,
> - [QCOW2_OL_ACTIVE_L1_BITNR] = QCOW2_OPT_OVERLAP_ACTIVE_L1,
> - [QCOW2_OL_ACTIVE_L2_BITNR] = QCOW2_OPT_OVERLAP_ACTIVE_L2,
> - [QCOW2_OL_REFCOUNT_TABLE_BITNR] = QCOW2_OPT_OVERLAP_REFCOUNT_TABLE,
> - [QCOW2_OL_REFCOUNT_BLOCK_BITNR] = QCOW2_OPT_OVERLAP_REFCOUNT_BLOCK,
> - [QCOW2_OL_SNAPSHOT_TABLE_BITNR] = QCOW2_OPT_OVERLAP_SNAPSHOT_TABLE,
> - [QCOW2_OL_INACTIVE_L1_BITNR] = QCOW2_OPT_OVERLAP_INACTIVE_L1,
> - [QCOW2_OL_INACTIVE_L2_BITNR] = QCOW2_OPT_OVERLAP_INACTIVE_L2,
> + [QCOW2_OL_MAIN_HEADER_BITNR] = QCOW2_OPT_OVERLAP_MAIN_HEADER,
> + [QCOW2_OL_ACTIVE_L1_BITNR] = QCOW2_OPT_OVERLAP_ACTIVE_L1,
> + [QCOW2_OL_ACTIVE_L2_BITNR] = QCOW2_OPT_OVERLAP_ACTIVE_L2,
> + [QCOW2_OL_REFCOUNT_TABLE_BITNR] = QCOW2_OPT_OVERLAP_REFCOUNT_TABLE,
> + [QCOW2_OL_REFCOUNT_BLOCK_BITNR] = QCOW2_OPT_OVERLAP_REFCOUNT_BLOCK,
> + [QCOW2_OL_SNAPSHOT_TABLE_BITNR] = QCOW2_OPT_OVERLAP_SNAPSHOT_TABLE,
> + [QCOW2_OL_INACTIVE_L1_BITNR] = QCOW2_OPT_OVERLAP_INACTIVE_L1,
> + [QCOW2_OL_INACTIVE_L2_BITNR] = QCOW2_OPT_OVERLAP_INACTIVE_L2,
> [QCOW2_OL_BITMAP_DIRECTORY_BITNR] = QCOW2_OPT_OVERLAP_BITMAP_DIRECTORY,
> };
>
>
Squash it in, or don't, either way:
Reviewed-by: John Snow <jsnow@redhat.com>
next prev parent reply other threads:[~2017-12-08 18:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-30 16:47 [Qemu-devel] [PATCH for-2.12 0/2] qcow2: add overlap check for bitmap directory Vladimir Sementsov-Ogievskiy
2017-11-30 16:47 ` [Qemu-devel] [PATCH 1/2] " Vladimir Sementsov-Ogievskiy
2017-12-01 17:59 ` Eric Blake
2017-12-06 22:56 ` [Qemu-devel] [Qemu-block] " John Snow
[not found] ` <2af21d5f-3ad9-3492-03ea-c720929c4e36@virtuozzo.com>
2017-12-07 17:03 ` John Snow
2018-01-29 15:34 ` [Qemu-devel] " Max Reitz
2018-02-02 12:07 ` Vladimir Sementsov-Ogievskiy
2018-02-02 13:00 ` Max Reitz
2018-02-02 13:48 ` Vladimir Sementsov-Ogievskiy
2018-02-02 13:53 ` Max Reitz
2018-02-02 14:28 ` Vladimir Sementsov-Ogievskiy
2017-11-30 16:47 ` [Qemu-devel] [PATCH 2/2] qcow2: fix indentation after previous patch Vladimir Sementsov-Ogievskiy
2017-12-01 17:56 ` Eric Blake
2017-12-08 18:53 ` John Snow [this message]
2018-03-16 22:21 ` [Qemu-devel] [Qemu-block] [PATCH for-2.12 0/2] qcow2: add overlap check for bitmap directory John Snow
2018-03-19 6:49 ` Vladimir Sementsov-Ogievskiy
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=e9d782a3-ecb2-950e-6e5a-526afb13c965@redhat.com \
--to=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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).