From nobody Mon Feb 9 12:42:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633460300; cv=none; d=zohomail.com; s=zohoarc; b=G9BaSgaTrQv30c+mAFct+BRWND8fTg5q0ZirlXJRGC/q6Yy1614byrOhiPop51qfG8V7V2wSTuc+nf+LSgrdaB4UBdhcmh8zprO01DXYJDnI6Cy8aj8p0TFlPwvMhglqV8IW1hfCrec5gknqsIPeqrLoASzEXjv3aph87Wrug/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633460300; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/l+iPsFyRbttZ9o4aXnxrKdZE8dURbTJQ5ld8MPAwxM=; b=PclY4DH/jeVFxFj/C0p/3tIlbYSJSQD7fCQlSZI0OQ9tBZpu8kzJQk7rTWFWb2hImmt44VxvcHwylfXoys9mrUNN74adwY5rDadZfYEb610EWaytAcXvTi9ibA4UjL1fPwYnSflU8h9T7evgl0wYeKd4H+obC+csXHrv5Gn+DD0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1633460300573917.8610627968695; Tue, 5 Oct 2021 11:58:20 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-517-JGJif8-RMi2S3I00jIgMaA-1; Tue, 05 Oct 2021 14:58:18 -0400 Received: by mail-wr1-f72.google.com with SMTP id c2-20020adfa302000000b0015e4260febdso69746wrb.20 for ; Tue, 05 Oct 2021 11:58:18 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id k128sm3020741wme.41.2021.10.05.11.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 11:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633460299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/l+iPsFyRbttZ9o4aXnxrKdZE8dURbTJQ5ld8MPAwxM=; b=Ks6t+r+0xhweM0DhqwcrEw5e0d9UnAg7QP44SrlDTyNyizkokTXeDm6zdVf7TQhFNXClvg UtdWDiyWsNWEUHQBoDaT5zW2rw/4ix4oRwGXSh8Q1yAdUvFi15JUZu62KVKutE3RtQWXA3 ZwWNhzfl1pu+aThwwaUFicvor/2OUPk= X-MC-Unique: JGJif8-RMi2S3I00jIgMaA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/l+iPsFyRbttZ9o4aXnxrKdZE8dURbTJQ5ld8MPAwxM=; b=wxl39Eg76y4QPICcoi9z6YPGIO6wGgTVGfElNp32exSwKWtwVN4NC/CFjDiY5qqk6Q aog3UuCMYuFaMmYmoMsou9TnJOH7QkZb0cPF8ss6j1knn1qCUvpLRvMr2o3s8QMV9z1I iqcxyRHes6KWLSc9EyQrP6JhAiG1oVzd0qlPoMuvX4km4rphO3frLvxw8oXZGxvJLOq3 StXZiBFWk6lDAu33redkORLPa+4tIeyd3upifX7d3O2Ot6gQJtr3npkxivQvsbEMvucH pKpBbxiDTnnbIeOkc5MjCJ2jbg/l0n7DZgArnVWYdt6DhComnI/V+LIxBkEuIFcXrQee 5UZw== X-Gm-Message-State: AOAM530MO94mXgvsooXrWTyHSkV4YpGmmQj4FbcAJNby9Cr8bMi7Igm/ Ln4iTnkC4aR+KHh6+Bo3QnpQPdp/GIq8Wd4aqzJ6j8dU/WXLkf676+JCH8hcQrlzNEWGv4irdhb ontMtPTpCXMZQ9w== X-Received: by 2002:a7b:cb49:: with SMTP id v9mr5161641wmj.76.1633460297561; Tue, 05 Oct 2021 11:58:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/WOij0B7vKYjkaYr9RjdMJscd/g/HhX+NhQVooN2vCuHpKCTMULPRmmyt2cuPyL5QOyySyg== X-Received: by 2002:a7b:cb49:: with SMTP id v9mr5161627wmj.76.1633460297427; Tue, 05 Oct 2021 11:58:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr . David Alan Gilbert" , Vladimir Sementsov-Ogievskiy , Kevin Wolf , Stefan Hajnoczi , "Michael S. Tsirkin" , Fam Zheng , Hanna Reitz , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 2/4] hw/scsi/scsi-disk: Use automatic AIO context lock Date: Tue, 5 Oct 2021 20:58:05 +0200 Message-Id: <20211005185807.4134557-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211005185807.4134557-1-philmd@redhat.com> References: <20211005185807.4134557-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633460301477100001 Use the automatic AIO context acquire/release in scsi_block_realize(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/scsi-disk.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index e8a547dbb7d..fa2d8543718 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2605,7 +2605,6 @@ static int get_device_type(SCSIDiskState *s) static void scsi_block_realize(SCSIDevice *dev, Error **errp) { SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, dev); - AioContext *ctx; int sg_version; int rc; =20 @@ -2620,8 +2619,7 @@ static void scsi_block_realize(SCSIDevice *dev, Error= **errp) "be removed in a future version"); } =20 - ctx =3D blk_get_aio_context(s->qdev.conf.blk); - aio_context_acquire(ctx); + AIO_CONTEXT_ACQUIRE_GUARD(blk_get_aio_context(dev->conf.blk)); =20 /* check we are using a driver managing SG_IO (version 3 and after) */ rc =3D blk_ioctl(s->qdev.conf.blk, SG_GET_VERSION_NUM, &sg_version); @@ -2630,18 +2628,18 @@ static void scsi_block_realize(SCSIDevice *dev, Err= or **errp) if (rc !=3D -EPERM) { error_append_hint(errp, "Is this a SCSI device?\n"); } - goto out; + return; } if (sg_version < 30000) { error_setg(errp, "scsi generic interface too old"); - goto out; + return; } =20 /* get device type from INQUIRY data */ rc =3D get_device_type(s); if (rc < 0) { error_setg(errp, "INQUIRY failed"); - goto out; + return; } =20 /* Make a guess for the block size, we'll fix it when the guest sends. @@ -2661,9 +2659,6 @@ static void scsi_block_realize(SCSIDevice *dev, Error= **errp) =20 scsi_realize(&s->qdev, errp); scsi_generic_read_device_inquiry(&s->qdev); - -out: - aio_context_release(ctx); } =20 typedef struct SCSIBlockReq { --=20 2.31.1