[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/17] vhost-user-blk-test: rename destroy_drive() to destroy_file
From: |
Michael S. Tsirkin |
Subject: |
[PULL 09/17] vhost-user-blk-test: rename destroy_drive() to destroy_file() |
Date: |
Sun, 15 Nov 2020 17:27:33 -0500 |
From: Stefan Hajnoczi <stefanha@redhat.com>
The function is used not just for image files but also for UNIX domain
sockets (QMP monitor and vhost-user-blk). Reflect that in the name.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201111124331.1393747-5-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
tests/qtest/vhost-user-blk-test.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/qtest/vhost-user-blk-test.c
b/tests/qtest/vhost-user-blk-test.c
index 31f2335f97..f05f14c192 100644
--- a/tests/qtest/vhost-user-blk-test.c
+++ b/tests/qtest/vhost-user-blk-test.c
@@ -658,7 +658,8 @@ static const char *qtest_qemu_storage_daemon_binary(void)
return qemu_storage_daemon_bin;
}
-static void drive_destroy(void *path)
+/* g_test_queue_destroy() cleanup function for files */
+static void destroy_file(void *path)
{
unlink(path);
g_free(path);
@@ -678,7 +679,7 @@ static char *drive_create(void)
g_assert_cmpint(ret, ==, 0);
close(fd);
- g_test_queue_destroy(drive_destroy, t_path);
+ g_test_queue_destroy(destroy_file, t_path);
return t_path;
}
@@ -717,7 +718,7 @@ static char *start_vhost_user_blk(GString *cmd_line, int
vus_instances,
qmp_fd = mkstemp(qmp_sock_path);
g_assert_cmpint(qmp_fd, >=, 0);
- g_test_queue_destroy(drive_destroy, qmp_sock_path);
+ g_test_queue_destroy(destroy_file, qmp_sock_path);
g_string_append_printf(storage_daemon_command,
"exec %s "
@@ -731,7 +732,7 @@ static char *start_vhost_user_blk(GString *cmd_line, int
vus_instances,
sock_path = g_strdup(sock_path_tempate);
fd = mkstemp(sock_path);
g_assert_cmpint(fd, >=, 0);
- g_test_queue_destroy(drive_destroy, sock_path);
+ g_test_queue_destroy(drive_file, sock_path);
/* create image file */
img_path = drive_create();
g_string_append_printf(storage_daemon_command,
--
MST
- [PULL 00/17] pc,vhost: fixes, new test, Michael S. Tsirkin, 2020/11/15
- [PULL 01/17] vhost-user: fix VHOST_USER_ADD/REM_MEM_REG truncation, Michael S. Tsirkin, 2020/11/15
- [PULL 02/17] meson: move vhost_user_blk_server to meson.build, Michael S. Tsirkin, 2020/11/15
- [PULL 03/17] vhost-user-blk-server: depend on CONFIG_VHOST_USER, Michael S. Tsirkin, 2020/11/15
- [PULL 05/17] hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off, Michael S. Tsirkin, 2020/11/15
- [PULL 07/17] tests/qtest: add multi-queue test case to vhost-user-blk-test, Michael S. Tsirkin, 2020/11/15
- [PULL 08/17] libqtest: add qtest_socket_server(), Michael S. Tsirkin, 2020/11/15
- [PULL 06/17] test: new qTest case to test the vhost-user-blk-server, Michael S. Tsirkin, 2020/11/15
- [PULL 09/17] vhost-user-blk-test: rename destroy_drive() to destroy_file(),
Michael S. Tsirkin <=
- [PULL 11/17] vhost-user-blk-test: drop unused return value, Michael S. Tsirkin, 2020/11/15
- [PULL 12/17] vhost-user-blk-test: fix races by using fd passing, Michael S. Tsirkin, 2020/11/15
- [PULL 13/17] block/export: port virtio-blk discard/write zeroes input validation, Michael S. Tsirkin, 2020/11/15
- [PULL 14/17] vhost-user-blk-test: test discard/write zeroes invalid inputs, Michael S. Tsirkin, 2020/11/15
- [PULL 15/17] block/export: port virtio-blk read/write range check, Michael S. Tsirkin, 2020/11/15
- [PULL 16/17] contrib/libvhost-user: Fix bad printf format specifiers, Michael S. Tsirkin, 2020/11/15
- [PULL 04/17] configure: mark vhost-user Linux-only, Michael S. Tsirkin, 2020/11/15
- [PULL 10/17] vhost-user-blk-test: close fork child file descriptors, Michael S. Tsirkin, 2020/11/15
- [PULL 17/17] vhost-user-blk/scsi: Fix broken error handling for socket call, Michael S. Tsirkin, 2020/11/15
- Re: [PULL 00/17] pc,vhost: fixes, new test, Peter Maydell, 2020/11/16