[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 35/38] vhost-user-blk-test: rename destroy_drive() to destroy_file
From: |
Michael S. Tsirkin |
Subject: |
[PULL 35/38] vhost-user-blk-test: rename destroy_drive() to destroy_file() |
Date: |
Tue, 3 Nov 2020 09:35:31 -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: <20201027173528.213464-10-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 23/38] vhost-vdpa: Add qemu_close in vhost_vdpa_cleanup, (continued)
- [PULL 23/38] vhost-vdpa: Add qemu_close in vhost_vdpa_cleanup, Michael S. Tsirkin, 2020/11/03
- [PULL 24/38] net: Add vhost-vdpa in show_netdevs(), Michael S. Tsirkin, 2020/11/03
- [PULL 26/38] vhost-blk: set features before setting inflight feature, Michael S. Tsirkin, 2020/11/03
- [PULL 27/38] libvhost-user: follow QEMU comment style, Michael S. Tsirkin, 2020/11/03
- [PULL 28/38] configure: introduce --enable-vhost-user-blk-server, Michael S. Tsirkin, 2020/11/03
- [PULL 29/38] block/export: make vhost-user-blk config space little-endian, Michael S. Tsirkin, 2020/11/03
- [PULL 30/38] block/export: fix vhost-user-blk get_config() information leak, Michael S. Tsirkin, 2020/11/03
- [PULL 31/38] contrib/vhost-user-blk: fix get_config() information leak, Michael S. Tsirkin, 2020/11/03
- [PULL 33/38] tests/qtest: add multi-queue test case to vhost-user-blk-test, Michael S. Tsirkin, 2020/11/03
- [PULL 32/38] test: new qTest case to test the vhost-user-blk-server, Michael S. Tsirkin, 2020/11/03
- [PULL 35/38] vhost-user-blk-test: rename destroy_drive() to destroy_file(),
Michael S. Tsirkin <=
- [PULL 38/38] vhost-user-blk-test: fix races by using fd passing, Michael S. Tsirkin, 2020/11/03
- [PULL 36/38] vhost-user-blk-test: close fork child file descriptors, Michael S. Tsirkin, 2020/11/03
- [PULL 37/38] vhost-user-blk-test: drop unused return value, Michael S. Tsirkin, 2020/11/03
- [PULL 34/38] libqtest: add qtest_socket_server(), Michael S. Tsirkin, 2020/11/03
- [PULL 25/38] Revert "vhost-blk: set features before setting inflight feature", Michael S. Tsirkin, 2020/11/03
- [PULL 16/38] virtio-iommu: Call memory notifiers in attach/detach, Michael S. Tsirkin, 2020/11/03
- Re: [PULL 00/38] pc,pci,vhost,virtio: fixes, Peter Maydell, 2020/11/03