block: test blk_aio_flush() with blk->root == NULL
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>
This commit is contained in:
		
							parent
							
								
									33f2a75777
								
							
						
					
					
						commit
						ad0df3e0fd
					
				| 
						 | 
				
			
			@ -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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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();
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
		Reference in New Issue