From patchwork Thu Mar 7 16:19:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anastasiia Rusakova X-Patchwork-Id: 10843315 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 78E3314DE for ; Thu, 7 Mar 2019 16:24:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65D7F2F5DC for ; Thu, 7 Mar 2019 16:24:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 596392F554; Thu, 7 Mar 2019 16:24:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E36AC2F5F8 for ; Thu, 7 Mar 2019 16:24:00 +0000 (UTC) Received: from localhost ([127.0.0.1]:54838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1voN-0000te-Uh for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Mar 2019 11:23:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1vkG-00068n-Es for qemu-devel@nongnu.org; Thu, 07 Mar 2019 11:19:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1vkE-0008H1-HQ for qemu-devel@nongnu.org; Thu, 07 Mar 2019 11:19:44 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1vkA-00087l-US for qemu-devel@nongnu.org; Thu, 07 Mar 2019 11:19:39 -0500 Received: by mail-wr1-x444.google.com with SMTP id r5so18119154wrg.9 for ; Thu, 07 Mar 2019 08:19:34 -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=aNVrZq/rG804SVF3E8dJpAD6xCZZYM5/cuMvBvD9NlY=; b=F0XvlQdc2sqP4KjOVJNJ5/3suhWF1HGOJTNvV0I1IV6gqkf+U9ZSzr+QVivXm7zsii S5WWTHlxkAevvvHVtQAh6XsZorazZe+lVFzojVTOZSGzWJYDFDg2INM9+upBb5x6ra2R OYoGxU7B+N8Pv2THivP6N4ERdn4ke8gn/8EVm/u7DCgN7aUcq5xMtM5Ewn+MdFYhXlFs EU+7PbYeRFQRlbsFUhVUuAAHU0abamd9/lVNYpi42V5Ao9WsdoV3xzFmqDR0pdC8eC+q dFXarkbNoMYjwf2Z6TY28v+m/1uBhwSpu8Z39vwZBulLwlQRtVsALxMQXbcaE9YNWE4L fOZw== 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=aNVrZq/rG804SVF3E8dJpAD6xCZZYM5/cuMvBvD9NlY=; b=j3LP1xl/AE6/26FYnV3oxp9JEa+5FAaknxeC1VJ+qLrq4ylynESt3ZiXI8l95JYrh5 bVvPKMHF1ZAjPTVpwLfguMwsBCI9ypmusHCNsFHgtojsFRZyXLlcyZW1m5j5MeCGTtyj FfrRturzVEUdY8XLkyF3OXAKHNsoZaKjX8xjqT8rtk12Brm9uLRueRUN2c4RBI70q6TO BfGR1oyAFolLqwg3elA2cxBRzwdebg9RQ3pD7FTDT8dhhyO72xZLB5hMcnzxVC+neyKz YxW+fLBA7gHrRDu/8sUrVpkFe3uVR33+423iE8Z8ieJtoQMXJf9cGb4JdWnKSCLmUyhu 5TZQ== X-Gm-Message-State: APjAAAWA+D/gES/+0Up7hHlyZShlL9GOpY2AjR5VN0aABeLhNEEHZTfP fpdIMsnTSuSKkxgOWXhzv9f+A0Dj X-Google-Smtp-Source: APXvYqw13hbxGDj0rN65Ttw8rHK2caTab6kHW2XLJPv22ab5XwbkT/dUGWbIZXWSZuKofNirBqPmMw== X-Received: by 2002:adf:b651:: with SMTP id i17mr2551881wre.108.1551975572161; Thu, 07 Mar 2019 08:19:32 -0800 (PST) Received: from localhost.localdomain ([212.90.165.14]) by smtp.gmail.com with ESMTPSA id 132sm6924898wmd.30.2019.03.07.08.19.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 08:19:31 -0800 (PST) From: Anastasiia Rusakova X-Google-Original-From: Anastasiia Rusakova To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 18:19:25 +0200 Message-Id: <20190307161925.4158-1-rusakova.nastasia@icloud.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 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 v2] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Anastasiia Rusakova Some functions sometimes uses req->dev even though a local variable VirtIOBlock* s = 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 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 0cc3c590b9..06e57a4d39 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 ret) } if (ret) { - int p = virtio_ldl_p(VIRTIO_DEVICE(req->dev), &req->out.type); + int p = virtio_ldl_p(VIRTIO_DEVICE(s), &req->out.type); bool is_read = !(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 ret) } 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,9 @@ static int virtio_blk_handle_scsi_req(VirtIOBlockReq *req) { int status = VIRTIO_BLK_S_OK; struct virtio_scsi_inhdr *scsi = NULL; - VirtIODevice *vdev = VIRTIO_DEVICE(req->dev); - VirtQueueElement *elem = &req->elem; VirtIOBlock *blk = req->dev; + VirtIODevice *vdev = VIRTIO_DEVICE(blk); + VirtQueueElement *elem = &req->elem; #ifdef __linux__ int i; @@ -492,16 +492,18 @@ static void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb) static void virtio_blk_handle_flush(VirtIOBlockReq *req, MultiReqBuffer *mrb) { - block_acct_start(blk_get_stats(req->dev->blk), &req->acct, 0, + VirtIOBlock *s = req->dev; + + block_acct_start(blk_get_stats(s->blk), &req->acct, 0, BLOCK_ACCT_FLUSH); /* * 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); } static bool virtio_blk_sect_range_ok(VirtIOBlock *dev,