From nobody Mon Feb 9 06:33:18 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547477312011374.8275841478471; Mon, 14 Jan 2019 06:48:32 -0800 (PST) Received: from localhost ([127.0.0.1]:44081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3XS-0004Wo-Q1 for importer@patchew.org; Mon, 14 Jan 2019 09:48:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3Ap-0001db-B4 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 09:25:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3Ao-0008Va-Du for qemu-devel@nongnu.org; Mon, 14 Jan 2019 09:25:07 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:52460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3An-0008LQ-Qj; Mon, 14 Jan 2019 09:25:06 -0500 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1gj3AV-0002jU-Vo; Mon, 14 Jan 2019 15:24:48 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1gj39z-00038C-5B; Mon, 14 Jan 2019 16:24:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=W7LVq02B3oJ0WAICRK2gxqTMWcXU/5rEQ6zaeITmus4=; b=eHXuBO4hRTmAkN7SHYDy/NAD2aXRt4DD1cLM9csOM7KkbtkUndwa1yKoR8dzvP1oqHhUHDXepoGsOMXYXlIpAfyTeNG1wwR5Q+2eX9ZSu2R3oJNSJ7bjLkdBydmmSKWvLPINMsPGPVMn33b5bK1nhPJWQnKKEhG/XCS/fkmZSbYBu4JFGyWaZfwTbpPPceg3cKxYqYdqX66M+6rz7g34Mdh0agmpgpJK7mvY1NmLdgqTqO5NNr3QhRAywwbYZt9WKGy87iVVcpj9Vw8WuS7QiMOnvjgSscoH5A1g3c4UwMX80wiupEAE+8GRRX1/MlsoJXVILXL1zJn5iVh8n7niig==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 16:24:03 +0200 Message-Id: <8bb7fd0e9188316446270873e10d6049b9a7d358.1547475602.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH v2 5/6] block: Acquire the AioContext in ide_dev_initfn() 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: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , Stefan Hajnoczi , Paolo Bonzini 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" Signed-off-by: Alberto Garcia --- hw/ide/qdev.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 573b022e1e..f355f2a352 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -160,6 +160,7 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind= kind, Error **errp) { IDEBus *bus =3D DO_UPCAST(IDEBus, qbus, dev->qdev.parent_bus); IDEState *s =3D bus->ifs + dev->unit; + AioContext *ctx; int ret; =20 if (!dev->conf.blk) { @@ -174,36 +175,39 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKi= nd kind, Error **errp) } } =20 + ctx =3D blk_get_aio_context(dev->conf.blk); + aio_context_acquire(ctx); + if (dev->conf.discard_granularity =3D=3D -1) { dev->conf.discard_granularity =3D 512; } else if (dev->conf.discard_granularity && dev->conf.discard_granularity !=3D 512) { error_setg(errp, "discard_granularity must be 512 for ide"); - return; + goto out; } =20 blkconf_blocksizes(&dev->conf); if (dev->conf.logical_block_size !=3D 512) { error_setg(errp, "logical_block_size must be 512 for IDE"); - return; + goto out; } =20 if (kind !=3D IDE_CD) { if (!blkconf_geometry(&dev->conf, &dev->chs_trans, 65535, 16, 255, errp)) { - return; + goto out; } } if (!blkconf_apply_backend_options(&dev->conf, kind =3D=3D IDE_CD, kind !=3D IDE_CD, errp)) { - return; + goto out; } =20 if (ide_init_drive(s, dev->conf.blk, kind, dev->version, dev->serial, dev->model, dev->wwn, dev->conf.cyls, dev->conf.heads, dev->conf.secs, dev->chs_trans, errp) < 0) { - return; + goto out; } =20 if (!dev->version) { @@ -215,6 +219,9 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind= kind, Error **errp) =20 add_boot_device_path(dev->conf.bootindex, &dev->qdev, dev->unit ? "/disk@1" : "/disk@0"); + +out: + aio_context_release(ctx); } =20 static void ide_dev_get_bootindex(Object *obj, Visitor *v, const char *nam= e, --=20 2.11.0