From nobody Sat Nov 15 11:14:12 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1753132480; cv=none; d=zohomail.com; s=zohoarc; b=QVWiR00e39UV0/0DHoiXS6BqN53S+g2QRcfeLNYKvrdMHEKjmcTSLLCyw8ms6Ivx0bJ5JTJTp8qdWZxQYfiUceGhsZp5PWGAwsumsR1te48NdiGoBpxCnM+aPCWg+mzIVD2rxhMQwdU/C/fDOjjEEwk8FkaSWZnHpqIcXZuhtX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753132480; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uk8NKd4+gRgRdG4zMBT9+q9cTI3rMlE9vhIyivkZwcw=; b=ZUlQ+C4Aq6/U+dxGwCD/wXabMwqzy3z2rZPVG93eYqkOHHniIgB+5iOPC0WEHERqlAouFzY+hffFAPezXMjmONIfK48qxcxPKpf345kPlJR++JAVUrWYa494oRTCFxN9BEXSwxlq1ztkE7V2JQjPXbc6kwxTqa3f5CZA/M8b5so= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1753132480873769.0907943700483; Mon, 21 Jul 2025 14:14:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1udxpz-0007jO-8q; Mon, 21 Jul 2025 17:14:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1udxlz-00049H-TT for qemu-devel@nongnu.org; Mon, 21 Jul 2025 17:10:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1udxlx-0007lO-Mg for qemu-devel@nongnu.org; Mon, 21 Jul 2025 17:10:11 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-656-vBOVCF_VMriDJ_c3lkf8jQ-1; Mon, 21 Jul 2025 17:10:04 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A85951800C38; Mon, 21 Jul 2025 21:10:02 +0000 (UTC) Received: from localhost (unknown [10.2.16.31]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8E6DE30001A4; Mon, 21 Jul 2025 21:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1753132208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uk8NKd4+gRgRdG4zMBT9+q9cTI3rMlE9vhIyivkZwcw=; b=Pl2v29DBbJ+IXy7Tx/SBpZnXzTyRi6I14z+a87tuXS1K6WeKhgJxUULCxDyByvb9ej+ixM rQwl+gr2VZC/6RheZwwc/TUQrcVT+m1pb8qooOv+Ms6kH+UEYiJ3pR2O2p4Jg7mW7z633C xB47LdphqLUzRWa3u3WQO8bLl0NmuU8= X-MC-Unique: vBOVCF_VMriDJ_c3lkf8jQ-1 X-Mimecast-MFC-AGG-ID: vBOVCF_VMriDJ_c3lkf8jQ_1753132203 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Aarushi Mehta , Stefano Garzarella , qemu-block@nongnu.org, Kevin Wolf , hibriansong@gmail.com, eblake@redhat.com, Paolo Bonzini , Fam Zheng , Hanna Reitz , Stefan Weil Subject: [PATCH v3 07/12] aio: add errp argument to aio_context_setup() Date: Mon, 21 Jul 2025 17:07:54 -0400 Message-ID: <20250721210759.179709-8-stefanha@redhat.com> In-Reply-To: <20250721210759.179709-1-stefanha@redhat.com> References: <20250721210759.179709-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.926, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1753132481669116600 Content-Type: text/plain; charset="utf-8" When aio_context_new() -> aio_context_setup() fails at startup it doesn't really matter whether errors are returned to the caller or the process terminates immediately. However, it is not acceptable to terminate when hotplugging --object iothread at runtime. Refactor aio_context_setup() so that errors can be propagated. The next commit will set errp when fdmon_io_uring_setup() fails. Suggested-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi Reviewed-by: Eric Blake --- include/block/aio.h | 3 ++- util/aio-posix.c | 2 +- util/aio-win32.c | 2 +- util/async.c | 7 ++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/block/aio.h b/include/block/aio.h index 2760f308f5..d919d7c8f4 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -718,10 +718,11 @@ void qemu_set_current_aio_context(AioContext *ctx); /** * aio_context_setup: * @ctx: the aio context + * @errp: error pointer * * Initialize the aio context. */ -void aio_context_setup(AioContext *ctx); +void aio_context_setup(AioContext *ctx, Error **errp); =20 /** * aio_context_destroy: diff --git a/util/aio-posix.c b/util/aio-posix.c index bebd9ce3a2..bbe470c145 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -718,7 +718,7 @@ bool aio_poll(AioContext *ctx, bool blocking) return progress; } =20 -void aio_context_setup(AioContext *ctx) +void aio_context_setup(AioContext *ctx, Error **errp) { ctx->fdmon_ops =3D &fdmon_poll_ops; ctx->epollfd =3D -1; diff --git a/util/aio-win32.c b/util/aio-win32.c index 34c4074133..4ba401ff92 100644 --- a/util/aio-win32.c +++ b/util/aio-win32.c @@ -419,7 +419,7 @@ bool aio_poll(AioContext *ctx, bool blocking) return progress; } =20 -void aio_context_setup(AioContext *ctx) +void aio_context_setup(AioContext *ctx, Error **errp) { } =20 diff --git a/util/async.c b/util/async.c index 34aaab4e9e..2bb7e1f3c1 100644 --- a/util/async.c +++ b/util/async.c @@ -577,6 +577,7 @@ static void co_schedule_bh_cb(void *opaque) =20 AioContext *aio_context_new(Error **errp) { + ERRP_GUARD(); int ret; AioContext *ctx; =20 @@ -590,7 +591,11 @@ AioContext *aio_context_new(Error **errp) goto fail; } =20 - aio_context_setup(ctx); + aio_context_setup(ctx, errp); + if (*errp) { + event_notifier_cleanup(&ctx->notifier); + goto fail; + } =20 g_source_set_can_recurse(&ctx->source, true); qemu_lockcnt_init(&ctx->list_lock); --=20 2.50.1