From: Fei Li <shirley17fei@gmail.com>
To: qemu-devel@nongnu.org, shirley17fei@gmail.com
Cc: Markus Armbruster <armbru@redhat.com>,
Peter Xu <peterx@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PATCH v14 08/11] qemu_thread: supplement error handling for qemu_signalfd_compat
Date: Wed, 17 Jul 2019 10:33:07 +0800 [thread overview]
Message-ID: <20190717023310.197246-9-shirley17fei@gmail.com> (raw)
In-Reply-To: <20190717023310.197246-1-shirley17fei@gmail.com>
Set errno, do some cleanup, and return -1 to replace the temporary
&error_abort when failing to create sigwait_compat.
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Signed-off-by: Fei Li <shirley17fei@gmail.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
util/compatfd.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/util/compatfd.c b/util/compatfd.c
index caad10ae56..bd15464586 100644
--- a/util/compatfd.c
+++ b/util/compatfd.c
@@ -70,6 +70,7 @@ static int qemu_signalfd_compat(const sigset_t *mask)
struct sigfd_compat_info *info;
QemuThread thread;
int fds[2];
+ int ret;
info = malloc(sizeof(*info));
if (info == NULL) {
@@ -88,9 +89,15 @@ static int qemu_signalfd_compat(const sigset_t *mask)
memcpy(&info->mask, mask, sizeof(*mask));
info->fd = fds[1];
- /* TODO: let the further caller handle the error instead of abort() here */
- qemu_thread_create(&thread, "signalfd_compat", sigwait_compat,
- info, QEMU_THREAD_DETACHED, &error_abort);
+ ret = qemu_thread_create(&thread, "signalfd_compat", sigwait_compat,
+ info, QEMU_THREAD_DETACHED, NULL);
+ if (ret < 0) {
+ close(fds[0]);
+ close(fds[1]);
+ free(info);
+ errno = -ret;
+ return -1;
+ }
return fds[0];
}
--
2.11.0
next prev parent reply other threads:[~2019-07-17 2:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 2:32 [Qemu-devel] [PATCH v14 00/11] qemu_thread_create: propagate the error to callers to handle Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 01/11] qemu_thread: make qemu_thread_create() take Error ** argument Fei Li
2019-07-17 5:53 ` David Gibson
2019-07-17 12:27 ` Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 02/11] qemu_thread: supplement error handling for qemu_X_start_vcpu Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 03/11] qemu_thread: supplement error handling for qmp_dump_guest_memory Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 04/11] qemu_thread: supplement error handling for pci_edu_realize Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 05/11] qemu_thread: supplement error handling for h_resize_hpt_prepare Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 06/11] qemu_thread: supplement error handling for emulated_realize Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 07/11] qemu_thread: supplement error handling for iothread_complete Fei Li
2019-07-17 2:33 ` Fei Li [this message]
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 09/11] qemu_thread: supplement error handling for migration Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 10/11] qemu_thread: supplement error handling for vnc_start_worker_thread Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 11/11] qemu_thread: supplement error handling for touch_all_pages Fei Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190717023310.197246-9-shirley17fei@gmail.com \
--to=shirley17fei@gmail.com \
--cc=armbru@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=dgilbert@redhat.com \
--cc=kraxel@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).