[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 02/12] libqtest: add qtest_socket_server()
From: |
Stefan Hajnoczi |
Subject: |
[PATCH v3 02/12] libqtest: add qtest_socket_server() |
Date: |
Tue, 23 Feb 2021 14:46:43 +0000 |
Add an API that returns a new UNIX domain socket in the listen state.
The code for this was already there but only used internally in
init_socket().
This new API will be used by vhost-user-blk-test.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
---
tests/qtest/libqos/libqtest.h | 8 +++++++
tests/qtest/libqtest.c | 40 ++++++++++++++++++++---------------
2 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/tests/qtest/libqos/libqtest.h b/tests/qtest/libqos/libqtest.h
index 724f65aa94..e5f1ec590c 100644
--- a/tests/qtest/libqos/libqtest.h
+++ b/tests/qtest/libqos/libqtest.h
@@ -132,6 +132,14 @@ void qtest_qmp_send(QTestState *s, const char *fmt, ...)
void qtest_qmp_send_raw(QTestState *s, const char *fmt, ...)
GCC_FMT_ATTR(2, 3);
+/**
+ * qtest_socket_server:
+ * @socket_path: the UNIX domain socket path
+ *
+ * Create and return a listen socket file descriptor, or abort on failure.
+ */
+int qtest_socket_server(const char *socket_path);
+
/**
* qtest_vqmp_fds:
* @s: #QTestState instance to operate on.
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index fd043b0570..b19d2ebda0 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -81,24 +81,8 @@ static void qtest_client_set_rx_handler(QTestState *s,
QTestRecvFn recv);
static int init_socket(const char *socket_path)
{
- struct sockaddr_un addr;
- int sock;
- int ret;
-
- sock = socket(PF_UNIX, SOCK_STREAM, 0);
- g_assert_cmpint(sock, !=, -1);
-
- addr.sun_family = AF_UNIX;
- snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", socket_path);
+ int sock = qtest_socket_server(socket_path);
qemu_set_cloexec(sock);
-
- do {
- ret = bind(sock, (struct sockaddr *)&addr, sizeof(addr));
- } while (ret == -1 && errno == EINTR);
- g_assert_cmpint(ret, !=, -1);
- ret = listen(sock, 1);
- g_assert_cmpint(ret, !=, -1);
-
return sock;
}
@@ -638,6 +622,28 @@ QDict *qtest_qmp_receive_dict(QTestState *s)
return qmp_fd_receive(s->qmp_fd);
}
+int qtest_socket_server(const char *socket_path)
+{
+ struct sockaddr_un addr;
+ int sock;
+ int ret;
+
+ sock = socket(PF_UNIX, SOCK_STREAM, 0);
+ g_assert_cmpint(sock, !=, -1);
+
+ addr.sun_family = AF_UNIX;
+ snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", socket_path);
+
+ do {
+ ret = bind(sock, (struct sockaddr *)&addr, sizeof(addr));
+ } while (ret == -1 && errno == EINTR);
+ g_assert_cmpint(ret, !=, -1);
+ ret = listen(sock, 1);
+ g_assert_cmpint(ret, !=, -1);
+
+ return sock;
+}
+
/**
* Allow users to send a message without waiting for the reply,
* in the case that they choose to discard all replies up until
--
2.29.2
- [PATCH v3 00/12] block/export: vhost-user-blk server tests and input validation, Stefan Hajnoczi, 2021/02/23
- [PATCH v3 04/12] libqtest: add qtest_remove_abrt_handler(), Stefan Hajnoczi, 2021/02/23
- [PATCH v3 09/12] block/export: fix vhost-user-blk export sector number calculation, Stefan Hajnoczi, 2021/02/23
- [PATCH v3 01/12] vhost-user-blk: fix blkcfg->num_queues endianness, Stefan Hajnoczi, 2021/02/23
- [PATCH v3 07/12] block/export: fix blk_size double byteswap, Stefan Hajnoczi, 2021/02/23
- [PATCH v3 02/12] libqtest: add qtest_socket_server(),
Stefan Hajnoczi <=
- [PATCH v3 03/12] libqtest: add qtest_kill_qemu(), Stefan Hajnoczi, 2021/02/23
- [PATCH v3 10/12] block/export: port virtio-blk discard/write zeroes input validation, Stefan Hajnoczi, 2021/02/23
- [PATCH v3 08/12] block/export: use VIRTIO_BLK_SECTOR_BITS, Stefan Hajnoczi, 2021/02/23
- [PATCH v3 12/12] block/export: port virtio-blk read/write range check, Stefan Hajnoczi, 2021/02/23
- [PATCH v3 06/12] tests/qtest: add multi-queue test case to vhost-user-blk-test, Stefan Hajnoczi, 2021/02/23
- [PATCH v3 11/12] vhost-user-blk-test: test discard/write zeroes invalid inputs, Stefan Hajnoczi, 2021/02/23
- [PATCH v3 05/12] test: new qTest case to test the vhost-user-blk-server, Stefan Hajnoczi, 2021/02/23