From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnEsu-00062b-1t for qemu-devel@nongnu.org; Tue, 28 Apr 2015 19:25:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YnEss-00036N-OT for qemu-devel@nongnu.org; Tue, 28 Apr 2015 19:25:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnEss-000369-Fe for qemu-devel@nongnu.org; Tue, 28 Apr 2015 19:25:46 -0400 From: John Snow Date: Tue, 28 Apr 2015 19:25:35 -0400 Message-Id: <1430263537-7786-9-git-send-email-jsnow@redhat.com> In-Reply-To: <1430263537-7786-1-git-send-email-jsnow@redhat.com> References: <1430263537-7786-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 08/10] libqos: add blkdebug_prepare_script List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com Pull this helper out of ide-test and into libqos, to be shared with ahci-test. Signed-off-by: John Snow Message-id: 1426018503-821-6-git-send-email-jsnow@redhat.com --- tests/ide-test.c | 23 +---------------------- tests/libqos/libqos.c | 22 ++++++++++++++++++++++ tests/libqos/libqos.h | 1 + 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/tests/ide-test.c b/tests/ide-test.c index 1dae84f..78382e9 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -29,6 +29,7 @@ #include #include "libqtest.h" +#include "libqos/libqos.h" #include "libqos/pci-pc.h" #include "libqos/malloc-pc.h" @@ -494,28 +495,6 @@ static void test_flush(void) ide_test_quit(); } -static void prepare_blkdebug_script(const char *debug_fn, const char *event) -{ - FILE *debug_file = fopen(debug_fn, "w"); - int ret; - - fprintf(debug_file, "[inject-error]\n"); - fprintf(debug_file, "event = \"%s\"\n", event); - fprintf(debug_file, "errno = \"5\"\n"); - fprintf(debug_file, "state = \"1\"\n"); - fprintf(debug_file, "immediately = \"off\"\n"); - fprintf(debug_file, "once = \"on\"\n"); - - fprintf(debug_file, "[set-state]\n"); - fprintf(debug_file, "event = \"%s\"\n", event); - fprintf(debug_file, "new_state = \"2\"\n"); - fflush(debug_file); - g_assert(!ferror(debug_file)); - - ret = fclose(debug_file); - g_assert(ret == 0); -} - static void test_retry_flush(const char *machine) { uint8_t data; diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c index 097091c..7e72078 100644 --- a/tests/libqos/libqos.c +++ b/tests/libqos/libqos.c @@ -105,3 +105,25 @@ void mkqcow2(const char *file, unsigned size_mb) { return mkimg(file, "qcow2", size_mb); } + +void prepare_blkdebug_script(const char *debug_fn, const char *event) +{ + FILE *debug_file = fopen(debug_fn, "w"); + int ret; + + fprintf(debug_file, "[inject-error]\n"); + fprintf(debug_file, "event = \"%s\"\n", event); + fprintf(debug_file, "errno = \"5\"\n"); + fprintf(debug_file, "state = \"1\"\n"); + fprintf(debug_file, "immediately = \"off\"\n"); + fprintf(debug_file, "once = \"on\"\n"); + + fprintf(debug_file, "[set-state]\n"); + fprintf(debug_file, "event = \"%s\"\n", event); + fprintf(debug_file, "new_state = \"2\"\n"); + fflush(debug_file); + g_assert(!ferror(debug_file)); + + ret = fclose(debug_file); + g_assert(ret == 0); +} diff --git a/tests/libqos/libqos.h b/tests/libqos/libqos.h index 8cb2987..f57362b 100644 --- a/tests/libqos/libqos.h +++ b/tests/libqos/libqos.h @@ -21,6 +21,7 @@ QOSState *qtest_boot(QOSOps *ops, const char *cmdline_fmt, ...); void qtest_shutdown(QOSState *qs); void mkimg(const char *file, const char *fmt, unsigned size_mb); void mkqcow2(const char *file, unsigned size_mb); +void prepare_blkdebug_script(const char *debug_fn, const char *event); static inline uint64_t qmalloc(QOSState *q, size_t bytes) { -- 2.1.0