| Message ID | 20180724200343.13733-2-lbloch@janustech.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/5,for-3.0] A grammar fix | expand |
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 <lbloch@janustech.com> > --- > 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 <eblake@redhat.com> > > 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 >
Am 24.07.2018 um 23:00 hat Eric Blake geschrieben: > 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 How about "qcow2: Grammar fix for conflicting cache size options"? > > Signed-off-by: Leonid Bloch <lbloch@janustech.com> > > --- > > block/qcow2.c | 2 +- > > tests/qemu-iotests/103.out | 2 +- You replaced only one of the two places in the reference output, so 103 fails for me now. Kevin
On 07/25/2018 11:49 AM, Kevin Wolf wrote:
Am 24.07.2018 um 23:00 hat Eric Blake geschrieben:
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
How about "qcow2: Grammar fix for conflicting cache size options"?
Already fixed in v4.
Signed-off-by: Leonid Bloch [1]<lbloch@janustech.com>
---
block/qcow2.c | 2 +-
tests/qemu-iotests/103.out | 2 +-
You replaced only one of the two places in the reference output, so 103
fails for me now.
Thanks! Didn't add the second place by mistake. Will fix in v5.
Leonid.
Kevin
References
1. mailto:lbloch@janustech.com
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
Signed-off-by: Leonid Bloch <lbloch@janustech.com> --- block/qcow2.c | 2 +- tests/qemu-iotests/103.out | 2 +- tests/qemu-iotests/137.out | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)