32a3ac0fa9
- kvm-blockdev-reduce-aio_context-locked-sections-in-bitma.patch [bz#1756413] - kvm-qapi-implement-block-dirty-bitmap-remove-transaction.patch [bz#1756413] - kvm-iotests-test-bitmap-moving-inside-254.patch [bz#1756413] - kvm-spapr-xive-skip-partially-initialized-vCPUs-in-prese.patch [bz#1754710] - kvm-nbd-Grab-aio-context-lock-in-more-places.patch [bz#1741094] - kvm-tests-Use-iothreads-during-iotest-223.patch [bz#1741094] - Resolves: bz#1741094 ([Upstream]Incremental backup: Qemu coredump when expose an active bitmap via pull mode(data plane enable)) - Resolves: bz#1754710 (qemu core dumped when hotpluging vcpus) - Resolves: bz#1756413 (backport support for transactionable block-dirty-bitmap-remove for incremental backup support)
74 lines
2.8 KiB
Diff
74 lines
2.8 KiB
Diff
From c03d23733166328e70f98504d7dfaa528e889633 Mon Sep 17 00:00:00 2001
|
|
From: Eric Blake <eblake@redhat.com>
|
|
Date: Wed, 9 Oct 2019 14:10:08 +0100
|
|
Subject: [PATCH 6/6] tests: Use iothreads during iotest 223
|
|
|
|
RH-Author: Eric Blake <eblake@redhat.com>
|
|
Message-id: <20191009141008.24439-3-eblake@redhat.com>
|
|
Patchwork-id: 91355
|
|
O-Subject: [RHEL-AV-8.1.1 qemu-kvm PATCH 2/2] tests: Use iothreads during iotest 223
|
|
Bugzilla: 1741094
|
|
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
|
Doing so catches the bugs we just fixed with NBD not properly using
|
|
correct contexts.
|
|
|
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
Message-Id: <20190920220729.31801-1-eblake@redhat.com>
|
|
(cherry picked from commit 506902c6fa80210b002e30ff33794bfc718b15c6)
|
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
tests/qemu-iotests/223 | 6 ++++--
|
|
tests/qemu-iotests/223.out | 1 +
|
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223
|
|
index cc48e78..2ba3d81 100755
|
|
--- a/tests/qemu-iotests/223
|
|
+++ b/tests/qemu-iotests/223
|
|
@@ -2,7 +2,7 @@
|
|
#
|
|
# Test reading dirty bitmap over NBD
|
|
#
|
|
-# Copyright (C) 2018 Red Hat, Inc.
|
|
+# Copyright (C) 2018-2019 Red Hat, Inc.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
@@ -109,7 +109,7 @@ echo
|
|
echo "=== End dirty bitmaps, and start serving image over NBD ==="
|
|
echo
|
|
|
|
-_launch_qemu 2> >(_filter_nbd)
|
|
+_launch_qemu -object iothread,id=io0 2> >(_filter_nbd)
|
|
|
|
# Intentionally provoke some errors as well, to check error handling
|
|
silent=
|
|
@@ -117,6 +117,8 @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"qmp_capabilities"}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"blockdev-add",
|
|
"arguments":{"driver":"qcow2", "node-name":"n",
|
|
"file":{"driver":"file", "filename":"'"$TEST_IMG"'"}}}' "return"
|
|
+_send_qemu_cmd $QEMU_HANDLE '{"execute":"x-blockdev-set-iothread",
|
|
+ "arguments":{"node-name":"n", "iothread":"io0"}}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"block-dirty-bitmap-disable",
|
|
"arguments":{"node":"n", "name":"b"}}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
|
|
diff --git a/tests/qemu-iotests/223.out b/tests/qemu-iotests/223.out
|
|
index d5201b2..90cc4b6 100644
|
|
--- a/tests/qemu-iotests/223.out
|
|
+++ b/tests/qemu-iotests/223.out
|
|
@@ -27,6 +27,7 @@ wrote 2097152/2097152 bytes at offset 2097152
|
|
{"return": {}}
|
|
{"return": {}}
|
|
{"return": {}}
|
|
+{"return": {}}
|
|
{"error": {"class": "GenericError", "desc": "NBD server not running"}}
|
|
{"return": {}}
|
|
{"error": {"class": "GenericError", "desc": "NBD server already running"}}
|
|
--
|
|
1.8.3.1
|
|
|