All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/2] iotests: Minor fixes
@ 2019-12-18 10:48 Max Reitz
  2019-12-18 10:48 ` [PATCH 1/2] iotests/273: Filter format-specific information Max Reitz
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Max Reitz @ 2019-12-18 10:48 UTC (permalink / raw)
  To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz

Hi,

These are just two minor fixes for things I noticed recently.


Max


Max Reitz (2):
  iotests/273: Filter format-specific information
  iotests: Fix IMGOPTSSYNTAX for nbd

 tests/qemu-iotests/273       |  3 ++-
 tests/qemu-iotests/273.out   | 27 ---------------------------
 tests/qemu-iotests/common.rc |  3 ++-
 3 files changed, 4 insertions(+), 29 deletions(-)

-- 
2.23.0



^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH 1/2] iotests/273: Filter format-specific information
  2019-12-18 10:48 [PATCH 0/2] iotests: Minor fixes Max Reitz
@ 2019-12-18 10:48 ` Max Reitz
  2019-12-18 10:48 ` [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd Max Reitz
  2019-12-19 12:24 ` [PATCH 0/2] iotests: Minor fixes Kevin Wolf
  2 siblings, 0 replies; 6+ messages in thread
From: Max Reitz @ 2019-12-18 10:48 UTC (permalink / raw)
  To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz

Doing this allows running this test with e.g. -o compat=0.10 or
-o compat=refcount_bits=1.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/273     |  3 ++-
 tests/qemu-iotests/273.out | 27 ---------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273
index c355e9af47..00ff79bcf8 100755
--- a/tests/qemu-iotests/273
+++ b/tests/qemu-iotests/273
@@ -51,7 +51,8 @@ do_run_qemu()
 run_qemu()
 {
     do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp |
-        _filter_generated_node_ids | _filter_imgfmt | _filter_actual_image_size
+        _filter_generated_node_ids | _filter_imgfmt |
+        _filter_actual_image_size | _filter_img_info
 }
 
 TEST_IMG="$TEST_IMG.base" _make_test_img 64M
diff --git a/tests/qemu-iotests/273.out b/tests/qemu-iotests/273.out
index c410fee5c4..684b8d6f77 100644
--- a/tests/qemu-iotests/273.out
+++ b/tests/qemu-iotests/273.out
@@ -38,15 +38,6 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
                     "cluster-size": 65536,
                     "format": "IMGFMT",
                     "actual-size": SIZE,
-                    "format-specific": {
-                        "type": "IMGFMT",
-                        "data": {
-                            "compat": "1.1",
-                            "lazy-refcounts": false,
-                            "refcount-bits": 16,
-                            "corrupt": false
-                        }
-                    },
                     "full-backing-filename": "TEST_DIR/t.IMGFMT.base",
                     "backing-filename": "TEST_DIR/t.IMGFMT.base",
                     "dirty-flag": false
@@ -57,15 +48,6 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
                 "cluster-size": 65536,
                 "format": "IMGFMT",
                 "actual-size": SIZE,
-                "format-specific": {
-                    "type": "IMGFMT",
-                    "data": {
-                        "compat": "1.1",
-                        "lazy-refcounts": false,
-                        "refcount-bits": 16,
-                        "corrupt": false
-                    }
-                },
                 "full-backing-filename": "TEST_DIR/t.IMGFMT.mid",
                 "backing-filename": "TEST_DIR/t.IMGFMT.mid",
                 "dirty-flag": false
@@ -136,15 +118,6 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
                 "cluster-size": 65536,
                 "format": "IMGFMT",
                 "actual-size": SIZE,
-                "format-specific": {
-                    "type": "IMGFMT",
-                    "data": {
-                        "compat": "1.1",
-                        "lazy-refcounts": false,
-                        "refcount-bits": 16,
-                        "corrupt": false
-                    }
-                },
                 "full-backing-filename": "TEST_DIR/t.IMGFMT.base",
                 "backing-filename": "TEST_DIR/t.IMGFMT.base",
                 "dirty-flag": false
-- 
2.23.0



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd
  2019-12-18 10:48 [PATCH 0/2] iotests: Minor fixes Max Reitz
  2019-12-18 10:48 ` [PATCH 1/2] iotests/273: Filter format-specific information Max Reitz
@ 2019-12-18 10:48 ` Max Reitz
  2019-12-18 14:11   ` Philippe Mathieu-Daudé
  2019-12-20 21:34   ` Eric Blake
  2019-12-19 12:24 ` [PATCH 0/2] iotests: Minor fixes Kevin Wolf
  2 siblings, 2 replies; 6+ messages in thread
From: Max Reitz @ 2019-12-18 10:48 UTC (permalink / raw)
  To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz

There is no $SOCKDIR, only $SOCK_DIR.

Fixes: f3923a72f199b2c63747a7032db74730546f55c6
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.rc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index ffb47c3d5c..d088392ab6 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -217,7 +217,8 @@ if [ "$IMGOPTSSYNTAX" = "true" ]; then
         TEST_IMG="$DRIVER,file.filename=$TEST_DIR/t.$IMGFMT"
     elif [ "$IMGPROTO" = "nbd" ]; then
         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
-        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix,file.path=$SOCKDIR/nbd"
+        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix"
+        TEST_IMG="$TEST_IMG,file.path=$SOCK_DIR/nbd"
     elif [ "$IMGPROTO" = "ssh" ]; then
         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
         TEST_IMG="$DRIVER,file.driver=ssh,file.host=127.0.0.1,file.path=$TEST_IMG_FILE"
-- 
2.23.0



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd
  2019-12-18 10:48 ` [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd Max Reitz
@ 2019-12-18 14:11   ` Philippe Mathieu-Daudé
  2019-12-20 21:34   ` Eric Blake
  1 sibling, 0 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-12-18 14:11 UTC (permalink / raw)
  To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel

On 12/18/19 11:48 AM, Max Reitz wrote:
> There is no $SOCKDIR, only $SOCK_DIR.
> 
> Fixes: f3923a72f199b2c63747a7032db74730546f55c6
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>   tests/qemu-iotests/common.rc | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index ffb47c3d5c..d088392ab6 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -217,7 +217,8 @@ if [ "$IMGOPTSSYNTAX" = "true" ]; then
>           TEST_IMG="$DRIVER,file.filename=$TEST_DIR/t.$IMGFMT"
>       elif [ "$IMGPROTO" = "nbd" ]; then
>           TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
> -        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix,file.path=$SOCKDIR/nbd"
> +        TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix"
> +        TEST_IMG="$TEST_IMG,file.path=$SOCK_DIR/nbd"
>       elif [ "$IMGPROTO" = "ssh" ]; then
>           TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
>           TEST_IMG="$DRIVER,file.driver=ssh,file.host=127.0.0.1,file.path=$TEST_IMG_FILE"
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>



^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] iotests: Minor fixes
  2019-12-18 10:48 [PATCH 0/2] iotests: Minor fixes Max Reitz
  2019-12-18 10:48 ` [PATCH 1/2] iotests/273: Filter format-specific information Max Reitz
  2019-12-18 10:48 ` [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd Max Reitz
@ 2019-12-19 12:24 ` Kevin Wolf
  2 siblings, 0 replies; 6+ messages in thread
From: Kevin Wolf @ 2019-12-19 12:24 UTC (permalink / raw)
  To: Max Reitz; +Cc: qemu-devel, qemu-block

Am 18.12.2019 um 11:48 hat Max Reitz geschrieben:
> Hi,
> 
> These are just two minor fixes for things I noticed recently.

Thanks, applied to the block branch.

Kevin



^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd
  2019-12-18 10:48 ` [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd Max Reitz
  2019-12-18 14:11   ` Philippe Mathieu-Daudé
@ 2019-12-20 21:34   ` Eric Blake
  1 sibling, 0 replies; 6+ messages in thread
From: Eric Blake @ 2019-12-20 21:34 UTC (permalink / raw)
  To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel

On 12/18/19 4:48 AM, Max Reitz wrote:
> There is no $SOCKDIR, only $SOCK_DIR.
> 
> Fixes: f3923a72f199b2c63747a7032db74730546f55c6
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>   tests/qemu-iotests/common.rc | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Whoops.  Thanks for the fix.

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org



^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-12-20 21:35 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-18 10:48 [PATCH 0/2] iotests: Minor fixes Max Reitz
2019-12-18 10:48 ` [PATCH 1/2] iotests/273: Filter format-specific information Max Reitz
2019-12-18 10:48 ` [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd Max Reitz
2019-12-18 14:11   ` Philippe Mathieu-Daudé
2019-12-20 21:34   ` Eric Blake
2019-12-19 12:24 ` [PATCH 0/2] iotests: Minor fixes Kevin Wolf

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.