Commit 122fdf2d authored by John Snow's avatar John Snow
Browse files

qtest/ahci: add qcow2 support to ahci-test 



This will enable the testing of high offsets without
wasting a lot of disk space, and does not impact the
previous tests.

mkimg and mkqcow2 are added to libqos for other tests.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Acked-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1426274523-22661-2-git-send-email-jsnow@redhat.com
parent 24a5c62c

tests/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ GCOV_OPTIONS = -n $(if $(V),-f,) 
$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y)

	$(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,)

	$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \

		QTEST_QEMU_IMG=qemu-img$(EXESUF) \

		MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$((RANDOM % 255 + 1))} \

		gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(check-qtest-$*-y),"GTESTER $@")

	$(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y); do \

tests/ahci-test.c

+6 −10
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
#include "hw/pci/pci_ids.h"

#include "hw/pci/pci_regs.h"



/* Test-specific defines. */

#define TEST_IMAGE_SIZE    (64 * 1024 * 1024)

/* Test-specific defines -- in MiB */

#define TEST_IMAGE_SIZE_MB (200 * 1024)



/*** Globals ***/

static char tmp_path[] = "/tmp/qtest.XXXXXX";
@@ -107,7 +107,7 @@ static AHCIQState *ahci_boot(void) 
    s = g_malloc0(sizeof(AHCIQState));



    cli = "-drive if=none,id=drive0,file=%s,cache=writeback,serial=%s"

        ",format=raw"

        ",format=qcow2"

        " -M q35 "

        "-device ide-hd,drive=drive0 "

        "-global ide-hd.ver=%s";
@@ -1071,7 +1071,6 @@ static void create_ahci_io_test(enum IOMode type, enum AddrMode addr, 
int main(int argc, char **argv)

{

    const char *arch;

    int fd;

    int ret;

    int c;

    int i, j, k;
@@ -1108,12 +1107,9 @@ int main(int argc, char **argv) 
        return 0;

    }



    /* Create a temporary raw image */

    fd = mkstemp(tmp_path);

    g_assert(fd >= 0);

    ret = ftruncate(fd, TEST_IMAGE_SIZE);

    g_assert(ret == 0);

    close(fd);

    /* Create a temporary qcow2 image */

    close(mkstemp(tmp_path));

    mkqcow2(tmp_path, TEST_IMAGE_SIZE_MB);



    /* Run the tests */

    qtest_add_func("/ahci/sanity",     test_sanity);

tests/libqos/libqos.c

+44 −0
Original line number Diff line number Diff line
@@ -61,3 +61,47 @@ void qtest_shutdown(QOSState *qs) 
    qtest_quit(qs->qts);

    g_free(qs);

}



void mkimg(const char *file, const char *fmt, unsigned size_mb)

{

    gchar *cli;

    bool ret;

    int rc;

    GError *err = NULL;

    char *qemu_img_path;

    gchar *out, *out2;

    char *abs_path;



    qemu_img_path = getenv("QTEST_QEMU_IMG");

    abs_path = realpath(qemu_img_path, NULL);

    assert(qemu_img_path);



    cli = g_strdup_printf("%s create -f %s %s %uM", abs_path,

                          fmt, file, size_mb);

    ret = g_spawn_command_line_sync(cli, &out, &out2, &rc, &err);

    if (err) {

        fprintf(stderr, "%s\n", err->message);

        g_error_free(err);

    }

    g_assert(ret && !err);



    /* In glib 2.34, we have g_spawn_check_exit_status. in 2.12, we don't.

     * glib 2.43.91 implementation assumes that any non-zero is an error for

     * windows, but uses extra precautions for Linux. However,

     * 0 is only possible if the program exited normally, so that should be

     * sufficient for our purposes on all platforms, here. */

    if (rc) {

        fprintf(stderr, "qemu-img returned status code %d\n", rc);

    }

    g_assert(!rc);



    g_free(out);

    g_free(out2);

    g_free(cli);

    free(abs_path);

}



void mkqcow2(const char *file, unsigned size_mb)

{

    return mkimg(file, "qcow2", size_mb);

}

tests/libqos/libqos.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ typedef struct QOSState { 
QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap);

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);



static inline uint64_t qmalloc(QOSState *q, size_t bytes)

{