Commit 5feb08ed authored by Kevin Wolf's avatar Kevin Wolf
Browse files

qemu-iotests/087: Avoid blockdev-add with id 



We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

The test cases that test conflicts between the 'id' option to
blockdev-add and existing block devices or the 'node-name' of the same
command can be removed because it won't be possible to specify this at
the end of the series.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 26d5fa10

tests/qemu-iotests/087

+5 −57
Original line number Diff line number Diff line
@@ -77,50 +77,12 @@ echo 
echo === Duplicate ID ===

echo



run_qemu <<EOF

run_qemu -drive driver=$IMGFMT,id=disk,node-name=test-node,file="$TEST_IMG" <<EOF

{ "execute": "qmp_capabilities" }

{ "execute": "blockdev-add",

  "arguments": {

      "options": {

        "driver": "$IMGFMT",

        "id": "disk",

        "node-name": "test-node",

        "file": {

            "driver": "file",

            "filename": "$TEST_IMG"

        }

      }

    }

  }

{ "execute": "blockdev-add",

  "arguments": {

      "options": {

        "driver": "$IMGFMT",

        "id": "disk",

        "file": {

            "driver": "file",

            "filename": "$TEST_IMG"

        }

      }

    }

  }

{ "execute": "blockdev-add",

  "arguments": {

      "options": {

        "driver": "$IMGFMT",

        "id": "test-node",

        "file": {

            "driver": "file",

            "filename": "$TEST_IMG"

        }

      }

    }

  }

{ "execute": "blockdev-add",

  "arguments": {

      "options": {

        "driver": "$IMGFMT",

        "id": "disk2",

        "node-name": "disk",

        "file": {

            "driver": "file",
@@ -133,7 +95,6 @@ run_qemu <<EOF 
  "arguments": {

      "options": {

        "driver": "$IMGFMT",

        "id": "disk2",

        "node-name": "test-node",

        "file": {

            "driver": "file",
@@ -142,19 +103,6 @@ run_qemu <<EOF 
      }

    }

  }

{ "execute": "blockdev-add",

  "arguments": {

      "options": {

        "driver": "$IMGFMT",

        "id": "disk3",

        "node-name": "disk3",

        "file": {

            "driver": "file",

            "filename": "$TEST_IMG"

        }

      }

    }

  }

{ "execute": "quit" }

EOF
@@ -168,7 +116,7 @@ run_qemu <<EOF 
  "arguments": {

      "options": {

        "driver": "$IMGFMT",

        "id": "disk",

        "node-name": "disk",

        "aio": "native",

        "file": {

            "driver": "file",
@@ -191,7 +139,7 @@ run_qemu -S <<EOF 
  "arguments": {

      "options": {

        "driver": "$IMGFMT",

        "id": "disk",

        "node-name": "disk",

        "file": {

            "driver": "file",

            "filename": "$TEST_IMG"
@@ -208,7 +156,7 @@ run_qemu <<EOF 
  "arguments": {

      "options": {

        "driver": "$IMGFMT",

        "id": "disk",

        "node-name": "disk",

        "file": {

            "driver": "file",

            "filename": "$TEST_IMG"
@@ -229,7 +177,7 @@ run_qemu -S <<EOF 
{ "execute": "blockdev-add",

  "arguments": {

      "options": {

        "id": "disk"

        "node-name": "disk"

      }

    }

  }

tests/qemu-iotests/087.out

+1 −5
Original line number Diff line number Diff line
@@ -13,15 +13,11 @@ QMP_VERSION 


=== Duplicate ID ===



Testing:

Testing: -drive driver=IMGFMT,id=disk,node-name=test-node,file=TEST_DIR/t.IMGFMT

QMP_VERSION

{"return": {}}

{"return": {}}

{"error": {"class": "GenericError", "desc": "Device with id 'disk' already exists"}}

{"error": {"class": "GenericError", "desc": "Device name 'test-node' conflicts with an existing node name"}}

{"error": {"class": "GenericError", "desc": "node-name=disk is conflicting with a device id"}}

{"error": {"class": "GenericError", "desc": "Duplicate node name"}}

{"error": {"class": "GenericError", "desc": "Device name 'disk3' conflicts with an existing node name"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN"}