diff options
| author | John Snow <jsnow@redhat.com> | 2015-04-28 15:27:51 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2015-04-28 15:27:51 -0400 |
| commit | 122fdf2d8822699482723e6f50f34c9c3933360b (patch) | |
| tree | 9dde8f1970ab1c806744370312f0ffb2a9c459b4 /tests/ahci-test.c | |
| parent | 24a5c62cfe3cbe3fb4722f79661b9900a2579316 (diff) | |
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: John Snow <jsnow@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1426274523-22661-2-git-send-email-jsnow@redhat.com
Diffstat (limited to 'tests/ahci-test.c')
| -rw-r--r-- | tests/ahci-test.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tests/ahci-test.c b/tests/ahci-test.c index ea62e249f5..cdfa7b93d0 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -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); |