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

tests/qtest: i440fx-test: Rewrite create_blob_file() to be portable

Browse Source 
Previously request_{bios, pflash} cases were skipped on win32, mainly
due to create_blob_file() calling mmap() which does not exist on win32.
This rewirtes create_blob_file() to be portable, so that we can enable
these cases on Windows.

Suggested-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220925113032.1949844-2-bmeng.cn@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Bin Meng 2022-09-25 19:29:39 +08:00 committed by Thomas Huth
parent dbc4f48b5a
commit 3039fd4b6e
1 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tests/qtest/i440fx-test.c
View File

@ -278,56 +278,34 @@ static void test_i440fx_pam(gconstpointer opaque)
qtest_end(); qtest_end();
} }
#ifndef _WIN32
#define BLOB_SIZE ((size_t)65536) #define BLOB_SIZE ((size_t)65536)
#define ISA_BIOS_MAXSZ ((size_t)(128 * 1024)) #define ISA_BIOS_MAXSZ ((size_t)(128 * 1024))
/* Create a blob file, and return its absolute pathname as a dynamically /*
* Create a blob file, and return its absolute pathname as a dynamically
* allocated string. * allocated string.
* The file is closed before the function returns. * The file is closed before the function returns.
* In case of error, NULL is returned. The function prints the error message. * In case of error, the function aborts and prints the error message.
*/ */
static char *create_blob_file(void) static char *create_blob_file(void)
{ {
int ret, fd; int i, fd;
char *pathname; char *pathname;
GError *error = NULL; GError *error = NULL;
g_autofree uint8_t *buf = g_malloc(BLOB_SIZE);
ret = -1;
fd = g_file_open_tmp("blob_XXXXXX", &pathname, &error); fd = g_file_open_tmp("blob_XXXXXX", &pathname, &error);
if (fd == -1) { g_assert_no_error(error);
fprintf(stderr, "unable to create blob file: %s\n", error->message);
g_error_free(error);
} else {
if (ftruncate(fd, BLOB_SIZE) == -1) {
fprintf(stderr, "ftruncate(\"%s\", %zu): %s\n", pathname,
BLOB_SIZE, strerror(errno));
} else {
void *buf;
buf = mmap(NULL, BLOB_SIZE, PROT_WRITE, MAP_SHARED, fd, 0);
if (buf == MAP_FAILED) {
fprintf(stderr, "mmap(\"%s\", %zu): %s\n", pathname, BLOB_SIZE,
strerror(errno));
} else {
size_t i;
for (i = 0; i < BLOB_SIZE; ++i) {
((uint8_t *)buf)[i] = i;
}
munmap(buf, BLOB_SIZE);
ret = 0;
}
}
close(fd); close(fd);
if (ret == -1) {
unlink(pathname); for (i = 0; i < BLOB_SIZE; i++) {
g_free(pathname); buf[i] = i;
}
} }
return ret == -1 ? NULL : pathname; g_file_set_contents(pathname, (char *)buf, BLOB_SIZE, &error);
g_assert_no_error(error);
return pathname;
} }
static void test_i440fx_firmware(FirmwareTestFixture *fixture, static void test_i440fx_firmware(FirmwareTestFixture *fixture,
@ -398,8 +376,6 @@ static void request_pflash(FirmwareTestFixture *fixture,
fixture->is_bios = false; fixture->is_bios = false;
} }
#endif /* _WIN32 */
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
TestData data; TestData data;
@ -410,10 +386,8 @@ int main(int argc, char **argv)
qtest_add_data_func("i440fx/defaults", &data, test_i440fx_defaults); qtest_add_data_func("i440fx/defaults", &data, test_i440fx_defaults);
qtest_add_data_func("i440fx/pam", &data, test_i440fx_pam); qtest_add_data_func("i440fx/pam", &data, test_i440fx_pam);
#ifndef _WIN32
add_firmware_test("i440fx/firmware/bios", request_bios); add_firmware_test("i440fx/firmware/bios", request_bios);
add_firmware_test("i440fx/firmware/pflash", request_pflash); add_firmware_test("i440fx/firmware/pflash", request_pflash);
#endif
return g_test_run(); return g_test_run();
} }