From nobody Sun Nov 9 20:21:15 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=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551892041247204.56590749054897; Wed, 6 Mar 2019 09:07:21 -0800 (PST) Received: from localhost ([127.0.0.1]:36441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1a0j-00032L-QV for importer@patchew.org; Wed, 06 Mar 2019 12:07:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ZvZ-0008LK-Gd for qemu-devel@nongnu.org; Wed, 06 Mar 2019 12:01:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1ZvY-0003uF-G2 for qemu-devel@nongnu.org; Wed, 06 Mar 2019 12:01:57 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39864) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1ZvY-0003ns-74 for qemu-devel@nongnu.org; Wed, 06 Mar 2019 12:01:56 -0500 Received: by mail-wr1-x444.google.com with SMTP id l5so14237862wrw.6 for ; Wed, 06 Mar 2019 09:01:44 -0800 (PST) Received: from localhost.localdomain ([212.90.165.14]) by smtp.gmail.com with ESMTPSA id u13sm5653605wmf.3.2019.03.06.09.01.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 09:01:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1BHJA3KmgDWj1IovR8ZM8Nl1vcCZ2P28645oRyMREzc=; b=Vg3dl6t3efqQxrJ2CeUYoI0d/ZHcK+TnHaM0NkMVrLHQS47PmOjkJDqmlitpdk6V9f xH2Rr1wF5xUTpIGQTWTBetRw/y/SdvtZzhKNe+Fa0zaB+nlO/jFVFzPsFoi/MI5x6g14 rYCbPRDyu+lk/0vuAy4WdIXRYasGC9rNssv79b2Ytge0BAwp17fZuleMNxy5PBQ542KN LGo1nZHYQ+d2N86ISHCx0sbKRYnotcRAIi4iFcUUNBd2zFaK0P9RJNX3ezstfESVM4xk UtsU/dxd/IE1idJmVgEnOhfyOwUmLdmFmOME+tKTHUOdeoMU2j/o4GhWWl+KcyZgGqu6 xF6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1BHJA3KmgDWj1IovR8ZM8Nl1vcCZ2P28645oRyMREzc=; b=WXWX07YkwZQRO5UC/3NwG+ArpMvygkxna9NrUpaZJOec9EgYDFJsr5e2LuHS67bLzp IYtFsWC5nsF95QGwTn2SgkkF6XgMJMxtGTz4ME+zOv924zTBWksgxGHc1baZzJEoJWcV O2CnfIGFh0VXa4n3+X/34P1xzB+o73K9007puHUn9W93PJULBNDnaJRRvnhGJrFWuI7b /uHywjf0LCeZMAxJ10tMSP/GoX/0EAe6/FJRvQM/XEyVN9GnoXZ3dQq/j+t/XkchF7Sb DsaLLT4T3zFOYevwaMb/4Y0MvFW2mdU32xXsixjsrks9c7POwkTfEcFslCBeUTIib+Nn fXEA== X-Gm-Message-State: APjAAAXWx0dKSZIv4HFCcuZuI0EM1MOFetQZ2dOsaUHoq5rr55bYTR3b ZgrwUt2MK0JPp6Dd0zU/4N0+7hcz X-Google-Smtp-Source: APXvYqzCpmZ1rD7wdQDVjVjCnwEEi+H5yeN8wPVch/DrVtXtJiq34qgNoxkMHmxBrC4eywZVqL8AqA== X-Received: by 2002:a5d:6a88:: with SMTP id s8mr3722007wru.303.1551891703543; Wed, 06 Mar 2019 09:01:43 -0800 (PST) From: Anastasiia Rusakova X-Google-Original-From: Anastasiia Rusakova To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 19:00:25 +0200 Message-Id: <20190306170025.3830-1-rusakova.nastasia@icloud.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH] hw/block/virtio-blk: Clean req->dev repetitions 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: jusual@mail.ru, Anastasiia Rusakova , stefanha@redhat.com 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" From: Anastasiia Rusakova Some functions sometimes uses req->dev even though a local variable VirtIOBlock* s =3D req->dev has already been defined. Updated places to use s everywhere in the file. Signed-off-by: Anastasiia Rusakova --- hw/block/virtio-blk.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 0cc3c590b9..ab29eecd55 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -127,7 +127,7 @@ static void virtio_blk_rw_complete(void *opaque, int re= t) } =20 if (ret) { - int p =3D virtio_ldl_p(VIRTIO_DEVICE(req->dev), &req->out.type= ); + int p =3D virtio_ldl_p(VIRTIO_DEVICE(s), &req->out.type); bool is_read =3D !(p & VIRTIO_BLK_T_OUT); /* Note that memory may be dirtied on read failure. If the * virtio request is not completed here, as is the case for @@ -143,7 +143,7 @@ static void virtio_blk_rw_complete(void *opaque, int re= t) } =20 virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); - block_acct_done(blk_get_stats(req->dev->blk), &req->acct); + block_acct_done(blk_get_stats(s->blk), &req->acct); virtio_blk_free_request(req); } aio_context_release(blk_get_aio_context(s->conf.conf.blk)); @@ -260,9 +260,10 @@ static int virtio_blk_handle_scsi_req(VirtIOBlockReq *= req) { int status =3D VIRTIO_BLK_S_OK; struct virtio_scsi_inhdr *scsi =3D NULL; - VirtIODevice *vdev =3D VIRTIO_DEVICE(req->dev); + VirtIOBlock *s =3D req->dev; + VirtIODevice *vdev =3D VIRTIO_DEVICE(s); VirtQueueElement *elem =3D &req->elem; - VirtIOBlock *blk =3D req->dev; + VirtIOBlock *blk =3D s; =20 #ifdef __linux__ int i; @@ -492,16 +493,18 @@ static void virtio_blk_submit_multireq(BlockBackend *= blk, MultiReqBuffer *mrb) =20 static void virtio_blk_handle_flush(VirtIOBlockReq *req, MultiReqBuffer *m= rb) { - block_acct_start(blk_get_stats(req->dev->blk), &req->acct, 0, + VirtIOBlock *s =3D req->dev; + + block_acct_start(blk_get_stats(s->blk), &req->acct, 0, BLOCK_ACCT_FLUSH); =20 /* * Make sure all outstanding writes are posted to the backing device. */ if (mrb->is_write && mrb->num_reqs > 0) { - virtio_blk_submit_multireq(req->dev->blk, mrb); + virtio_blk_submit_multireq(s->blk, mrb); } - blk_aio_flush(req->dev->blk, virtio_blk_flush_complete, req); + blk_aio_flush(s->blk, virtio_blk_flush_complete, req); } =20 static bool virtio_blk_sect_range_ok(VirtIOBlock *dev, --=20 2.20.1