[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 41/51] qtest: add qtest_add_abrt_handler()
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v3 41/51] qtest: add qtest_add_abrt_handler() |
Date: |
Tue, 13 Oct 2015 16:26:08 +0200 |
From: Marc-André Lureau <address@hidden>
Allow a test to add abort handlers, use GHook for all handlers.
There is currently no way to remove a handler, but it could be
later added if needed.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
---
tests/libqtest.c | 37 ++++++++++++++++++++++++-------------
tests/libqtest.h | 2 ++
2 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 2a396ba..2069be1 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -48,6 +48,7 @@ struct QTestState
pid_t qemu_pid; /* our child QEMU process */
};
+static GHookList abrt_hooks;
static GList *qtest_instances;
static struct sigaction sigact_old;
@@ -111,10 +112,7 @@ static void kill_qemu(QTestState *s)
static void sigabrt_handler(int signo)
{
- GList *elem;
- for (elem = qtest_instances; elem; elem = elem->next) {
- kill_qemu(elem->data);
- }
+ g_hook_list_invoke(&abrt_hooks, FALSE);
}
static void setup_sigabrt_handler(void)
@@ -135,6 +133,23 @@ static void cleanup_sigabrt_handler(void)
sigaction(SIGABRT, &sigact_old, NULL);
}
+void qtest_add_abrt_handler(void (*fn), const void *data)
+{
+ GHook *hook;
+
+ /* Only install SIGABRT handler once */
+ if (!abrt_hooks.is_setup) {
+ g_hook_list_init(&abrt_hooks, sizeof(GHook));
+ setup_sigabrt_handler();
+ }
+
+ hook = g_hook_alloc(&abrt_hooks);
+ hook->func = fn;
+ hook->data = (void *)data;
+
+ g_hook_prepend(&abrt_hooks, hook);
+}
+
QTestState *qtest_init(const char *extra_args)
{
QTestState *s;
@@ -155,12 +170,7 @@ QTestState *qtest_init(const char *extra_args)
sock = init_socket(socket_path);
qmpsock = init_socket(qmp_socket_path);
- /* Only install SIGABRT handler once */
- if (!qtest_instances) {
- setup_sigabrt_handler();
- }
-
- qtest_instances = g_list_prepend(qtest_instances, s);
+ qtest_add_abrt_handler(kill_qemu, s);
s->qemu_pid = fork();
if (s->qemu_pid == 0) {
@@ -208,13 +218,14 @@ QTestState *qtest_init(const char *extra_args)
void qtest_quit(QTestState *s)
{
+ qtest_instances = g_list_remove(qtest_instances, s);
+ g_hook_destroy_link(&abrt_hooks, g_hook_find_data(&abrt_hooks, TRUE, s));
+
/* Uninstall SIGABRT handler on last instance */
- if (qtest_instances && !qtest_instances->next) {
+ if (!qtest_instances) {
cleanup_sigabrt_handler();
}
- qtest_instances = g_list_remove(qtest_instances, s);
-
kill_qemu(s);
close(s->fd);
close(s->qmp_fd);
diff --git a/tests/libqtest.h b/tests/libqtest.h
index 55bccbf..456d861 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -450,6 +450,8 @@ void qtest_add_data_func(const char *str, const void *data,
void (*fn));
g_free(path); \
} while (0)
+void qtest_add_abrt_handler(void (*fn), const void *data);
+
/**
* qtest_start:
* @args: other arguments to pass to QEMU
--
2.4.3
- [Qemu-devel] [PULL v3 51/51] doc: document ivshmem & hugepages, (continued)
- [Qemu-devel] [PULL v3 51/51] doc: document ivshmem & hugepages, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 12/51] ivshmem: limit maximum number of peers to G_MAXUINT16, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 14/51] ivshmem: allocate eventfds in resize_peers(), marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 27/51] ivshmem: add device description, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 13/51] ivshmem: simplify around increase_dynamic_storage(), marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 16/51] ivshmem: initialize max_peer to -1, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 32/51] util: const event_notifier_get_fd() argument, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 40/51] msix: implement pba write (but read-only), marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 39/51] contrib: remove unnecessary strdup(), marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 38/51] ivshmem: add check on protocol version in QEMU, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 41/51] qtest: add qtest_add_abrt_handler(),
marcandre . lureau <=
- [Qemu-devel] [PULL v3 46/51] ivshmem: add hostmem backend, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 45/51] ivshmem: use qemu_strtosz(), marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v3 49/51] ivshmem: use kvm irqfd for msi notifications, marcandre . lureau, 2015/10/15
- Re: [Qemu-devel] [PULL v3 00/51] Ivshmem patches, Peter Maydell, 2015/10/15