summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDaniel P. Berrangé2021-02-19 19:53:17 +0100
committerDaniel P. Berrangé2021-03-18 10:22:55 +0100
commitad1324e044240ae9fcf67e4c215481b7a35591b9 (patch)
tree98e4ae25852e5a4945ba3e4e328b3a627af87c2d /tests
parenthw/scsi: remove 'scsi-disk' device (diff)
downloadqemu-ad1324e044240ae9fcf67e4c215481b7a35591b9.tar.gz
qemu-ad1324e044240ae9fcf67e4c215481b7a35591b9.tar.xz
qemu-ad1324e044240ae9fcf67e4c215481b7a35591b9.zip
block: remove 'encryption_key_missing' flag from QAPI
This has been hardcoded to "false" since 2.10.0, since secrets required to unlock block devices are now always provided up front instead of using interactive prompts. Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/qemu-iotests/184.out6
-rw-r--r--tests/qemu-iotests/191.out48
-rw-r--r--tests/qemu-iotests/273.out15
3 files changed, 23 insertions, 46 deletions
diff --git a/tests/qemu-iotests/184.out b/tests/qemu-iotests/184.out
index 87c73070e3..77e5489d65 100644
--- a/tests/qemu-iotests/184.out
+++ b/tests/qemu-iotests/184.out
@@ -54,8 +54,7 @@ Testing:
"direct": false,
"writeback": true
},
- "file": "json:{\"throttle-group\": \"group0\", \"driver\": \"throttle\", \"file\": {\"driver\": \"null-co\"}}",
- "encryption_key_missing": false
+ "file": "json:{\"throttle-group\": \"group0\", \"driver\": \"throttle\", \"file\": {\"driver\": \"null-co\"}}"
},
{
"iops_rd": 0,
@@ -82,8 +81,7 @@ Testing:
"direct": false,
"writeback": true
},
- "file": "null-co://",
- "encryption_key_missing": false
+ "file": "null-co://"
}
]
}
diff --git a/tests/qemu-iotests/191.out b/tests/qemu-iotests/191.out
index 022021efab..ea88777374 100644
--- a/tests/qemu-iotests/191.out
+++ b/tests/qemu-iotests/191.out
@@ -150,8 +150,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.ovl2",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.ovl2"
},
{
"iops_rd": 0,
@@ -179,8 +178,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.ovl2",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.ovl2"
},
{
"iops_rd": 0,
@@ -221,8 +219,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT"
},
{
"iops_rd": 0,
@@ -250,8 +247,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT"
},
{
"iops_rd": 0,
@@ -292,8 +288,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.mid",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.mid"
},
{
"iops_rd": 0,
@@ -321,8 +316,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.mid",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.mid"
},
{
"iops_rd": 0,
@@ -351,8 +345,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.base",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.base"
},
{
"iops_rd": 0,
@@ -380,8 +373,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.base",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.base"
}
]
}
@@ -565,8 +557,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.ovl2",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.ovl2"
},
{
"iops_rd": 0,
@@ -594,8 +585,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.ovl2",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.ovl2"
},
{
"iops_rd": 0,
@@ -647,8 +637,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.ovl3",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.ovl3"
},
{
"iops_rd": 0,
@@ -676,8 +665,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.ovl3",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.ovl3"
},
{
"iops_rd": 0,
@@ -706,8 +694,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.base",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.base"
},
{
"iops_rd": 0,
@@ -735,8 +722,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.base",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.base"
},
{
"iops_rd": 0,
@@ -777,8 +763,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT"
},
{
"iops_rd": 0,
@@ -806,8 +791,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT"
}
]
}
diff --git a/tests/qemu-iotests/273.out b/tests/qemu-iotests/273.out
index 8247cbaea1..4e840b6730 100644
--- a/tests/qemu-iotests/273.out
+++ b/tests/qemu-iotests/273.out
@@ -69,8 +69,7 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT"
},
{
"iops_rd": 0,
@@ -98,8 +97,7 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT"
},
{
"iops_rd": 0,
@@ -139,8 +137,7 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.mid",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.mid"
},
{
"iops_rd": 0,
@@ -168,8 +165,7 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.mid",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.mid"
},
{
"iops_rd": 0,
@@ -197,8 +193,7 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.base",
- "encryption_key_missing": false
+ "file": "TEST_DIR/t.IMGFMT.base"
}
]
}