From cbde7be900d2a2279cbc4becb91d1ddd6a014def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 19 Feb 2021 18:40:12 +0000 Subject: migrate: remove QMP/HMP commands for speed, downtime and cache size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The generic 'migrate_set_parameters' command handle all types of param. Only the QMP commands were documented in the deprecations page, but the rationale for deprecating applies equally to HMP, and the replacements exist. Furthermore the HMP commands are just shims to the QMP commands, so removing the latter breaks the former unless they get re-implemented. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrangé --- tests/migration/guestperf/engine.py | 16 +++++++------ tests/qemu-iotests/181 | 2 +- tests/qtest/migration-test.c | 48 ------------------------------------- tests/qtest/test-hmp.c | 6 ++--- tests/qtest/vhost-user-test.c | 8 +++---- 5 files changed, 17 insertions(+), 63 deletions(-) (limited to 'tests') diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py index 83bfc3b6bb..5161e4ff81 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -149,11 +149,11 @@ class Engine(object): "state": True } ]) - resp = src.command("migrate_set_speed", - value=scenario._bandwidth * 1024 * 1024) + resp = src.command("migrate-set-parameters", + max_bandwidth=scenario._bandwidth * 1024 * 1024) - resp = src.command("migrate_set_downtime", - value=scenario._downtime / 1024.0) + resp = src.command("migrate-set-parameters", + downtime_limit=scenario._downtime / 1024.0) if scenario._compression_mt: resp = src.command("migrate-set-capabilities", @@ -182,9 +182,11 @@ class Engine(object): { "capability": "xbzrle", "state": True } ]) - resp = src.command("migrate-set-cache-size", - value=(hardware._mem * 1024 * 1024 * 1024 / 100 * - scenario._compression_xbzrle_cache)) + resp = src.command("migrate-set-parameters", + xbzrle_cache_size=( + hardware._mem * + 1024 * 1024 * 1024 / 100 * + scenario._compression_xbzrle_cache)) resp = src.command("migrate", uri=connect_uri) diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index 820c53ef35..cb96d09ae5 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -109,7 +109,7 @@ if [ ${QEMU_STATUS[$dest]} -lt 0 ]; then _notrun 'Postcopy is not supported' fi -_send_qemu_cmd $src 'migrate_set_speed 4k' "(qemu)" +_send_qemu_cmd $src 'migrate_set_parameter max_bandwidth 4k' "(qemu)" _send_qemu_cmd $src 'migrate_set_capability postcopy-ram on' "(qemu)" _send_qemu_cmd $src "migrate -d unix:${MIG_SOCKET}" "(qemu)" _send_qemu_cmd $src 'migrate_start_postcopy' "(qemu)" diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index f2142fbd3c..3a711bb492 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -658,53 +658,6 @@ static void test_migrate_end(QTestState *from, QTestState *to, bool test_dest) cleanup("dest_serial"); } -static void deprecated_set_downtime(QTestState *who, const double value) -{ - QDict *rsp; - - rsp = qtest_qmp(who, - "{ 'execute': 'migrate_set_downtime'," - " 'arguments': { 'value': %f } }", value); - g_assert(qdict_haskey(rsp, "return")); - qobject_unref(rsp); - migrate_check_parameter_int(who, "downtime-limit", value * 1000); -} - -static void deprecated_set_speed(QTestState *who, long long value) -{ - QDict *rsp; - - rsp = qtest_qmp(who, "{ 'execute': 'migrate_set_speed'," - "'arguments': { 'value': %lld } }", value); - g_assert(qdict_haskey(rsp, "return")); - qobject_unref(rsp); - migrate_check_parameter_int(who, "max-bandwidth", value); -} - -static void deprecated_set_cache_size(QTestState *who, long long value) -{ - QDict *rsp; - - rsp = qtest_qmp(who, "{ 'execute': 'migrate-set-cache-size'," - "'arguments': { 'value': %lld } }", value); - g_assert(qdict_haskey(rsp, "return")); - qobject_unref(rsp); - migrate_check_parameter_int(who, "xbzrle-cache-size", value); -} - -static void test_deprecated(void) -{ - QTestState *from; - - from = qtest_init("-machine none"); - - deprecated_set_downtime(from, 0.12345); - deprecated_set_speed(from, 12345); - deprecated_set_cache_size(from, 4096); - - qtest_quit(from); -} - static int migrate_postcopy_prepare(QTestState **from_ptr, QTestState **to_ptr, MigrateStart *args) @@ -1486,7 +1439,6 @@ int main(int argc, char **argv) qtest_add_func("/migration/postcopy/unix", test_postcopy); qtest_add_func("/migration/postcopy/recovery", test_postcopy_recovery); - qtest_add_func("/migration/deprecated", test_deprecated); qtest_add_func("/migration/bad_dest", test_baddest); qtest_add_func("/migration/precopy/unix", test_precopy_unix); qtest_add_func("/migration/precopy/tcp", test_precopy_tcp); diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c index 94a8023173..413eb95d2a 100644 --- a/tests/qtest/test-hmp.c +++ b/tests/qtest/test-hmp.c @@ -45,9 +45,9 @@ static const char *hmp_cmds[] = { "log all", "log none", "memsave 0 4096 \"/dev/null\"", - "migrate_set_cache_size 1", - "migrate_set_downtime 1", - "migrate_set_speed 1", + "migrate_set_parameter xbzrle_cache_size 1", + "migrate_set_parameter downtime_limit 1", + "migrate_set_parameter max_bandwidth 1", "netdev_add user,id=net1", "set_link net1 off", "set_link net1 on", diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index 1a5f5313ff..3d6337fb5c 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -756,8 +756,8 @@ static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc) /* slow down migration to have time to fiddle with log */ /* TODO: qtest could learn to break on some places */ - rsp = qmp("{ 'execute': 'migrate_set_speed'," - "'arguments': { 'value': 10 } }"); + rsp = qmp("{ 'execute': 'migrate-set-parameters'," + "'arguments': { 'max-bandwidth': 10 } }"); g_assert(qdict_haskey(rsp, "return")); qobject_unref(rsp); @@ -776,8 +776,8 @@ static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc) munmap(log, size); /* speed things up */ - rsp = qmp("{ 'execute': 'migrate_set_speed'," - "'arguments': { 'value': 0 } }"); + rsp = qmp("{ 'execute': 'migrate-set-parameters'," + "'arguments': { 'max-bandwidth': 0 } }"); g_assert(qdict_haskey(rsp, "return")); qobject_unref(rsp); -- cgit v1.2.3 From 8af54b9172ff3b9bbdbb3191ed84994d275a0d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 22 Feb 2021 12:54:55 +0000 Subject: machine: remove 'query-cpus' QMP command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The newer 'query-cpus-fast' command avoids side effects on the guest execution. Note that some of the field names are different in the 'query-cpus-fast' command. Reviewed-by: Wainer dos Santos Moschetta Tested-by: Wainer dos Santos Moschetta Signed-off-by: Daniel P. Berrangé --- tests/acceptance/pc_cpu_hotplug_props.py | 2 +- tests/acceptance/x86_cpu_model_versions.py | 2 +- tests/migration/guestperf/engine.py | 2 +- tests/qtest/numa-test.c | 6 +++--- tests/qtest/qmp-test.c | 6 +++--- tests/qtest/test-x86-cpuid-compat.c | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/acceptance/pc_cpu_hotplug_props.py b/tests/acceptance/pc_cpu_hotplug_props.py index e49bf33fc5..f48f68fc6b 100644 --- a/tests/acceptance/pc_cpu_hotplug_props.py +++ b/tests/acceptance/pc_cpu_hotplug_props.py @@ -32,4 +32,4 @@ class OmittedCPUProps(Test): self.vm.add_args('-cpu', 'qemu64') self.vm.add_args('-device', 'qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0') self.vm.launch() - self.assertEquals(len(self.vm.command('query-cpus')), 2) + self.assertEquals(len(self.vm.command('query-cpus-fast')), 2) diff --git a/tests/acceptance/x86_cpu_model_versions.py b/tests/acceptance/x86_cpu_model_versions.py index 2b7461bb41..77ed8597a4 100644 --- a/tests/acceptance/x86_cpu_model_versions.py +++ b/tests/acceptance/x86_cpu_model_versions.py @@ -246,7 +246,7 @@ class CascadelakeArchCapabilities(avocado_qemu.Test): :avocado: tags=arch:x86_64 """ def get_cpu_prop(self, prop): - cpu_path = self.vm.command('query-cpus')[0].get('qom_path') + cpu_path = self.vm.command('query-cpus-fast')[0].get('qom-path') return self.vm.command('qom-get', path=cpu_path, property=prop) def test_4_1(self): diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py index 5161e4ff81..5c965140f8 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -110,7 +110,7 @@ class Engine(object): src_vcpu_time = [] src_pid = src.get_pid() - vcpus = src.command("query-cpus") + vcpus = src.command("query-cpus-fast") src_threads = [] for vcpu in vcpus: src_threads.append(vcpu["thread_id"]) diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c index b25ebf97d8..dc0ec571ca 100644 --- a/tests/qtest/numa-test.c +++ b/tests/qtest/numa-test.c @@ -72,7 +72,7 @@ static void test_mon_partial(const void *data) static QList *get_cpus(QTestState *qts, QDict **resp) { - *resp = qtest_qmp(qts, "{ 'execute': 'query-cpus' }"); + *resp = qtest_qmp(qts, "{ 'execute': 'query-cpus-fast' }"); g_assert(*resp); g_assert(qdict_haskey(*resp, "return")); return qdict_get_qlist(*resp, "return"); @@ -97,10 +97,10 @@ static void test_query_cpus(const void *data) int64_t cpu_idx, node; cpu = qobject_to(QDict, e); - g_assert(qdict_haskey(cpu, "CPU")); + g_assert(qdict_haskey(cpu, "cpu-index")); g_assert(qdict_haskey(cpu, "props")); - cpu_idx = qdict_get_int(cpu, "CPU"); + cpu_idx = qdict_get_int(cpu, "cpu-index"); props = qdict_get_qdict(cpu, "props"); g_assert(qdict_haskey(props, "node-id")); node = qdict_get_int(props, "node-id"); diff --git a/tests/qtest/qmp-test.c b/tests/qtest/qmp-test.c index 11614bf63f..cd27fae3de 100644 --- a/tests/qtest/qmp-test.c +++ b/tests/qtest/qmp-test.c @@ -252,7 +252,7 @@ static void test_qmp_oob(void) * Try any command that does not support OOB but with OOB flag. We * should get failure. */ - resp = qtest_qmp(qts, "{ 'exec-oob': 'query-cpus' }"); + resp = qtest_qmp(qts, "{ 'exec-oob': 'query-cpus-fast' }"); g_assert(qdict_haskey(resp, "error")); qobject_unref(resp); @@ -289,7 +289,7 @@ static void test_qmp_preconfig(void) g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'query-commands' }"))); /* forbidden commands, expected error */ - g_assert(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'query-cpus' }"))); + g_assert(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'query-cpus-fast' }"))); /* check that query-status returns preconfig state */ rsp = qtest_qmp(qs, "{ 'execute': 'query-status' }"); @@ -313,7 +313,7 @@ static void test_qmp_preconfig(void) g_assert(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'x-exit-preconfig' }"))); /* enabled commands, no error expected */ - g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'query-cpus' }"))); + g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'query-cpus-fast' }"))); qtest_quit(qs); } diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c index 6470f0a85d..f28848e06e 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -13,12 +13,12 @@ static char *get_cpu0_qom_path(void) QDict *cpu0; char *path; - resp = qmp("{'execute': 'query-cpus', 'arguments': {}}"); + resp = qmp("{'execute': 'query-cpus-fast', 'arguments': {}}"); g_assert(qdict_haskey(resp, "return")); ret = qdict_get_qlist(resp, "return"); cpu0 = qobject_to(QDict, qlist_peek(ret)); - path = g_strdup(qdict_get_str(cpu0, "qom_path")); + path = g_strdup(qdict_get_str(cpu0, "qom-path")); qobject_unref(resp); return path; } -- cgit v1.2.3 From b50101833987b47e0740f1621de48637c468c3d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 22 Feb 2021 13:40:56 +0000 Subject: hw/ide: remove 'ide-drive' device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'ide-hd' and 'ide-cd' devices provide suitable alternatives. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrangé --- tests/qemu-iotests/051 | 2 -- tests/qemu-iotests/051.pc.out | 10 ---------- 2 files changed, 12 deletions(-) (limited to 'tests') diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 7cbd1415ce..8b334fe41d 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -185,7 +185,6 @@ case "$QEMU_DEFAULT_MACHINE" in pc) run_qemu -drive if=none,id=disk -device ide-cd,drive=disk run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk - run_qemu -drive if=none,id=disk -device ide-drive,drive=disk run_qemu -drive if=none,id=disk -device ide-hd,drive=disk run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk @@ -238,7 +237,6 @@ case "$QEMU_DEFAULT_MACHINE" in pc) run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-cd,drive=disk run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk - run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-drive,drive=disk run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-hd,drive=disk run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out index f570610f64..29c0d698b0 100644 --- a/tests/qemu-iotests/051.pc.out +++ b/tests/qemu-iotests/051.pc.out @@ -156,11 +156,6 @@ Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit -Testing: -drive if=none,id=disk -device ide-drive,drive=disk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device ide-drive,drive=disk: warning: 'ide-drive' is deprecated, please use 'ide-hd' or 'ide-cd' instead -QEMU_PROG: -device ide-drive,drive=disk: Device needs media, but drive is empty - Testing: -drive if=none,id=disk -device ide-hd,drive=disk QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device ide-hd,drive=disk: Device needs media, but drive is empty @@ -228,11 +223,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit -Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-drive,drive=disk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device ide-drive,drive=disk: warning: 'ide-drive' is deprecated, please use 'ide-hd' or 'ide-cd' instead -QEMU_PROG: -device ide-drive,drive=disk: Block node is read-only - Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-hd,drive=disk QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device ide-hd,drive=disk: Block node is read-only -- cgit v1.2.3 From 879be3af49132d232602e0ca783ec9b4112530fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 22 Feb 2021 13:40:56 +0000 Subject: hw/scsi: remove 'scsi-disk' device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'scsi-hd' and 'scsi-cd' devices provide suitable alternatives. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrangé --- tests/qemu-iotests/051 | 2 -- tests/qemu-iotests/051.pc.out | 10 ---------- 2 files changed, 12 deletions(-) (limited to 'tests') diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 8b334fe41d..f92161d8ef 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -186,7 +186,6 @@ case "$QEMU_DEFAULT_MACHINE" in run_qemu -drive if=none,id=disk -device ide-cd,drive=disk run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk run_qemu -drive if=none,id=disk -device ide-hd,drive=disk - run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk ;; *) @@ -238,7 +237,6 @@ case "$QEMU_DEFAULT_MACHINE" in run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-cd,drive=disk run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-hd,drive=disk - run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk ;; *) diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out index 29c0d698b0..a28e3fc124 100644 --- a/tests/qemu-iotests/051.pc.out +++ b/tests/qemu-iotests/051.pc.out @@ -160,11 +160,6 @@ Testing: -drive if=none,id=disk -device ide-hd,drive=disk QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device ide-hd,drive=disk: Device needs media, but drive is empty -Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device scsi-disk,drive=disk: warning: 'scsi-disk' is deprecated, please use 'scsi-hd' or 'scsi-cd' instead -QEMU_PROG: -device scsi-disk,drive=disk: Device needs media, but drive is empty - Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device scsi-hd,drive=disk: Device needs media, but drive is empty @@ -227,11 +222,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-hd QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device ide-hd,drive=disk: Block node is read-only -Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device scsi-disk,drive=disk: warning: 'scsi-disk' is deprecated, please use 'scsi-hd' or 'scsi-cd' instead -quit - Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit -- cgit v1.2.3 From ad1324e044240ae9fcf67e4c215481b7a35591b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 19 Feb 2021 18:53:17 +0000 Subject: block: remove 'encryption_key_missing' flag from QAPI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrangé --- tests/qemu-iotests/184.out | 6 ++---- tests/qemu-iotests/191.out | 48 ++++++++++++++++------------------------------ tests/qemu-iotests/273.out | 15 +++++---------- 3 files changed, 23 insertions(+), 46 deletions(-) (limited to 'tests') 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" } ] } -- cgit v1.2.3 From 81cbfd5088690c53541ffd0d74851c8ab055a829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 19 Feb 2021 19:19:54 +0000 Subject: block: remove dirty bitmaps 'status' field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The same information is available via the 'recording' and 'busy' fields. Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Daniel P. Berrangé --- tests/qemu-iotests/124 | 4 - tests/qemu-iotests/194.out | 4 +- tests/qemu-iotests/236.out | 42 ++--- tests/qemu-iotests/246.out | 66 +++----- tests/qemu-iotests/254.out | 9 +- tests/qemu-iotests/257.out | 378 +++++++++++++++------------------------------ 6 files changed, 167 insertions(+), 336 deletions(-) (limited to 'tests') diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124 index 90cdbd8e24..845ab5303c 100755 --- a/tests/qemu-iotests/124 +++ b/tests/qemu-iotests/124 @@ -348,7 +348,6 @@ class TestIncrementalBackup(TestIncrementalBackupBase): 'name': 'bitmap0', 'count': 458752, 'granularity': 65536, - 'status': 'active', 'persistent': False })) @@ -705,7 +704,6 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase): drive0['id'], bitmap.name, { 'count': 458752, 'granularity': 65536, - 'status': 'active', 'busy': False, 'recording': True })) @@ -736,7 +734,6 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase): drive0['id'], bitmap.name, { 'count': 458752, 'granularity': 65536, - 'status': 'frozen', 'busy': True, 'recording': True })) @@ -751,7 +748,6 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase): drive0['id'], bitmap.name, { 'count': 0, 'granularity': 65536, - 'status': 'active', 'busy': False, 'recording': True })) diff --git a/tests/qemu-iotests/194.out b/tests/qemu-iotests/194.out index a51bdb2d4f..4e6df1565a 100644 --- a/tests/qemu-iotests/194.out +++ b/tests/qemu-iotests/194.out @@ -24,6 +24,6 @@ Stopping the NBD server on destination... Wait for migration completion on target... {"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}} Check bitmaps on source: -[{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "persistent": false, "recording": true, "status": "active"}] +[{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "persistent": false, "recording": true}] Check bitmaps on target: -[{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "persistent": false, "recording": true, "status": "active"}] +[{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "persistent": false, "recording": true}] diff --git a/tests/qemu-iotests/236.out b/tests/qemu-iotests/236.out index 815cd053f0..7448ceea02 100644 --- a/tests/qemu-iotests/236.out +++ b/tests/qemu-iotests/236.out @@ -27,8 +27,7 @@ write -P0xcd 0x3ff0000 64k "granularity": 65536, "name": "bitmapB", "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -36,8 +35,7 @@ write -P0xcd 0x3ff0000 64k "granularity": 65536, "name": "bitmapA", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -93,8 +91,7 @@ write -P0xcd 0x3ff0000 64k "granularity": 65536, "name": "bitmapB", "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -102,8 +99,7 @@ write -P0xcd 0x3ff0000 64k "granularity": 65536, "name": "bitmapA", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -197,8 +193,7 @@ write -P0xea 0x3fe0000 64k "granularity": 65536, "name": "bitmapC", "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, @@ -206,8 +201,7 @@ write -P0xea 0x3fe0000 64k "granularity": 65536, "name": "bitmapB", "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, @@ -215,8 +209,7 @@ write -P0xea 0x3fe0000 64k "granularity": 65536, "name": "bitmapA", "persistent": false, - "recording": false, - "status": "disabled" + "recording": false } ] } @@ -270,8 +263,7 @@ write -P0xea 0x3fe0000 64k "granularity": 65536, "name": "bitmapC", "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, @@ -279,8 +271,7 @@ write -P0xea 0x3fe0000 64k "granularity": 65536, "name": "bitmapB", "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, @@ -288,8 +279,7 @@ write -P0xea 0x3fe0000 64k "granularity": 65536, "name": "bitmapA", "persistent": false, - "recording": false, - "status": "disabled" + "recording": false } ] } @@ -336,8 +326,7 @@ write -P0xea 0x3fe0000 64k "granularity": 65536, "name": "bitmapD", "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, @@ -345,8 +334,7 @@ write -P0xea 0x3fe0000 64k "granularity": 65536, "name": "bitmapC", "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, @@ -354,8 +342,7 @@ write -P0xea 0x3fe0000 64k "granularity": 65536, "name": "bitmapB", "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, @@ -363,8 +350,7 @@ write -P0xea 0x3fe0000 64k "granularity": 65536, "name": "bitmapA", "persistent": false, - "recording": false, - "status": "disabled" + "recording": false } ] } diff --git a/tests/qemu-iotests/246.out b/tests/qemu-iotests/246.out index 6671a11fdd..eeb98ab37c 100644 --- a/tests/qemu-iotests/246.out +++ b/tests/qemu-iotests/246.out @@ -24,8 +24,7 @@ "granularity": 65536, "name": "Transient", "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -33,8 +32,7 @@ "granularity": 131072, "name": "Large", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -42,8 +40,7 @@ "granularity": 65536, "name": "Medium", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -51,8 +48,7 @@ "granularity": 32768, "name": "Small", "persistent": true, - "recording": true, - "status": "active" + "recording": true } ] } @@ -68,8 +64,7 @@ "granularity": 32768, "name": "Small", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -77,8 +72,7 @@ "granularity": 65536, "name": "Medium", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -86,8 +80,7 @@ "granularity": 131072, "name": "Large", "persistent": true, - "recording": true, - "status": "active" + "recording": true } ] } @@ -108,8 +101,7 @@ "granularity": 65536, "name": "Newtwo", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -117,8 +109,7 @@ "granularity": 65536, "name": "New", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -126,8 +117,7 @@ "granularity": 32768, "name": "Small", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -135,8 +125,7 @@ "granularity": 65536, "name": "Medium", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -144,8 +133,7 @@ "granularity": 131072, "name": "Large", "persistent": true, - "recording": true, - "status": "active" + "recording": true } ] } @@ -163,8 +151,7 @@ "granularity": 65536, "name": "New", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -172,8 +159,7 @@ "granularity": 65536, "name": "Newtwo", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -181,8 +167,7 @@ "granularity": 32768, "name": "Small", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -190,8 +175,7 @@ "granularity": 65536, "name": "Medium", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -199,8 +183,7 @@ "granularity": 131072, "name": "Large", "persistent": true, - "recording": true, - "status": "active" + "recording": true } ] } @@ -232,8 +215,7 @@ "granularity": 65536, "name": "NewB", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -241,8 +223,7 @@ "granularity": 65536, "name": "NewC", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -250,8 +231,7 @@ "granularity": 32768, "name": "Small", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -259,8 +239,7 @@ "granularity": 65536, "name": "Medium", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -268,8 +247,7 @@ "granularity": 131072, "name": "Large", "persistent": true, - "recording": true, - "status": "active" + "recording": true } ] } diff --git a/tests/qemu-iotests/254.out b/tests/qemu-iotests/254.out index d185c0532f..fe52da9338 100644 --- a/tests/qemu-iotests/254.out +++ b/tests/qemu-iotests/254.out @@ -99,8 +99,7 @@ query-block: device = drive0, node-name = snap, dirty-bitmaps: "granularity": 65536, "name": "bitmap2", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -108,8 +107,7 @@ query-block: device = drive0, node-name = snap, dirty-bitmaps: "granularity": 65536, "name": "bitmap1", "persistent": true, - "recording": true, - "status": "active" + "recording": true }, { "busy": false, @@ -117,8 +115,7 @@ query-block: device = drive0, node-name = snap, dirty-bitmaps: "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out index a7ba512f4c..50cbd8e882 100644 --- a/tests/qemu-iotests/257.out +++ b/tests/qemu-iotests/257.out @@ -58,8 +58,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -113,16 +112,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -130,8 +127,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -156,8 +152,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -185,8 +180,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -234,8 +228,7 @@ expecting 15 dirty sectors; have 15. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -318,8 +311,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -367,8 +359,7 @@ expecting 6 dirty sectors; have 6. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -396,8 +387,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -445,8 +435,7 @@ expecting 14 dirty sectors; have 14. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -529,8 +518,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -584,16 +572,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -601,8 +587,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -627,8 +612,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -656,8 +640,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -705,8 +688,7 @@ expecting 15 dirty sectors; have 15. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -789,8 +771,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -844,16 +825,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -861,8 +840,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -887,8 +865,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -916,8 +893,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -965,8 +941,7 @@ expecting 15 dirty sectors; have 15. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1049,8 +1024,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1098,8 +1072,7 @@ expecting 6 dirty sectors; have 6. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1127,8 +1100,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1176,8 +1148,7 @@ expecting 14 dirty sectors; have 14. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1260,8 +1231,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1315,16 +1285,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -1332,8 +1300,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -1358,8 +1325,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1387,8 +1353,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1436,8 +1401,7 @@ expecting 12 dirty sectors; have 12. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1520,8 +1484,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1575,16 +1538,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -1592,8 +1553,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -1618,8 +1578,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1647,8 +1606,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1696,8 +1654,7 @@ expecting 12 dirty sectors; have 12. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1780,8 +1737,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1829,8 +1785,7 @@ expecting 6 dirty sectors; have 6. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1858,8 +1813,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1907,8 +1861,7 @@ expecting 13 dirty sectors; have 13. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -1991,8 +1944,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2046,16 +1998,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -2063,8 +2013,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -2089,8 +2038,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2118,8 +2066,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2167,8 +2114,7 @@ expecting 12 dirty sectors; have 12. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2251,8 +2197,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2306,16 +2251,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -2323,8 +2266,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -2349,8 +2291,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2378,8 +2319,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2427,8 +2367,7 @@ expecting 15 dirty sectors; have 15. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2511,8 +2450,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2560,8 +2498,7 @@ expecting 6 dirty sectors; have 6. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2589,8 +2526,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2638,8 +2574,7 @@ expecting 14 dirty sectors; have 14. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2722,8 +2657,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2777,16 +2711,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -2794,8 +2726,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -2820,8 +2751,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2849,8 +2779,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2898,8 +2827,7 @@ expecting 12 dirty sectors; have 12. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -2982,8 +2910,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3037,16 +2964,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -3054,8 +2979,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -3080,8 +3004,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3109,8 +3032,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3158,8 +3080,7 @@ expecting 12 dirty sectors; have 12. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3242,8 +3163,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3291,8 +3211,7 @@ expecting 6 dirty sectors; have 6. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3320,8 +3239,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3369,8 +3287,7 @@ expecting 1014 dirty sectors; have 1014. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3453,8 +3370,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3508,16 +3424,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -3525,8 +3439,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -3551,8 +3464,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3580,8 +3492,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3629,8 +3540,7 @@ expecting 12 dirty sectors; have 12. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3713,8 +3623,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3768,16 +3677,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -3785,8 +3692,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -3811,8 +3717,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3840,8 +3745,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3889,8 +3793,7 @@ expecting 15 dirty sectors; have 15. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -3973,8 +3876,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4022,8 +3924,7 @@ expecting 6 dirty sectors; have 6. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4051,8 +3952,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4100,8 +4000,7 @@ expecting 14 dirty sectors; have 14. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4184,8 +4083,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4239,16 +4137,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -4256,8 +4152,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -4282,8 +4177,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4311,8 +4205,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4360,8 +4253,7 @@ expecting 12 dirty sectors; have 12. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4444,8 +4336,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4499,16 +4390,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -4516,8 +4405,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -4542,8 +4430,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4571,8 +4458,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4620,8 +4506,7 @@ expecting 12 dirty sectors; have 12. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4704,8 +4589,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4753,8 +4637,7 @@ expecting 6 dirty sectors; have 6. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4782,8 +4665,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4831,8 +4713,7 @@ expecting 14 dirty sectors; have 14. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4915,8 +4796,7 @@ write -P0x69 0x3fe0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -4970,16 +4850,14 @@ write -P0x67 0x3fe0000 0x20000 "count": 0, "granularity": 65536, "persistent": false, - "recording": false, - "status": "disabled" + "recording": false }, { "busy": false, "count": 458752, "granularity": 65536, "persistent": false, - "recording": true, - "status": "active" + "recording": true }, { "busy": true, @@ -4987,8 +4865,7 @@ write -P0x67 0x3fe0000 0x20000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "frozen" + "recording": true } ] } @@ -5013,8 +4890,7 @@ expecting 7 dirty sectors; have 7. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -5042,8 +4918,7 @@ write -P0xdd 0x3fc0000 0x10000 "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } @@ -5091,8 +4966,7 @@ expecting 12 dirty sectors; have 12. OK! "granularity": 65536, "name": "bitmap0", "persistent": false, - "recording": true, - "status": "active" + "recording": true } ] } -- cgit v1.2.3 From e67d8e2928200e24ecb47c7be3ea8270077f2996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 19 Feb 2021 19:22:36 +0000 Subject: block: remove 'dirty-bitmaps' field from 'BlockInfo' struct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The same data is available in the 'BlockDeviceInfo' struct. Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Daniel P. Berrangé --- tests/qemu-iotests/194 | 4 ++-- tests/qemu-iotests/236 | 2 +- tests/qemu-iotests/246 | 3 ++- tests/qemu-iotests/254 | 2 +- tests/qemu-iotests/260 | 5 +++-- tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test | 6 ++++-- 6 files changed, 13 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 index 3889266afa..e44b8df728 100755 --- a/tests/qemu-iotests/194 +++ b/tests/qemu-iotests/194 @@ -95,7 +95,7 @@ with iotests.FilePath('source.img') as source_img_path, \ iotests.log(event, filters=[iotests.filter_qmp_event]) iotests.log('Check bitmaps on source:') - iotests.log(source_vm.qmp('query-block')['return'][0]['dirty-bitmaps']) + iotests.log(source_vm.qmp('query-block')['return'][0]['inserted']['dirty-bitmaps']) iotests.log('Check bitmaps on target:') - iotests.log(dest_vm.qmp('query-block')['return'][0]['dirty-bitmaps']) + iotests.log(dest_vm.qmp('query-block')['return'][0]['inserted']['dirty-bitmaps']) diff --git a/tests/qemu-iotests/236 b/tests/qemu-iotests/236 index f6c44517d6..20419bbb9e 100755 --- a/tests/qemu-iotests/236 +++ b/tests/qemu-iotests/236 @@ -39,7 +39,7 @@ overwrite = [("0xab", "0", "64k"), # Full overwrite def query_bitmaps(vm): res = vm.qmp("query-block") - return { "bitmaps": { device['device']: device.get('dirty-bitmaps', []) for + return { "bitmaps": { device['device']: device.get('inserted', {}).get('dirty-bitmaps', []) for device in res['return'] } } with iotests.FilePath('img') as img_path, \ diff --git a/tests/qemu-iotests/246 b/tests/qemu-iotests/246 index fa3102c546..5932a0e8a9 100755 --- a/tests/qemu-iotests/246 +++ b/tests/qemu-iotests/246 @@ -30,7 +30,8 @@ gran_large = 128 * 1024 def query_bitmaps(vm): res = vm.qmp("query-block") - return { "bitmaps": { device['device']: device.get('dirty-bitmaps', []) for + return { "bitmaps": { device['device']: device.get('inserted', {}) + .get('dirty-bitmaps', []) for device in res['return'] } } with iotests.FilePath('img') as img_path, \ diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254 index 49da948407..108bf5f894 100755 --- a/tests/qemu-iotests/254 +++ b/tests/qemu-iotests/254 @@ -73,7 +73,7 @@ vm.qmp_log('transaction', indent=2, actions=[ result = vm.qmp('query-block')['return'][0] log("query-block: device = {}, node-name = {}, dirty-bitmaps:".format( result['device'], result['inserted']['node-name'])) -log(result['dirty-bitmaps'], indent=2) +log(result['inserted']['dirty-bitmaps'], indent=2) log("\nbitmaps in backing image:") log(result['inserted']['image']['backing-image']['format-specific'] \ ['data']['bitmaps'], indent=2) diff --git a/tests/qemu-iotests/260 b/tests/qemu-iotests/260 index a35cb7b61f..2ec64a9b99 100755 --- a/tests/qemu-iotests/260 +++ b/tests/qemu-iotests/260 @@ -32,8 +32,9 @@ size = 64 * 1024 * 3 def print_bitmap(msg, vm): result = vm.qmp('query-block')['return'][0] - if 'dirty-bitmaps' in result: - bitmap = result['dirty-bitmaps'][0] + info = result.get("inserted", {}) + if 'dirty-bitmaps' in info: + bitmap = info['dirty-bitmaps'][0] log('{}: name={} dirty-clusters={}'.format(msg, bitmap['name'], bitmap['count'] // 64 // 1024)) else: diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test index dbf10e58d3..d046ebeb94 100755 --- a/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test +++ b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test @@ -67,10 +67,12 @@ def event_dist(e1, e2): def check_bitmaps(vm, count): result = vm.qmp('query-block') + info = result['return'][0].get('inserted', {}) + if count == 0: - assert 'dirty-bitmaps' not in result['return'][0] + assert 'dirty-bitmaps' not in info else: - assert len(result['return'][0]['dirty-bitmaps']) == count + assert len(info['dirty-bitmaps']) == count class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase): -- cgit v1.2.3 From 8d17adf34f501ded65a106572740760f0a75577c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 22 Feb 2021 11:16:32 +0000 Subject: block: remove support for using "file" driver with block/char devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'host_device' and 'host_cdrom' drivers must be used instead. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrangé --- tests/qemu-iotests/226.out | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/qemu-iotests/226.out b/tests/qemu-iotests/226.out index 42be973ff2..55504d29c4 100644 --- a/tests/qemu-iotests/226.out +++ b/tests/qemu-iotests/226.out @@ -3,23 +3,23 @@ QA output created by 226 === Testing with driver:file === == Testing RO == -qemu-io: can't open: A regular file was expected by the 'file' driver, but something else was given -qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated +qemu-io: can't open: 'file' driver requires 'TEST_DIR/t.IMGFMT' to be a regular file +qemu-io: can't open: 'file' driver requires '/dev/null' to be a regular file == Testing RW == qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory -qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated +qemu-io: can't open: 'file' driver requires '/dev/null' to be a regular file === Testing with driver:host_device === == Testing RO == -qemu-io: can't open: 'host_device' driver expects either a character or block device +qemu-io: can't open: 'host_device' driver requires 'TEST_DIR/t.IMGFMT' to be either a character or block device == Testing RW == qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory === Testing with driver:host_cdrom === == Testing RO == -qemu-io: can't open: 'host_cdrom' driver expects either a character or block device +qemu-io: can't open: 'host_cdrom' driver requires 'TEST_DIR/t.IMGFMT' to be either a character or block device == Testing RW == qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory -- cgit v1.2.3