[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 02/13] qcow2: A grammar fix in conflicting cache sizi
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 02/13] qcow2: A grammar fix in conflicting cache sizing error message |
Date: |
Mon, 30 Jul 2018 17:09:47 +0200 |
From: Leonid Bloch <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2.c | 2 +-
tests/qemu-iotests/103.out | 4 ++--
tests/qemu-iotests/137.out | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
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..bd9eec3250 100644
--- a/tests/qemu-iotests/103.out
+++ b/tests/qemu-iotests/103.out
@@ -5,10 +5,10 @@ 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
+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 entry size must be a power of
two between 512 and the cluster size (65536)
can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of
two between 512 and the cluster size (65536)
can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of
two between 512 and the cluster size (65536)
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
--
2.13.6
- [Qemu-block] [PULL 00/13] Block layer patches, Kevin Wolf, 2018/07/30
- [Qemu-block] [PULL 02/13] qcow2: A grammar fix in conflicting cache sizing error message,
Kevin Wolf <=
- [Qemu-block] [PULL 01/13] qcow: fix a reference leak, Kevin Wolf, 2018/07/30
- [Qemu-block] [PULL 04/13] docs: Describe using images in writing iotests, Kevin Wolf, 2018/07/30
- [Qemu-block] [PULL 03/13] file-posix: Handle EINTR in preallocation=full write, Kevin Wolf, 2018/07/30
- [Qemu-block] [PULL 05/13] iotests: Don't lock /dev/null in 226, Kevin Wolf, 2018/07/30
- [Qemu-block] [PULL 06/13] Revert "qemu-img: Document copy offloading implications with -S and -c", Kevin Wolf, 2018/07/30
- [Qemu-block] [PULL 07/13] qemu-img: Add -C option for convert with copy offloading, Kevin Wolf, 2018/07/30
- [Qemu-block] [PULL 10/13] file-posix: Fix write_zeroes with unmap on block devices, Kevin Wolf, 2018/07/30
- [Qemu-block] [PULL 08/13] iotests: Add test for 'qemu-img convert -C' compatibility, Kevin Wolf, 2018/07/30
- [Qemu-block] [PULL 11/13] block/qapi: Add 'qdev' field to query-blockstats result, Kevin Wolf, 2018/07/30
- [Qemu-block] [PULL 12/13] block/qapi: Include anonymous BBs in query-blockstats, Kevin Wolf, 2018/07/30