[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/13] tests/pflash-cfi02: Use the GLib API
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 02/13] tests/pflash-cfi02: Use the GLib API |
Date: |
Mon, 6 May 2019 00:15:33 +0200 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/pflash-cfi02-test.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/tests/pflash-cfi02-test.c b/tests/pflash-cfi02-test.c
index 40af1bb523e..ff775618c02 100644
--- a/tests/pflash-cfi02-test.c
+++ b/tests/pflash-cfi02-test.c
@@ -35,8 +35,6 @@
#define UNLOCK_BYPASS_CMD 0x20
#define UNLOCK_BYPASS_RESET_CMD 0x00
-static char image_path[] = "/tmp/qtest.XXXXXX";
-
static inline void flash_write(uint64_t byte_addr, uint16_t data)
{
qtest_writew(global_qtest, BASE_ADDR + byte_addr, data);
@@ -103,8 +101,9 @@ static void chip_erase(void)
flash_write(UNLOCK0_ADDR, SECTOR_ERASE_CMD);
}
-static void test_flash(void)
+static void test_flash(const void *opaque)
{
+ const char *image_path = opaque;
global_qtest = qtest_initf("-M musicpal,accel=qtest "
"-drive
if=pflash,file=%s,format=raw,copy-on-read",
image_path);
@@ -195,31 +194,30 @@ static void test_flash(void)
static void cleanup(void *opaque)
{
+ char *image_path = opaque;
unlink(image_path);
+ g_free(image_path);
}
int main(int argc, char **argv)
{
- int fd = mkstemp(image_path);
- if (fd == -1) {
- g_printerr("Failed to create temporary file %s: %s\n", image_path,
- strerror(errno));
- exit(EXIT_FAILURE);
- }
+ GError *error = NULL;
+ char *image_path;
+ int fd = g_file_open_tmp("pflash-cfi02-XXXXXX.raw", &image_path, &error);
+ g_assert_no_error(error);
if (ftruncate(fd, 8 * 1024 * 1024) < 0) {
- int error_code = errno;
+ g_printerr("Failed to truncate file %s to 8 MB: %s\n", image_path,
+ strerror(errno));
close(fd);
unlink(image_path);
- g_printerr("Failed to truncate file %s to 8 MB: %s\n", image_path,
- strerror(error_code));
exit(EXIT_FAILURE);
}
close(fd);
- qtest_add_abrt_handler(cleanup, NULL);
+ qtest_add_abrt_handler(cleanup, image_path);
g_test_init(&argc, &argv, NULL);
- qtest_add_func("pflash-cfi02", test_flash);
+ qtest_add_data_func("pflash-cfi02", image_path, test_flash);
int result = g_test_run();
- cleanup(NULL);
+ cleanup(image_path);
return result;
}
--
2.20.1
- [Qemu-devel] [PATCH 00/13] hw/block/pflash_cfi02: Clean-up and fixes, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 01/13] tests/pflash-cfi02: Add test for supported CFI commands, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 04/13] hw/block/pflash_cfi02: Fix debug format string, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 07/13] hw/block/pflash_cfi02: Simplify a statement using fall through, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 10/13] hw/block/pflash_cfi02: Extract the pflash_data_read() function, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 03/13] tests/pflash-cfi02: Use IEC binary prefixes for size constants, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 06/13] hw/block/pflash_cfi02: Add helpers to manipulate the status bits, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 02/13] tests/pflash-cfi02: Use the GLib API,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 05/13] hw/block/pflash_cfi02: Add an enum to define the write cycles, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 08/13] hw/block/pflash_cfi02: Use the ldst API in pflash_write(), Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 09/13] hw/block/pflash_cfi02: Use the ldst API in pflash_read(), Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 13/13] hw/block/pflash_cfi02: Use the chip erase time specified in the CFI table, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 12/13] hw/block/pflash_cfi02: Fix command address comparison, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 11/13] hw/block/pflash_cfi02: Unify the MemoryRegionOps, Philippe Mathieu-Daudé, 2019/05/05