mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/qtest: ahci-test: Avoid using hardcoded /tmp

Browse Source 
This case was written to use hardcoded /tmp directory for temporary
files. Update to use g_file_open_tmp() for a portable implementation.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220925113032.1949844-6-bmeng.cn@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Bin Meng 2022-09-25 19:29:43 +08:00 committed by Thomas Huth
parent 3039fd4b6e
commit d9eefd35b6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/qtest/ahci-test.c
View File

@ -44,9 +44,9 @@
#define TEST_IMAGE_SIZE_MB_SMALL 64 #define TEST_IMAGE_SIZE_MB_SMALL 64
/*** Globals ***/ /*** Globals ***/
static char tmp_path[] = "/tmp/qtest.XXXXXX"; static char *tmp_path;
static char debug_path[] = "/tmp/qtest-blkdebug.XXXXXX"; static char *debug_path;
static char mig_socket[] = "/tmp/qtest-migration.XXXXXX"; static char *mig_socket;
static bool ahci_pedantic; static bool ahci_pedantic;
static const char *imgfmt; static const char *imgfmt;
static unsigned test_image_size_mb; static unsigned test_image_size_mb;
@ -1437,10 +1437,10 @@ static void test_ncq_simple(void)
static int prepare_iso(size_t size, unsigned char **buf, char **name) static int prepare_iso(size_t size, unsigned char **buf, char **name)
{ {
char cdrom_path[] = "/tmp/qtest.iso.XXXXXX"; g_autofree char *cdrom_path = NULL;
unsigned char *patt; unsigned char *patt;
ssize_t ret; ssize_t ret;
int fd = mkstemp(cdrom_path); int fd = g_file_open_tmp("qtest.iso.XXXXXX", &cdrom_path, NULL);
g_assert(fd != -1); g_assert(fd != -1);
g_assert(buf); g_assert(buf);
@ -1872,7 +1872,7 @@ int main(int argc, char **argv)
} }
/* Create a temporary image */ /* Create a temporary image */
fd = mkstemp(tmp_path); fd = g_file_open_tmp("qtest.XXXXXX", &tmp_path, NULL);
g_assert(fd >= 0); g_assert(fd >= 0);
if (have_qemu_img()) { if (have_qemu_img()) {
imgfmt = "qcow2"; imgfmt = "qcow2";
@ -1889,12 +1889,12 @@ int main(int argc, char **argv)
close(fd); close(fd);
/* Create temporary blkdebug instructions */ /* Create temporary blkdebug instructions */
fd = mkstemp(debug_path); fd = g_file_open_tmp("qtest-blkdebug.XXXXXX", &debug_path, NULL);
g_assert(fd >= 0); g_assert(fd >= 0);
close(fd); close(fd);
/* Reserve a hollow file to use as a socket for migration tests */ /* Reserve a hollow file to use as a socket for migration tests */
fd = mkstemp(mig_socket); fd = g_file_open_tmp("qtest-migration.XXXXXX", &mig_socket, NULL);
g_assert(fd >= 0); g_assert(fd >= 0);
close(fd); close(fd);
@ -1947,8 +1947,11 @@ int main(int argc, char **argv)
/* Cleanup */ /* Cleanup */
unlink(tmp_path); unlink(tmp_path);
g_free(tmp_path);
unlink(debug_path); unlink(debug_path);
g_free(debug_path);
unlink(mig_socket); unlink(mig_socket);
g_free(mig_socket);
return ret; return ret;
} }