[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V2 1/2] tests/libqtest: Fix possible deadlock in qte
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH V2 1/2] tests/libqtest: Fix possible deadlock in qtest initialization |
Date: |
Tue, 11 Mar 2014 12:09:09 +0200 |
'socket_accept' waits for Qemu to init its unix socket.
If Qemu encounters an error during command line parsing,
it can exit before initializing the communication channel.
Using a timeout for sockets fixes the issue.
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
tests/libqtest.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index f587d36..f1ba254 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -34,6 +34,7 @@
#include "qapi/qmp/json-parser.h"
#define MAX_IRQ 256
+#define SOCKET_TIMEOUT 5
QTestState *global_qtest;
@@ -78,12 +79,16 @@ static int socket_accept(int sock)
struct sockaddr_un addr;
socklen_t addrlen;
int ret;
+ struct timeval timeout = { .tv_sec = SOCKET_TIMEOUT,
+ .tv_usec = 0 };
+
+ setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (void *)&timeout,
+ sizeof(timeout));
addrlen = sizeof(addr);
do {
ret = accept(sock, (struct sockaddr *)&addr, &addrlen);
} while (ret == -1 && errno == EINTR);
- g_assert_no_errno(ret);
close(sock);
return ret;
@@ -91,7 +96,7 @@ static int socket_accept(int sock)
static void kill_qemu(QTestState *s)
{
- if (s->qemu_pid != -1) {
+ if (s && s->qemu_pid != -1) {
kill(s->qemu_pid, SIGTERM);
waitpid(s->qemu_pid, NULL, 0);
}
@@ -153,6 +158,8 @@ QTestState *qtest_init(const char *extra_args)
g_free(socket_path);
g_free(qmp_socket_path);
+ g_assert(s->fd >= 0 && s->qmp_fd >= 0);
+
s->rx = g_string_new("");
for (i = 0; i < MAX_IRQ; i++) {
s->irq_level[i] = false;
--
1.8.3.1
[Qemu-devel] [PATCH V2 2/2] tests: Tweak the Makefile to produce per-test output., Marcel Apfelbaum, 2014/03/11