OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtio-blk: Replace VirtIOBlockRequest with VirtIOBlockReq

Browse Source 
Field "inhdr" is added temporarily for a more mechanical change, and
will be dropped in the next commit.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2014-06-11 12:11:46 +08:00 committed by Kevin Wolf
parent 98e2d49241
commit 04af2d70c5
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/block/dataplane/virtio-blk.c
View File

@ -24,13 +24,6 @@
#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-bus.h"
#include "qom/object_interfaces.h" #include "qom/object_interfaces.h"
typedef struct {
VirtIOBlockDataPlane *s;
QEMUIOVector *inhdr; /* iovecs for virtio_blk_inhdr */
VirtQueueElement *elem; /* saved data from the virtqueue */
QEMUIOVector qiov; /* original request iovecs */
} VirtIOBlockRequest;
struct VirtIOBlockDataPlane { struct VirtIOBlockDataPlane {
bool started; bool started;
bool starting; bool starting;
@ -68,7 +61,7 @@ static void notify_guest(VirtIOBlockDataPlane *s)
static void complete_rdwr(void *opaque, int ret) static void complete_rdwr(void *opaque, int ret)
{ {
VirtIOBlockRequest *req = opaque; VirtIOBlockReq *req = opaque;
struct virtio_blk_inhdr hdr; struct virtio_blk_inhdr hdr;
int len; int len;
@ -80,7 +73,8 @@ static void complete_rdwr(void *opaque, int ret)
len = 0; len = 0;
} }
trace_virtio_blk_data_plane_complete_request(req->s, req->elem->index, ret); trace_virtio_blk_data_plane_complete_request(req->dev->dataplane,
req->elem->index, ret);
qemu_iovec_from_buf(req->inhdr, 0, &hdr, sizeof(hdr)); qemu_iovec_from_buf(req->inhdr, 0, &hdr, sizeof(hdr));
qemu_iovec_destroy(req->inhdr); qemu_iovec_destroy(req->inhdr);
@ -90,9 +84,9 @@ static void complete_rdwr(void *opaque, int ret)
* written to, but for virtio-blk it seems to be the number of bytes * written to, but for virtio-blk it seems to be the number of bytes
* transferred plus the status bytes. * transferred plus the status bytes.
*/ */
vring_push(&req->s->vring, req->elem, len + sizeof(hdr)); vring_push(&req->dev->dataplane->vring, req->elem, len + sizeof(hdr));
notify_guest(req->s); notify_guest(req->dev->dataplane);
g_slice_free(VirtIOBlockRequest, req); g_slice_free(VirtIOBlockReq, req);
} }
static void complete_request_early(VirtIOBlockDataPlane *s, VirtQueueElement *elem, static void complete_request_early(VirtIOBlockDataPlane *s, VirtQueueElement *elem,
@ -128,14 +122,15 @@ static void do_rdwr_cmd(VirtIOBlockDataPlane *s, bool read,
int64_t sector_num, VirtQueueElement *elem, int64_t sector_num, VirtQueueElement *elem,
QEMUIOVector *inhdr) QEMUIOVector *inhdr)
{ {
VirtIOBlockRequest *req = g_slice_new0(VirtIOBlockRequest); VirtIOBlock *dev = VIRTIO_BLK(s->vdev);
VirtIOBlockReq *req = g_slice_new0(VirtIOBlockReq);
QEMUIOVector *qiov; QEMUIOVector *qiov;
int nb_sectors; int nb_sectors;
/* Fill in virtio block metadata needed for completion */ /* Fill in virtio block metadata needed for completion */
req->s = s;
req->elem = elem; req->elem = elem;
req->inhdr = inhdr; req->inhdr = inhdr;
req->dev = dev;
qemu_iovec_init_external(&req->qiov, iov, iov_cnt); qemu_iovec_init_external(&req->qiov, iov, iov_cnt);
qiov = &req->qiov; qiov = &req->qiov;
@ -153,7 +148,7 @@ static void do_rdwr_cmd(VirtIOBlockDataPlane *s, bool read,
static void complete_flush(void *opaque, int ret) static void complete_flush(void *opaque, int ret)
{ {
VirtIOBlockRequest *req = opaque; VirtIOBlockReq *req = opaque;
unsigned char status; unsigned char status;
if (ret == 0) { if (ret == 0) {
@ -162,15 +157,16 @@ static void complete_flush(void *opaque, int ret)
status = VIRTIO_BLK_S_IOERR; status = VIRTIO_BLK_S_IOERR;
} }
complete_request_early(req->s, req->elem, req->inhdr, status); complete_request_early(req->dev->dataplane, req->elem, req->inhdr, status);
g_slice_free(VirtIOBlockRequest, req); g_slice_free(VirtIOBlockReq, req);
} }
static void do_flush_cmd(VirtIOBlockDataPlane *s, VirtQueueElement *elem, static void do_flush_cmd(VirtIOBlockDataPlane *s, VirtQueueElement *elem,
QEMUIOVector *inhdr) QEMUIOVector *inhdr)
{ {
VirtIOBlockRequest *req = g_slice_new(VirtIOBlockRequest); VirtIOBlock *dev = VIRTIO_BLK(s->vdev);
req->s = s; VirtIOBlockReq *req = g_slice_new0(VirtIOBlockReq);
req->dev = dev;
req->elem = elem; req->elem = elem;
req->inhdr = inhdr; req->inhdr = inhdr;

4
include/hw/virtio/virtio-blk.h
View File

@ -142,6 +142,10 @@ typedef struct VirtIOBlockReq {
QEMUIOVector qiov; QEMUIOVector qiov;
struct VirtIOBlockReq *next; struct VirtIOBlockReq *next;
BlockAcctCookie acct; BlockAcctCookie acct;
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
QEMUIOVector *inhdr; /* iovecs for virtio_blk_inhdr */
#endif
} VirtIOBlockReq; } VirtIOBlockReq;
#define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \ #define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \