From patchwork Mon Jan 28 14:22:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fei X-Patchwork-Id: 1031956 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="fQVg4Vt4"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43pBlF5Hj2z9s9h for ; Tue, 29 Jan 2019 01:26:33 +1100 (AEDT) Received: from localhost ([127.0.0.1]:32819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go7rr-00070I-Jt for incoming@patchwork.ozlabs.org; Mon, 28 Jan 2019 09:26:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go7oD-0004OI-2k for qemu-devel@nongnu.org; Mon, 28 Jan 2019 09:22:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1go7oB-00028z-66 for qemu-devel@nongnu.org; Mon, 28 Jan 2019 09:22:44 -0500 Received: from m15-113.126.com ([220.181.15.113]:56550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go7oA-00026W-2R for qemu-devel@nongnu.org; Mon, 28 Jan 2019 09:22:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=6UR9tnuQZqLsb5/GPe fc24GUMsm4aq66VCQ/dUGxEHw=; b=fQVg4Vt4lz55jfs+Xe7CBSiKEt1Z1deXlg ivPvKrOhQ/mlMjsUW4ivYGwXj1/B5AWvjxIEeR389z3jvhvd3YZy7BpubqTQ0qoZ BjSQ1G9AymO0cKUVbGaPdQNzHNEc4ZGPSFdR3DJqnmv/iizX0gkgnkm1cYE4+HQe dFwIPR1DY= Received: from localhost.bytedance.net (unknown [220.243.134.156]) by smtp3 (Coremail) with SMTP id DcmowADH+GMaEE9cOLrfBQ--.47653S2; Mon, 28 Jan 2019 22:22:19 +0800 (CST) From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Mon, 28 Jan 2019 22:22:08 +0800 Message-Id: <20190128142217.12979-1-lifei1214@126.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) X-CM-TRANSID: DcmowADH+GMaEE9cOLrfBQ--.47653S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFyDWr1fKrWxtr1rGw45Wrg_yoW8tFyDpr yDW390qr97Zr1DAws3JayDZr15Zr10qF47CryFy3W8AwnruwsxXrW0ka42gFsIkas5trZ5 ZrWDtFW5G398AFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jqOJnUUUUU= X-Originating-IP: [220.243.134.156] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbitBBKIVpD7ygdfQABsw X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.15.113 Subject: [Qemu-devel] [PATCH for-4.0 07/11] qemu_thread: supplement error handling for iothread_complete X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Peter Xu , "Dr . David Alan Gilbert" , Fei Li , Gerd Hoffmann , Stefan Hajnoczi , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fei Li For iothread_complete: utilize the existed errp to propagate the error and do the corresponding cleanup to replace the temporary &error_abort. Cc: Markus Armbruster Cc: Stefan Hajnoczi Cc: Eric Blake Signed-off-by: Fei Li --- iothread.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/iothread.c b/iothread.c index 8e8aa01999..ea2e553dc5 100644 --- a/iothread.c +++ b/iothread.c @@ -148,6 +148,7 @@ static void iothread_complete(UserCreatable *obj, Error **errp) Error *local_error = NULL; IOThread *iothread = IOTHREAD(obj); char *name, *thread_name; + int thread_ok; iothread->stopping = false; iothread->running = true; @@ -164,9 +165,7 @@ static void iothread_complete(UserCreatable *obj, Error **errp) &local_error); if (local_error) { error_propagate(errp, local_error); - aio_context_unref(iothread->ctx); - iothread->ctx = NULL; - return; + goto fail; } qemu_mutex_init(&iothread->init_done_lock); @@ -178,11 +177,15 @@ static void iothread_complete(UserCreatable *obj, Error **errp) */ name = object_get_canonical_path_component(OBJECT(obj)); thread_name = g_strdup_printf("IO %s", name); - /* TODO: let the further caller handle the error instead of abort() here */ - qemu_thread_create(&iothread->thread, thread_name, iothread_run, - iothread, QEMU_THREAD_JOINABLE, &error_abort); + thread_ok = qemu_thread_create(&iothread->thread, thread_name, iothread_run, + iothread, QEMU_THREAD_JOINABLE, errp); g_free(thread_name); g_free(name); + if (thread_ok < 0) { + qemu_cond_destroy(&iothread->init_done_cond); + qemu_mutex_destroy(&iothread->init_done_lock); + goto fail; + } /* Wait for initialization to complete */ qemu_mutex_lock(&iothread->init_done_lock); @@ -191,6 +194,10 @@ static void iothread_complete(UserCreatable *obj, Error **errp) &iothread->init_done_lock); } qemu_mutex_unlock(&iothread->init_done_lock); + return; +fail: + aio_context_unref(iothread->ctx); + iothread->ctx = NULL; } typedef struct {