mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-blk: Move VirtIOBlockReq to header

Browse Source 
For later reusing by dataplane code.

Signed-off-by: Fam Zheng <famz@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:42 +08:00 committed by Kevin Wolf
parent 4c828dc61a
commit 09f6458770
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,17 +27,6 @@
#endif #endif
#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-bus.h"
typedef struct VirtIOBlockReq
{
VirtIOBlock *dev;
VirtQueueElement elem;
struct virtio_blk_inhdr *in;
struct virtio_blk_outhdr *out;
QEMUIOVector qiov;
struct VirtIOBlockReq *next;
BlockAcctCookie acct;
} VirtIOBlockReq;
static void virtio_blk_req_complete(VirtIOBlockReq *req, int status) static void virtio_blk_req_complete(VirtIOBlockReq *req, int status)
{ {
VirtIOBlock *s = req->dev; VirtIOBlock *s = req->dev;

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

@ -17,6 +17,7 @@
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
#include "hw/block/block.h" #include "hw/block/block.h"
#include "sysemu/iothread.h" #include "sysemu/iothread.h"
#include "block/block.h"
#define TYPE_VIRTIO_BLK "virtio-blk-device" #define TYPE_VIRTIO_BLK "virtio-blk-device"
#define VIRTIO_BLK(obj) \ #define VIRTIO_BLK(obj) \
@ -133,6 +134,16 @@ typedef struct VirtIOBlock {
#endif #endif
} VirtIOBlock; } VirtIOBlock;
typedef struct VirtIOBlockReq {
VirtIOBlock *dev;
VirtQueueElement elem;
struct virtio_blk_inhdr *in;
struct virtio_blk_outhdr *out;
QEMUIOVector qiov;
struct VirtIOBlockReq *next;
BlockAcctCookie acct;
} VirtIOBlockReq;
#define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \ #define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \
DEFINE_VIRTIO_COMMON_FEATURES(_state, _field) DEFINE_VIRTIO_COMMON_FEATURES(_state, _field)