SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/block/virtio-blk: Replaces request free function with g_free

Browse Source 
The virtio_blk_free_request() function has been a 1-liner forwarding
to g_free() for a while now. We may as well call g_free on the request
pointer directly.

Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Tested-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-ID: <20241223221645.29911-14-phil@philjordan.eu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Phil Dennis-Jordan 2024-10-24 12:28:12 +02:00 committed by Philippe Mathieu-Daudé
parent 8c6619f3e6
commit 12ed6aca7c
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hw/block/virtio-blk.c
View File

@ -50,11 +50,6 @@ static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq,
req->mr_next = NULL; req->mr_next = NULL;
} }
static void virtio_blk_free_request(VirtIOBlockReq *req)
{
g_free(req);
}
static void virtio_blk_req_complete(VirtIOBlockReq *req, unsigned char status) static void virtio_blk_req_complete(VirtIOBlockReq *req, unsigned char status)
{ {
VirtIOBlock *s = req->dev; VirtIOBlock *s = req->dev;
@ -93,7 +88,7 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error,
if (acct_failed) { if (acct_failed) {
block_acct_failed(blk_get_stats(s->blk), &req->acct); block_acct_failed(blk_get_stats(s->blk), &req->acct);
} }
virtio_blk_free_request(req); g_free(req);
} }
blk_error_action(s->blk, action, is_read, error); blk_error_action(s->blk, action, is_read, error);
@ -136,7 +131,7 @@ static void virtio_blk_rw_complete(void *opaque, int ret)
virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); virtio_blk_req_complete(req, VIRTIO_BLK_S_OK);
block_acct_done(blk_get_stats(s->blk), &req->acct); block_acct_done(blk_get_stats(s->blk), &req->acct);
virtio_blk_free_request(req); g_free(req);
} }
} }
@ -151,7 +146,7 @@ static void virtio_blk_flush_complete(void *opaque, int ret)
virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); virtio_blk_req_complete(req, VIRTIO_BLK_S_OK);
block_acct_done(blk_get_stats(s->blk), &req->acct); block_acct_done(blk_get_stats(s->blk), &req->acct);
virtio_blk_free_request(req); g_free(req);
} }
static void virtio_blk_discard_write_zeroes_complete(void *opaque, int ret) static void virtio_blk_discard_write_zeroes_complete(void *opaque, int ret)
@ -169,7 +164,7 @@ static void virtio_blk_discard_write_zeroes_complete(void *opaque, int ret)
if (is_write_zeroes) { if (is_write_zeroes) {
block_acct_done(blk_get_stats(s->blk), &req->acct); block_acct_done(blk_get_stats(s->blk), &req->acct);
} }
virtio_blk_free_request(req); g_free(req);
} }
static VirtIOBlockReq *virtio_blk_get_request(VirtIOBlock *s, VirtQueue *vq) static VirtIOBlockReq *virtio_blk_get_request(VirtIOBlock *s, VirtQueue *vq)
@ -214,7 +209,7 @@ static void virtio_blk_handle_scsi(VirtIOBlockReq *req)
fail: fail:
virtio_blk_req_complete(req, status); virtio_blk_req_complete(req, status);
virtio_blk_free_request(req); g_free(req);
} }
static inline void submit_requests(VirtIOBlock *s, MultiReqBuffer *mrb, static inline void submit_requests(VirtIOBlock *s, MultiReqBuffer *mrb,
@ -612,7 +607,7 @@ static void virtio_blk_zone_report_complete(void *opaque, int ret)
out: out:
virtio_blk_req_complete(req, err_status); virtio_blk_req_complete(req, err_status);
virtio_blk_free_request(req); g_free(req);
g_free(data->zone_report_data.zones); g_free(data->zone_report_data.zones);
g_free(data); g_free(data);
} }
@ -661,7 +656,7 @@ static void virtio_blk_handle_zone_report(VirtIOBlockReq *req,
return; return;
out: out:
virtio_blk_req_complete(req, err_status); virtio_blk_req_complete(req, err_status);
virtio_blk_free_request(req); g_free(req);
} }
static void virtio_blk_zone_mgmt_complete(void *opaque, int ret) static void virtio_blk_zone_mgmt_complete(void *opaque, int ret)
@ -677,7 +672,7 @@ static void virtio_blk_zone_mgmt_complete(void *opaque, int ret)
} }
virtio_blk_req_complete(req, err_status); virtio_blk_req_complete(req, err_status);
virtio_blk_free_request(req); g_free(req);
} }
static int virtio_blk_handle_zone_mgmt(VirtIOBlockReq *req, BlockZoneOp op) static int virtio_blk_handle_zone_mgmt(VirtIOBlockReq *req, BlockZoneOp op)
@ -719,7 +714,7 @@ static int virtio_blk_handle_zone_mgmt(VirtIOBlockReq *req, BlockZoneOp op)
return 0; return 0;
out: out:
virtio_blk_req_complete(req, err_status); virtio_blk_req_complete(req, err_status);
virtio_blk_free_request(req); g_free(req);
return err_status; return err_status;
} }
@ -750,7 +745,7 @@ static void virtio_blk_zone_append_complete(void *opaque, int ret)
out: out:
virtio_blk_req_complete(req, err_status); virtio_blk_req_complete(req, err_status);
virtio_blk_free_request(req); g_free(req);
g_free(data); g_free(data);
} }
@ -788,7 +783,7 @@ static int virtio_blk_handle_zone_append(VirtIOBlockReq *req,
out: out:
virtio_blk_req_complete(req, err_status); virtio_blk_req_complete(req, err_status);
virtio_blk_free_request(req); g_free(req);
return err_status; return err_status;
} }
@ -855,7 +850,7 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb)
virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR); virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR);
block_acct_invalid(blk_get_stats(s->blk), block_acct_invalid(blk_get_stats(s->blk),
is_write ? BLOCK_ACCT_WRITE : BLOCK_ACCT_READ); is_write ? BLOCK_ACCT_WRITE : BLOCK_ACCT_READ);
virtio_blk_free_request(req); g_free(req);
return 0; return 0;
} }
@ -911,7 +906,7 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb)
VIRTIO_BLK_ID_BYTES)); VIRTIO_BLK_ID_BYTES));
iov_from_buf(in_iov, in_num, 0, serial, size); iov_from_buf(in_iov, in_num, 0, serial, size);
virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); virtio_blk_req_complete(req, VIRTIO_BLK_S_OK);
virtio_blk_free_request(req); g_free(req);
break; break;
} }
case VIRTIO_BLK_T_ZONE_APPEND & ~VIRTIO_BLK_T_OUT: case VIRTIO_BLK_T_ZONE_APPEND & ~VIRTIO_BLK_T_OUT:
@ -943,7 +938,7 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb)
if (unlikely(!(type & VIRTIO_BLK_T_OUT) || if (unlikely(!(type & VIRTIO_BLK_T_OUT) ||
out_len > sizeof(dwz_hdr))) { out_len > sizeof(dwz_hdr))) {
virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP); virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP);
virtio_blk_free_request(req); g_free(req);
return 0; return 0;
} }
@ -960,14 +955,14 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb)
is_write_zeroes); is_write_zeroes);
if (err_status != VIRTIO_BLK_S_OK) { if (err_status != VIRTIO_BLK_S_OK) {
virtio_blk_req_complete(req, err_status); virtio_blk_req_complete(req, err_status);
virtio_blk_free_request(req); g_free(req);
} }
break; break;
} }
default: default:
virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP); virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP);
virtio_blk_free_request(req); g_free(req);
} }
return 0; return 0;
} }
@ -988,7 +983,7 @@ void virtio_blk_handle_vq(VirtIOBlock *s, VirtQueue *vq)
while ((req = virtio_blk_get_request(s, vq))) { while ((req = virtio_blk_get_request(s, vq))) {
if (virtio_blk_handle_request(req, &mrb)) { if (virtio_blk_handle_request(req, &mrb)) {
virtqueue_detach_element(req->vq, &req->elem, 0); virtqueue_detach_element(req->vq, &req->elem, 0);
virtio_blk_free_request(req); g_free(req);
break; break;
} }
} }
@ -1038,7 +1033,7 @@ static void virtio_blk_dma_restart_bh(void *opaque)
while (req) { while (req) {
next = req->next; next = req->next;
virtqueue_detach_element(req->vq, &req->elem, 0); virtqueue_detach_element(req->vq, &req->elem, 0);
virtio_blk_free_request(req); g_free(req);
req = next; req = next;
} }
break; break;
@ -1121,7 +1116,7 @@ static void virtio_blk_reset(VirtIODevice *vdev)
/* No other threads can access req->vq here */ /* No other threads can access req->vq here */
virtqueue_detach_element(req->vq, &req->elem, 0); virtqueue_detach_element(req->vq, &req->elem, 0);
virtio_blk_free_request(req); g_free(req);
} }
} }