From nobody Fri Nov 22 11:47:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598886508; cv=none; d=zohomail.com; s=zohoarc; b=PF5Lob1hv3Vw8vO2todizaIBakBdJZBj2kTwgLBm+fPZ9UYbE2obUzNtGTMiNtYK2vhLGyeMu3P7AaYReyOiF0OlnGjNMHN0/ZcEx+ZKN80ny9MRGZtQG/g38dFfRgbbbHfyhj0IA2B04MMsGMBSMkn2lw39uFodzK42vl4hQW4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598886508; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DTPbw5Stpehj5o9nWR+nVRhC09lOXlzzSCGaNl5AOQ0=; b=lAJ87mnKwrE4zEDPbG//lF3UvCKHuLhy9OMRwO2/EXe0wgl9T58bHhghOi+TzFMU2gdbPugdIz+ckT7CxA/IUT4FVn+vUJb0D/R4z55Pi8+vvqUEWjlqFJcqwdeTr5A5jNjdsoeZjzASCX3q09R0F76HPNuLsv21zSbQVlEo88A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598886508213968.0594762348469; Mon, 31 Aug 2020 08:08:28 -0700 (PDT) Received: from localhost ([::1]:52216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kClQ2-0006p8-NZ for importer@patchew.org; Mon, 31 Aug 2020 11:08:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kClJv-0006ZD-8Y for qemu-devel@nongnu.org; Mon, 31 Aug 2020 11:02:07 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:45301 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kClJt-0004Xv-3u for qemu-devel@nongnu.org; Mon, 31 Aug 2020 11:02:06 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-184-_Xa-f0oUN1uuMCwURKgigw-1; Mon, 31 Aug 2020 11:01:56 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF9C18015DB; Mon, 31 Aug 2020 15:01:55 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64FB219C4F; Mon, 31 Aug 2020 15:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598886124; 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=DTPbw5Stpehj5o9nWR+nVRhC09lOXlzzSCGaNl5AOQ0=; b=KAlRG44g0nQQxxQ5uWSDZOciyn1eJwc+d0z2PYrT2Lh6TeJ1/6ZoEEDrBqXuxK7fbbN3nO qB/h9j+TDXUuvA2eJ/N4LTjurZUr7Z1lTWVDoWwEzflyJa3PJvhyxBHOXECcI6+oMVLpVM rmRhx/JmkP77gwxwXIHA7e6smiZFBc4= X-MC-Unique: _Xa-f0oUN1uuMCwURKgigw-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v4 7/9] scsi/scsi_bus: Add scsi_device_get Date: Mon, 31 Aug 2020 18:01:22 +0300 Message-Id: <20200831150124.206267-8-mlevitsk@redhat.com> In-Reply-To: <20200831150124.206267-1-mlevitsk@redhat.com> References: <20200831150124.206267-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 11:01:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Stefan Hajnoczi , Maxim Levitsky , 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-Type: text/plain; charset="utf-8" Add scsi_device_get which finds the scsi device and takes a reference to it. Suggested-by: Stefan Hajnoczi Signed-off-by: Maxim Levitsky --- hw/scsi/scsi-bus.c | 22 +++++++++++++++++----- include/hw/scsi/scsi.h | 1 + 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 7ceae2c92b..feab20b76d 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -52,7 +52,7 @@ static const TypeInfo scsi_bus_info =3D { static int next_scsi_bus; =20 static SCSIDevice *_scsi_device_find(SCSIBus *bus, int channel, int id, in= t lun, - bool include_unrealized) + bool include_unrealized, bool take_re= f) { BusChild *kid; SCSIDevice *retval =3D NULL; @@ -92,13 +92,22 @@ out: retval =3D NULL; } =20 + if (take_ref) { + object_ref(OBJECT(retval)); + } + rcu_read_unlock(); return retval; } =20 SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun) { - return _scsi_device_find(bus, channel, id, lun, false); + return _scsi_device_find(bus, channel, id, lun, false, false); +} + +SCSIDevice *scsi_device_get(SCSIBus *bus, int channel, int id, int lun) +{ + return _scsi_device_find(bus, channel, id, lun, false, true); } =20 static void scsi_device_realize(SCSIDevice *s, Error **errp) @@ -236,7 +245,8 @@ static void scsi_qdev_realize(DeviceState *qdev, Error = **errp) dev->lun =3D 0; } do { - d =3D _scsi_device_find(bus, dev->channel, ++id, dev->lun, tru= e); + d =3D _scsi_device_find(bus, dev->channel, ++id, dev->lun, + true, false); } while (d && d->lun =3D=3D dev->lun && id < bus->info->max_target= ); if (d && d->lun =3D=3D dev->lun) { error_setg(errp, "no free target"); @@ -246,7 +256,8 @@ static void scsi_qdev_realize(DeviceState *qdev, Error = **errp) } else if (dev->lun =3D=3D -1) { int lun =3D -1; do { - d =3D _scsi_device_find(bus, dev->channel, dev->id, ++lun, tru= e); + d =3D _scsi_device_find(bus, dev->channel, dev->id, ++lun, + true, false); } while (d && d->lun =3D=3D lun && lun < bus->info->max_lun); if (d && d->lun =3D=3D lun) { error_setg(errp, "no free lun"); @@ -254,7 +265,8 @@ static void scsi_qdev_realize(DeviceState *qdev, Error = **errp) } dev->lun =3D lun; } else { - d =3D _scsi_device_find(bus, dev->channel, dev->id, dev->lun, true= ); + d =3D _scsi_device_find(bus, dev->channel, dev->id, dev->lun, + true, false); assert(d); if (d->lun =3D=3D dev->lun && dev !=3D d) { error_setg(errp, "lun already used by '%s'", d->qdev.id); diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 2fc23e44ba..e939a81789 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -194,6 +194,7 @@ int scsi_device_get_sense(SCSIDevice *dev, uint8_t *buf= , int len, bool fixed); int scsi_SG_IO_FROM_DEV(BlockBackend *blk, uint8_t *cmd, uint8_t cmd_size, uint8_t *buf, uint8_t buf_size); SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int target, int lu= n); +SCSIDevice *scsi_device_get(SCSIBus *bus, int channel, int target, int lun= ); =20 /* scsi-generic.c. */ extern const SCSIReqOps scsi_generic_req_ops; --=20 2.26.2