[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 2/7] hw/block/virtio-blk: Clean req->dev repetitions
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-block] [PULL 2/7] hw/block/virtio-blk: Clean req->dev repetitions |
Date: |
Fri, 8 Mar 2019 16:53:39 +0000 |
From: Anastasiia Rusakova <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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,
--
2.20.1
- [Qemu-block] [PULL 0/7] Block patches, Stefan Hajnoczi, 2019/03/08
- [Qemu-block] [PULL 1/7] MAINTAINERS: add missing support status fields, Stefan Hajnoczi, 2019/03/08
- [Qemu-block] [PULL 2/7] hw/block/virtio-blk: Clean req->dev repetitions,
Stefan Hajnoczi <=
- [Qemu-block] [PULL 3/7] iothread: replace init_done_cond with a semaphore, Stefan Hajnoczi, 2019/03/08
- [Qemu-block] [PULL 4/7] iothread: create the gcontext unconditionally, Stefan Hajnoczi, 2019/03/08
- [Qemu-block] [PULL 5/7] iothread: create main loop unconditionally, Stefan Hajnoczi, 2019/03/08
- [Qemu-block] [PULL 6/7] iothread: push gcontext earlier in the thread_fn, Stefan Hajnoczi, 2019/03/08
- [Qemu-block] [PULL 7/7] iothread: document about why we need explicit aio_poll(), Stefan Hajnoczi, 2019/03/08
- Re: [Qemu-block] [PULL 0/7] Block patches, Peter Maydell, 2019/03/09