From 58bf58e416a89ea5166865664887cfe4562b1fc0 Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

Date: Wed, 26 Jun 2019 16:24:01 +0100

Subject: [PATCH 2/2] iotests: Make 182 do without device_add

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Max Reitz <mreitz@redhat.com>

Message-id: <20190626162401.11112-2-mreitz@redhat.com>

Patchwork-id: 88951

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 1/1] iotests: Make 182 do without device_add

Bugzilla: 1707598

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

RH-Acked-by: John Snow <jsnow@redhat.com>

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

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

182 fails if qemu has no support for hotplugging of a virtio-blk device.

Using an NBD server instead works just as well for the test, even on

qemus without hotplugging support.

Fixes: 6d0a4a0fb5c8f10c8eb68b52cfda0082b00ae963

Reported-by: Danilo C. L. de Paula <ddepaula@redhat.com>

Signed-off-by: Max Reitz <mreitz@redhat.com>

Message-Id: <20190417153005.30096-1-mreitz@redhat.com>

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

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

Acked-by: Alberto Garcia <berto@igalia.com>

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

(cherry picked from commit 8fabb8be37775ebb32b0d78bc7be815a29b8a107)

Signed-off-by: Max Reitz <mreitz@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 tests/qemu-iotests/182     | 22 +++++++++++++++++-----

 tests/qemu-iotests/182.out |  1 +

 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182

index 3b7689c..c1520ed 100755

--- a/tests/qemu-iotests/182

+++ b/tests/qemu-iotests/182

@@ -32,6 +32,7 @@ _cleanup()

 {

     _cleanup_test_img

     rm -f "$TEST_IMG.overlay"

+    rm -f "$TEST_DIR/nbd.socket"

 }

 trap "_cleanup; exit \$status" 0 1 2 3 15

@@ -127,15 +128,26 @@ success_or_failure=y _send_qemu_cmd $QEMU_HANDLE \

     'return' \

     'error'

-# Now we attach the image to a virtio-blk device.  This device does

-# require some permissions (at least WRITE and READ_CONSISTENT), so if

+# Start an NBD server to which we can attach node1

+success_or_failure=y _send_qemu_cmd $QEMU_HANDLE \

+    "{'execute': 'nbd-server-start',

+      'arguments': {

+          'addr': {

+              'type': 'unix',

+              'data': {

+                  'path': '$TEST_DIR/nbd.socket'

+              } } } }" \

+    'return' \

+    'error'

+

+# Now we attach the image to the NBD server.  This server does require

+# some permissions (at least WRITE and READ_CONSISTENT), so if

 # reopening node0 unshared any (which it should not have), this will

 # fail (but it should not).

 success_or_failure=y _send_qemu_cmd $QEMU_HANDLE \

-    "{'execute': 'device_add',

+    "{'execute': 'nbd-server-add',

       'arguments': {

-          'driver': 'virtio-blk',

-          'drive': 'node1'

+          'device': 'node1'

       } }" \

     'return' \

     'error'

diff --git a/tests/qemu-iotests/182.out b/tests/qemu-iotests/182.out

index af501ca..33d41ee 100644

--- a/tests/qemu-iotests/182.out

+++ b/tests/qemu-iotests/182.out

@@ -14,4 +14,5 @@ Formatting 'TEST_DIR/t.qcow2.overlay', fmt=qcow2 size=197120 backing_file=TEST_D

 {"return": {}}

 {"return": {}}

 {"return": {}}

+{"return": {}}

 *** done

-- 

1.8.3.1