[Qemu-devel] [PATCH 3/3] qemu-iotests: Check common namespace for id and node-name

[Kevin Wolf]

A name that is taken by an ID can't be taken by a node-name at the same
time. Check that conflicts are correctly detected.

Signed-off-by: Kevin Wolf <address@hidden>
---
 tests/qemu-iotests/087     | 52 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/087.out |  5 +++++
 2 files changed, 57 insertions(+)

diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087
index 37d82fc..82c56b1 100755
--- a/tests/qemu-iotests/087
+++ b/tests/qemu-iotests/087
@@ -83,6 +83,7 @@ run_qemu <<EOF
       "options": {
         "driver": "$IMGFMT",
         "id": "disk",
+        "node-name": "test-node",
         "file": {
             "driver": "file",
             "filename": "$TEST_IMG"
@@ -102,6 +103,57 @@ run_qemu <<EOF
       }
     }
   }
+{ "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",
+            "filename": "$TEST_IMG"
+        }
+      }
+    }
+  }
+{ "execute": "blockdev-add",
+  "arguments": {
+      "options": {
+        "driver": "$IMGFMT",
+        "id": "disk2",
+        "node-name": "test-node",
+        "file": {
+            "driver": "file",
+            "filename": "$TEST_IMG"
+        }
+      }
+    }
+  }
+{ "execute": "blockdev-add",
+  "arguments": {
+      "options": {
+        "driver": "$IMGFMT",
+        "id": "disk3",
+        "node-name": "disk3",
+        "file": {
+            "driver": "file",
+            "filename": "$TEST_IMG"
+        }
+      }
+    }
+  }
 { "execute": "quit" }
 EOF
 
diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out
index 479bf86..7fbee3f 100644
--- a/tests/qemu-iotests/087.out
+++ b/tests/qemu-iotests/087.out
@@ -20,6 +20,11 @@ QMP_VERSION
 {"return": {}}
 {"return": {}}
 {"error": {"class": "GenericError", "desc": "Device with id 'disk' already 
exists"}}
+{"error": {"class": "GenericError", "desc": "Device with node-name 'test-node' 
already exists"}}
+main-loop: WARNING: I/O thread spun for 1000 iterations
+{"error": {"class": "GenericError", "desc": "could not open disk image disk2: 
node-name=disk is conflicting with a device id"}}
+{"error": {"class": "GenericError", "desc": "could not open disk image disk2: 
Duplicate node name"}}
+{"error": {"class": "GenericError", "desc": "could not open disk image disk3: 
node-name=disk3 is conflicting with a device id"}}
 {"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": 
"SHUTDOWN"}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": 
"DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
-- 
1.8.3.1