summaryrefslogtreecommitdiffstats
path: root/tests/boot-sector.c
diff options
context:
space:
mode:
authorThomas Huth2016-10-11 17:19:36 +0200
committerDavid Gibson2016-10-14 01:06:47 +0200
commit3e353773721596971db2d0abc7015e7ea3d3af07 (patch)
tree595bb7eac2c389f95fc441d2e4a3958899fb22a0 /tests/boot-sector.c
parenttests/boot-sector: Use minimum length for the Forth boot script (diff)
downloadqemu-3e353773721596971db2d0abc7015e7ea3d3af07.tar.gz
qemu-3e353773721596971db2d0abc7015e7ea3d3af07.tar.xz
qemu-3e353773721596971db2d0abc7015e7ea3d3af07.zip
tests/boot-sector: Use mkstemp() to create a unique file name
The pxe-test is run for three different targets now (x86_64, i386 and ppc64), and the bios-tables-test is run for two targets (x86_64 and i386). But each of the tests is using an invariant name for the disk image with the boot sector code - so if the tests are running in parallel, there is a race condition that they destroy the disk image of a parallel test program. Let's use mkstemp() to create unique temporary files here instead - and since mkstemp() is returning an integer file descriptor instead of a FILE pointer, we also switch the fwrite() and fclose() to write() and close() instead. Reported-by: Sascha Silbe <x-qemu@se-silbe.de> Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'tests/boot-sector.c')
-rw-r--r--tests/boot-sector.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/tests/boot-sector.c b/tests/boot-sector.c
index 0168fd0247..83993143a6 100644
--- a/tests/boot-sector.c
+++ b/tests/boot-sector.c
@@ -69,12 +69,13 @@ static uint8_t boot_sector[0x7e000] = {
};
/* Create boot disk file. */
-int boot_sector_init(const char *fname)
+int boot_sector_init(char *fname)
{
- FILE *f = fopen(fname, "w");
+ int fd, ret;
size_t len = sizeof boot_sector;
- if (!f) {
+ fd = mkstemp(fname);
+ if (fd < 0) {
fprintf(stderr, "Couldn't open \"%s\": %s", fname, strerror(errno));
return 1;
}
@@ -86,8 +87,14 @@ int boot_sector_init(const char *fname)
HIGH(SIGNATURE), BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET + 1);
}
- fwrite(boot_sector, 1, len, f);
- fclose(f);
+ ret = write(fd, boot_sector, len);
+ close(fd);
+
+ if (ret != len) {
+ fprintf(stderr, "Could not write \"%s\"", fname);
+ return 1;
+ }
+
return 0;
}