From nobody Fri Nov 7 19:59:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=126.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548687311891938.535243711894; Mon, 28 Jan 2019 06:55:11 -0800 (PST) Received: from localhost ([127.0.0.1]:60916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go7ju-0000UM-Ik for importer@patchew.org; Mon, 28 Jan 2019 09:18:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go7hh-0007UM-L2 for qemu-devel@nongnu.org; Mon, 28 Jan 2019 09:16:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1go7hb-0007GZ-P1 for qemu-devel@nongnu.org; Mon, 28 Jan 2019 09:16:01 -0500 Received: from m15-113.126.com ([220.181.15.113]:49513) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go7hX-00075o-L7 for qemu-devel@nongnu.org; Mon, 28 Jan 2019 09:15:52 -0500 Received: from localhost.bytedance.net (unknown [220.243.134.156]) by smtp3 (Coremail) with SMTP id DcmowAC3b2NsDk9cbAzfBQ--.20895S9; Mon, 28 Jan 2019 22:15:12 +0800 (CST) 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=Wrt3qbtpOapUWKTv0NlUYBmWkXMl2aXAAb h4UYiZWv3eWk/8Tcs7hSkBvJpbLNTANhSe5cWWpHhzJ3rJ5G02bAusLM0kKzsf7u Muwgzd0zLVBJgXj4Ia1EiyuKgk8TMKSBUqWZk/L1wlZqx34jiBPnyOIeSbKmK4CX qaJqh1iQk= From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Mon, 28 Jan 2019 22:14:50 +0800 Message-Id: <20190128141506.12731-8-lifei1214@126.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20190128141506.12731-1-lifei1214@126.com> References: <20190128141506.12731-1-lifei1214@126.com> X-CM-TRANSID: DcmowAC3b2NsDk9cbAzfBQ--.20895S9 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFyDWr1fKrWxtr1rGw45Wrg_yoW8tFyDpr yDW390qr97Zr1DAws3JayDZr15Zr10qF47CryFy3W8AwnruwsxXrW0ka42gFsIkas5trZ5 ZrWDtFW5G398AFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j66wZUUUUU= X-Originating-IP: [220.243.134.156] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbitBBKIVpD7ygdfQAAsx 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =3D NULL; IOThread *iothread =3D IOTHREAD(obj); char *name, *thread_name; + int thread_ok; =20 iothread->stopping =3D false; iothread->running =3D 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 =3D NULL; - return; + goto fail; } =20 qemu_mutex_init(&iothread->init_done_lock); @@ -178,11 +177,15 @@ static void iothread_complete(UserCreatable *obj, Err= or **errp) */ name =3D object_get_canonical_path_component(OBJECT(obj)); thread_name =3D g_strdup_printf("IO %s", name); - /* TODO: let the further caller handle the error instead of abort() he= re */ - qemu_thread_create(&iothread->thread, thread_name, iothread_run, - iothread, QEMU_THREAD_JOINABLE, &error_abort); + thread_ok =3D qemu_thread_create(&iothread->thread, thread_name, iothr= ead_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; + } =20 /* Wait for initialization to complete */ qemu_mutex_lock(&iothread->init_done_lock); @@ -191,6 +194,10 @@ static void iothread_complete(UserCreatable *obj, Erro= r **errp) &iothread->init_done_lock); } qemu_mutex_unlock(&iothread->init_done_lock); + return; +fail: + aio_context_unref(iothread->ctx); + iothread->ctx =3D NULL; } =20 typedef struct { --=20 2.17.2 (Apple Git-113)