From patchwork Fri Feb 1 05:18:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fei X-Patchwork-Id: 1034579 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="ME8E9L6l"; 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 43rQQG70Gnz9sDr for ; Fri, 1 Feb 2019 16:19:34 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpREi-0003fx-VZ for incoming@patchwork.ozlabs.org; Fri, 01 Feb 2019 00:19:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpRDo-0003fF-Nq for qemu-devel@nongnu.org; Fri, 01 Feb 2019 00:18:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpRDl-0007nP-8m for qemu-devel@nongnu.org; Fri, 01 Feb 2019 00:18:34 -0500 Received: from m50-111.126.com ([123.125.50.111]:54031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpRDe-0007m6-0J for qemu-devel@nongnu.org; Fri, 01 Feb 2019 00:18:31 -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=ME8E9L6ljpjuatklHisxCkGcRKrC5t9+gD iFeGkYdjnEB4fZsNTwzZPWYd/AfsFgzw0DHbrW7O70Xi3lqVD30Rzb0FqviCDk5b vToNL/PXNkk0X9XRaXQCOD+SKXvE1rVka+Q/fg2R9fdr1Akxjs4Phq4rBOwiCv9o /Nzh+xgMM= Received: from bogon.bytedance.net (unknown [120.52.147.46]) by smtp5 (Coremail) with SMTP id jtKowABXEaSW1lNcujAMAA--.154S9; Fri, 01 Feb 2019 13:18:21 +0800 (CST) From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Fri, 1 Feb 2019 13:18:02 +0800 Message-Id: <20190201051806.53183-8-lifei1214@126.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20190201051806.53183-1-lifei1214@126.com> References: <20190201051806.53183-1-lifei1214@126.com> X-CM-TRANSID: jtKowABXEaSW1lNcujAMAA--.154S9 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFyDWr1fKrWxtr1rGw45Wrg_yoW8tFyDpr yDW390qr97Zr1DAws3JayDZr15Zr10qF47CryFy3W8AwnruwsxXrW0ka42gFsIkas5trZ5 ZrWDtFW5G398AFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jp2NtUUUUU= X-Originating-IP: [120.52.147.46] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbiaR1OIVpD7p5+jgAAsC X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.111 Subject: [Qemu-devel] [PATCH v11 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: Fei Li , Markus Armbruster , Stefan Hajnoczi 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 Reviewed-by: Markus Armbruster --- 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 {