From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 29/37] block: test blk_aio_flush() with blk->root == NULL
Date: Fri, 2 Mar 2018 19:54:40 +0100 [thread overview]
Message-ID: <20180302185448.6314-30-kwolf@redhat.com> (raw)
In-Reply-To: <20180302185448.6314-1-kwolf@redhat.com>
This patch adds test cases for the scenario where blk_aio_flush() is
called on a BlockBackend with no root. Calling drain afterwards should
complete the requests with -ENOMEDIUM.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/test-block-backend.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++
tests/Makefile.include | 2 ++
2 files changed, 84 insertions(+)
create mode 100644 tests/test-block-backend.c
diff --git a/tests/test-block-backend.c b/tests/test-block-backend.c
new file mode 100644
index 0000000000..fd59f02bd0
--- /dev/null
+++ b/tests/test-block-backend.c
@@ -0,0 +1,82 @@
+/*
+ * BlockBackend tests
+ *
+ * Copyright (c) 2017 Kevin Wolf <kwolf@redhat.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+#include "block/block.h"
+#include "sysemu/block-backend.h"
+#include "qapi/error.h"
+
+static void test_drain_aio_error_flush_cb(void *opaque, int ret)
+{
+ bool *completed = opaque;
+
+ g_assert(ret == -ENOMEDIUM);
+ *completed = true;
+}
+
+static void test_drain_aio_error(void)
+{
+ BlockBackend *blk = blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
+ BlockAIOCB *acb;
+ bool completed = false;
+
+ acb = blk_aio_flush(blk, test_drain_aio_error_flush_cb, &completed);
+ g_assert(acb != NULL);
+ g_assert(completed == false);
+
+ blk_drain(blk);
+ g_assert(completed == true);
+
+ blk_unref(blk);
+}
+
+static void test_drain_all_aio_error(void)
+{
+ BlockBackend *blk = blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
+ BlockAIOCB *acb;
+ bool completed = false;
+
+ acb = blk_aio_flush(blk, test_drain_aio_error_flush_cb, &completed);
+ g_assert(acb != NULL);
+ g_assert(completed == false);
+
+ blk_drain_all();
+ g_assert(completed == true);
+
+ blk_unref(blk);
+}
+
+int main(int argc, char **argv)
+{
+ bdrv_init();
+ qemu_init_main_loop(&error_abort);
+
+ g_test_init(&argc, &argv, NULL);
+
+ g_test_add_func("/block-backend/drain_aio_error", test_drain_aio_error);
+ g_test_add_func("/block-backend/drain_all_aio_error",
+ test_drain_all_aio_error);
+
+ return g_test_run();
+}
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 937cbd874a..b5aab848b3 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -83,6 +83,7 @@ gcov-files-test-hbitmap-y = blockjob.c
check-unit-y += tests/test-bdrv-drain$(EXESUF)
check-unit-y += tests/test-blockjob$(EXESUF)
check-unit-y += tests/test-blockjob-txn$(EXESUF)
+check-unit-y += tests/test-block-backend$(EXESUF)
check-unit-y += tests/test-x86-cpuid$(EXESUF)
# all code tested by test-x86-cpuid is inside topology.h
gcov-files-test-x86-cpuid-y =
@@ -613,6 +614,7 @@ tests/test-throttle$(EXESUF): tests/test-throttle.o $(test-block-obj-y)
tests/test-bdrv-drain$(EXESUF): tests/test-bdrv-drain.o $(test-block-obj-y) $(test-util-obj-y)
tests/test-blockjob$(EXESUF): tests/test-blockjob.o $(test-block-obj-y) $(test-util-obj-y)
tests/test-blockjob-txn$(EXESUF): tests/test-blockjob-txn.o $(test-block-obj-y) $(test-util-obj-y)
+tests/test-block-backend$(EXESUF): tests/test-block-backend.o $(test-block-obj-y) $(test-util-obj-y)
tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj-y)
tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y)
tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) $(test-crypto-obj-y)
--
2.13.6
next prev parent reply other threads:[~2018-03-02 18:56 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 18:54 [Qemu-devel] [PULL 00/37] Block layer patches Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 01/37] block: Add .bdrv_co_block_status() callback Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 02/37] nvme: Drop pointless .bdrv_co_get_block_status() Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 03/37] block: Switch passthrough drivers to .bdrv_co_block_status() Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 04/37] file-posix: Switch " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 05/37] gluster: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 06/37] iscsi: Switch cluster_sectors to byte-based Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 07/37] iscsi: Switch iscsi_allocmap_update() " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 08/37] iscsi: Switch to .bdrv_co_block_status() Kevin Wolf
2018-05-08 15:37 ` Peter Maydell
2018-05-08 16:38 ` Eric Blake
2018-03-02 18:54 ` [Qemu-devel] [PULL 09/37] null: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 10/37] parallels: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 11/37] qcow: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 12/37] qcow2: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 13/37] qed: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 14/37] raw: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 15/37] sheepdog: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 16/37] vdi: Avoid bitrot of debugging code Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 17/37] vdi: Switch to .bdrv_co_block_status() Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 18/37] vmdk: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 19/37] vpc: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 20/37] vvfat: " Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 21/37] block: Drop unused .bdrv_co_get_block_status() Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 22/37] block: fix write with zero flag set and iovector provided Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 23/37] iotest 033: add misaligned write-zeroes test via truncate Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 24/37] specs/qcow2: Fix documentation of the compressed cluster descriptor Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 25/37] docs: document how to use the l2-cache-entry-size parameter Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 26/37] aio: rename aio_context_in_iothread() to in_aio_context_home_thread() Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 27/37] block: extract AIO_WAIT_WHILE() from BlockDriverState Kevin Wolf
2018-03-05 19:53 ` Eric Blake
2018-03-02 18:54 ` [Qemu-devel] [PULL 28/37] block: add BlockBackend->in_flight counter Kevin Wolf
2018-03-02 18:54 ` Kevin Wolf [this message]
2018-03-02 18:54 ` [Qemu-devel] [PULL 30/37] Revert "IDE: Do not flush empty CDROM drives" Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 31/37] block: rename .bdrv_create() to .bdrv_co_create_opts() Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 32/37] qcow2: make qcow2_co_create2() a coroutine_fn Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 33/37] qemu-img: Make resize error message more general Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 34/37] block/ssh: Pull ssh_grow_file() from ssh_create() Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 35/37] block/ssh: Make ssh_grow_file() blocking Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 36/37] block/ssh: Add basic .bdrv_truncate() Kevin Wolf
2018-03-02 18:54 ` [Qemu-devel] [PULL 37/37] qcow2: Replace align_offset() with ROUND_UP() Kevin Wolf
2018-03-05 13:27 ` [Qemu-devel] [PULL 00/37] Block layer patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180302185448.6314-30-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.