From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi4QM-000138-SD for qemu-devel@nongnu.org; Tue, 24 Jul 2018 17:00:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fi4QM-0007TK-3T for qemu-devel@nongnu.org; Tue, 24 Jul 2018 17:00:50 -0400 References: <20180724200343.13733-1-lbloch@janustech.com> <20180724200343.13733-2-lbloch@janustech.com> From: Eric Blake Message-ID: <3edeb663-8e53-ec83-bc19-45a5804d6be3@redhat.com> Date: Tue, 24 Jul 2018 16:00:42 -0500 MIME-Version: 1.0 In-Reply-To: <20180724200343.13733-2-lbloch@janustech.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 1/5 for-3.0] A grammar fix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Leonid Bloch , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Kevin Wolf , Max Reitz On 07/24/2018 03:03 PM, Leonid Bloch wrote: Subject line is rather vague; at a bare minimum, mentioning 'qcow2:' might be helpful. But the maintainer can improve that. My suggestion: qcow2: grammar fix for conflicting cache sizing > Signed-off-by: Leonid Bloch > --- > block/qcow2.c | 2 +- > tests/qemu-iotests/103.out | 2 +- > tests/qemu-iotests/137.out | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Eric Blake > > diff --git a/block/qcow2.c b/block/qcow2.c > index 6162ed8be2..ec9e6238a0 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -797,7 +797,7 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts, > if (l2_cache_size_set && refcount_cache_size_set) { > error_setg(errp, QCOW2_OPT_CACHE_SIZE ", " QCOW2_OPT_L2_CACHE_SIZE > " and " QCOW2_OPT_REFCOUNT_CACHE_SIZE " may not be set " > - "the same time"); > + "at the same time"); > return; > } else if (*l2_cache_size > combined_cache_size) { > error_setg(errp, QCOW2_OPT_L2_CACHE_SIZE " may not exceed " > diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out > index bd45d3875a..ab56f03a00 100644 > --- a/tests/qemu-iotests/103.out > +++ b/tests/qemu-iotests/103.out > @@ -5,7 +5,7 @@ wrote 65536/65536 bytes at offset 0 > > === Testing invalid option combinations === > > -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set the same time > +can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time > can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size > can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size > can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set the same time > diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out > index 96724a6c33..6a2ffc71fd 100644 > --- a/tests/qemu-iotests/137.out > +++ b/tests/qemu-iotests/137.out > @@ -16,7 +16,7 @@ read 33554432/33554432 bytes at offset 0 > === Try setting some invalid values === > > Parameter 'lazy-refcounts' expects 'on' or 'off' > -cache-size, l2-cache-size and refcount-cache-size may not be set the same time > +cache-size, l2-cache-size and refcount-cache-size may not be set at the same time > l2-cache-size may not exceed cache-size > refcount-cache-size may not exceed cache-size > L2 cache size too big > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org