mirror of https://github.com/xemu-project/xemu.git
tests/qtest/ide-test.c: Create disk image for use as a secondary
Change 'tmp_path' into an array of two members to accommodate another disk image of size TEST_IMAGE_SIZE. This facilitates testing ATA protocol aspects peculiar to secondary devices on the same controller. Signed-off-by: Lev Kujawski <lkujaw@member.fsf.org> Message-Id: <20220707031140.158958-2-lkujaw@member.fsf.org> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
4851a986b2
commit
ecfcf71314
|
@ -121,7 +121,7 @@ enum {
|
||||||
static QPCIBus *pcibus = NULL;
|
static QPCIBus *pcibus = NULL;
|
||||||
static QGuestAllocator guest_malloc;
|
static QGuestAllocator guest_malloc;
|
||||||
|
|
||||||
static char *tmp_path;
|
static char *tmp_path[2];
|
||||||
static char *debug_path;
|
static char *debug_path;
|
||||||
|
|
||||||
static QTestState *ide_test_start(const char *cmdline_fmt, ...)
|
static QTestState *ide_test_start(const char *cmdline_fmt, ...)
|
||||||
|
@ -310,7 +310,7 @@ static QTestState *test_bmdma_setup(void)
|
||||||
qts = ide_test_start(
|
qts = ide_test_start(
|
||||||
"-drive file=%s,if=ide,cache=writeback,format=raw "
|
"-drive file=%s,if=ide,cache=writeback,format=raw "
|
||||||
"-global ide-hd.serial=%s -global ide-hd.ver=%s",
|
"-global ide-hd.serial=%s -global ide-hd.ver=%s",
|
||||||
tmp_path, "testdisk", "version");
|
tmp_path[0], "testdisk", "version");
|
||||||
qtest_irq_intercept_in(qts, "ioapic");
|
qtest_irq_intercept_in(qts, "ioapic");
|
||||||
|
|
||||||
return qts;
|
return qts;
|
||||||
|
@ -574,7 +574,7 @@ static void test_identify(void)
|
||||||
qts = ide_test_start(
|
qts = ide_test_start(
|
||||||
"-drive file=%s,if=ide,cache=writeback,format=raw "
|
"-drive file=%s,if=ide,cache=writeback,format=raw "
|
||||||
"-global ide-hd.serial=%s -global ide-hd.ver=%s",
|
"-global ide-hd.serial=%s -global ide-hd.ver=%s",
|
||||||
tmp_path, "testdisk", "version");
|
tmp_path[0], "testdisk", "version");
|
||||||
|
|
||||||
dev = get_pci_device(qts, &bmdma_bar, &ide_bar);
|
dev = get_pci_device(qts, &bmdma_bar, &ide_bar);
|
||||||
|
|
||||||
|
@ -662,7 +662,7 @@ static void test_flush(void)
|
||||||
|
|
||||||
qts = ide_test_start(
|
qts = ide_test_start(
|
||||||
"-drive file=blkdebug::%s,if=ide,cache=writeback,format=raw",
|
"-drive file=blkdebug::%s,if=ide,cache=writeback,format=raw",
|
||||||
tmp_path);
|
tmp_path[0]);
|
||||||
|
|
||||||
dev = get_pci_device(qts, &bmdma_bar, &ide_bar);
|
dev = get_pci_device(qts, &bmdma_bar, &ide_bar);
|
||||||
|
|
||||||
|
@ -713,7 +713,7 @@ static void test_pci_retry_flush(void)
|
||||||
qts = ide_test_start(
|
qts = ide_test_start(
|
||||||
"-drive file=blkdebug:%s:%s,if=ide,cache=writeback,format=raw,"
|
"-drive file=blkdebug:%s:%s,if=ide,cache=writeback,format=raw,"
|
||||||
"rerror=stop,werror=stop",
|
"rerror=stop,werror=stop",
|
||||||
debug_path, tmp_path);
|
debug_path, tmp_path[0]);
|
||||||
|
|
||||||
dev = get_pci_device(qts, &bmdma_bar, &ide_bar);
|
dev = get_pci_device(qts, &bmdma_bar, &ide_bar);
|
||||||
|
|
||||||
|
@ -892,14 +892,14 @@ static void cdrom_pio_impl(int nblocks)
|
||||||
|
|
||||||
/* Prepopulate the CDROM with an interesting pattern */
|
/* Prepopulate the CDROM with an interesting pattern */
|
||||||
generate_pattern(pattern, patt_len, ATAPI_BLOCK_SIZE);
|
generate_pattern(pattern, patt_len, ATAPI_BLOCK_SIZE);
|
||||||
fh = fopen(tmp_path, "wb+");
|
fh = fopen(tmp_path[0], "wb+");
|
||||||
ret = fwrite(pattern, ATAPI_BLOCK_SIZE, patt_blocks, fh);
|
ret = fwrite(pattern, ATAPI_BLOCK_SIZE, patt_blocks, fh);
|
||||||
g_assert_cmpint(ret, ==, patt_blocks);
|
g_assert_cmpint(ret, ==, patt_blocks);
|
||||||
fclose(fh);
|
fclose(fh);
|
||||||
|
|
||||||
qts = ide_test_start(
|
qts = ide_test_start(
|
||||||
"-drive if=none,file=%s,media=cdrom,format=raw,id=sr0,index=0 "
|
"-drive if=none,file=%s,media=cdrom,format=raw,id=sr0,index=0 "
|
||||||
"-device ide-cd,drive=sr0,bus=ide.0", tmp_path);
|
"-device ide-cd,drive=sr0,bus=ide.0", tmp_path[0]);
|
||||||
dev = get_pci_device(qts, &bmdma_bar, &ide_bar);
|
dev = get_pci_device(qts, &bmdma_bar, &ide_bar);
|
||||||
qtest_irq_intercept_in(qts, "ioapic");
|
qtest_irq_intercept_in(qts, "ioapic");
|
||||||
|
|
||||||
|
@ -985,7 +985,7 @@ static void test_cdrom_dma(void)
|
||||||
|
|
||||||
qts = ide_test_start(
|
qts = ide_test_start(
|
||||||
"-drive if=none,file=%s,media=cdrom,format=raw,id=sr0,index=0 "
|
"-drive if=none,file=%s,media=cdrom,format=raw,id=sr0,index=0 "
|
||||||
"-device ide-cd,drive=sr0,bus=ide.0", tmp_path);
|
"-device ide-cd,drive=sr0,bus=ide.0", tmp_path[0]);
|
||||||
qtest_irq_intercept_in(qts, "ioapic");
|
qtest_irq_intercept_in(qts, "ioapic");
|
||||||
|
|
||||||
guest_buf = guest_alloc(&guest_malloc, len);
|
guest_buf = guest_alloc(&guest_malloc, len);
|
||||||
|
@ -993,7 +993,7 @@ static void test_cdrom_dma(void)
|
||||||
prdt[0].size = cpu_to_le32(len | PRDT_EOT);
|
prdt[0].size = cpu_to_le32(len | PRDT_EOT);
|
||||||
|
|
||||||
generate_pattern(pattern, ATAPI_BLOCK_SIZE * 16, ATAPI_BLOCK_SIZE);
|
generate_pattern(pattern, ATAPI_BLOCK_SIZE * 16, ATAPI_BLOCK_SIZE);
|
||||||
fh = fopen(tmp_path, "wb+");
|
fh = fopen(tmp_path[0], "wb+");
|
||||||
ret = fwrite(pattern, ATAPI_BLOCK_SIZE, 16, fh);
|
ret = fwrite(pattern, ATAPI_BLOCK_SIZE, 16, fh);
|
||||||
g_assert_cmpint(ret, ==, 16);
|
g_assert_cmpint(ret, ==, 16);
|
||||||
fclose(fh);
|
fclose(fh);
|
||||||
|
@ -1012,6 +1012,7 @@ static void test_cdrom_dma(void)
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
const char *base;
|
const char *base;
|
||||||
|
int i;
|
||||||
int fd;
|
int fd;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -1035,12 +1036,14 @@ int main(int argc, char **argv)
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
||||||
/* Create a temporary raw image */
|
/* Create a temporary raw image */
|
||||||
tmp_path = g_strdup_printf("%s/qtest.XXXXXX", base);
|
for (i = 0; i < 2; ++i) {
|
||||||
fd = g_mkstemp(tmp_path);
|
tmp_path[i] = g_strdup_printf("%s/qtest.XXXXXX", base);
|
||||||
|
fd = g_mkstemp(tmp_path[i]);
|
||||||
g_assert(fd >= 0);
|
g_assert(fd >= 0);
|
||||||
ret = ftruncate(fd, TEST_IMAGE_SIZE);
|
ret = ftruncate(fd, TEST_IMAGE_SIZE);
|
||||||
g_assert(ret == 0);
|
g_assert(ret == 0);
|
||||||
close(fd);
|
close(fd);
|
||||||
|
}
|
||||||
|
|
||||||
/* Run the tests */
|
/* Run the tests */
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
|
@ -1064,8 +1067,10 @@ int main(int argc, char **argv)
|
||||||
ret = g_test_run();
|
ret = g_test_run();
|
||||||
|
|
||||||
/* Cleanup */
|
/* Cleanup */
|
||||||
unlink(tmp_path);
|
for (i = 0; i < 2; ++i) {
|
||||||
g_free(tmp_path);
|
unlink(tmp_path[i]);
|
||||||
|
g_free(tmp_path[i]);
|
||||||
|
}
|
||||||
unlink(debug_path);
|
unlink(debug_path);
|
||||||
g_free(debug_path);
|
g_free(debug_path);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue