mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
2906cddfec
In disabled mode, virtio-blk dataplane seems to be enabled, but flow actually goes through the normal virtio path. This patch simplifies a bit the handling of disabled mode. In disabled mode, virtio_blk_handle_output might be called even if s->dataplane is not NULL. This is a bit tricky, because the current check for s->dataplane will always trigger, causing a continuous stream of calls to virtio_blk_data_plane_start. Unfortunately, these calls will not do anything. To fix this, set the "started" flag even in disabled mode, and skip virtio_blk_data_plane_start if the started flag is true. The resulting changes also prepare the code for the next patch, were virtio-blk dataplane will reuse the same virtio_blk_handle_output function as "regular" virtio-blk. Because struct VirtIOBlockDataPlane is opaque in virtio-blk.c, we have to move s->dataplane->started inside struct VirtIOBlock. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Reviewed-by: Fam Zheng <famz@redhat.com> Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
91 lines
2.2 KiB
C
91 lines
2.2 KiB
C
/*
|
|
* Virtio Block Device
|
|
*
|
|
* Copyright IBM, Corp. 2007
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2. See
|
|
* the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#ifndef _QEMU_VIRTIO_BLK_H
|
|
#define _QEMU_VIRTIO_BLK_H
|
|
|
|
#include "standard-headers/linux/virtio_blk.h"
|
|
#include "hw/virtio/virtio.h"
|
|
#include "hw/block/block.h"
|
|
#include "sysemu/iothread.h"
|
|
#include "sysemu/block-backend.h"
|
|
|
|
#define TYPE_VIRTIO_BLK "virtio-blk-device"
|
|
#define VIRTIO_BLK(obj) \
|
|
OBJECT_CHECK(VirtIOBlock, (obj), TYPE_VIRTIO_BLK)
|
|
|
|
/* This is the last element of the write scatter-gather list */
|
|
struct virtio_blk_inhdr
|
|
{
|
|
unsigned char status;
|
|
};
|
|
|
|
struct VirtIOBlkConf
|
|
{
|
|
BlockConf conf;
|
|
IOThread *iothread;
|
|
char *serial;
|
|
uint32_t scsi;
|
|
uint32_t config_wce;
|
|
uint32_t request_merging;
|
|
};
|
|
|
|
struct VirtIOBlockDataPlane;
|
|
|
|
struct VirtIOBlockReq;
|
|
typedef struct VirtIOBlock {
|
|
VirtIODevice parent_obj;
|
|
BlockBackend *blk;
|
|
VirtQueue *vq;
|
|
void *rq;
|
|
QEMUBH *bh;
|
|
VirtIOBlkConf conf;
|
|
unsigned short sector_mask;
|
|
bool original_wce;
|
|
VMChangeStateEntry *change;
|
|
/* Function to push to vq and notify guest */
|
|
void (*complete_request)(struct VirtIOBlockReq *req, unsigned char status);
|
|
Notifier migration_state_notifier;
|
|
bool dataplane_started;
|
|
struct VirtIOBlockDataPlane *dataplane;
|
|
} VirtIOBlock;
|
|
|
|
typedef struct VirtIOBlockReq {
|
|
VirtQueueElement elem;
|
|
int64_t sector_num;
|
|
VirtIOBlock *dev;
|
|
struct virtio_blk_inhdr *in;
|
|
struct virtio_blk_outhdr out;
|
|
QEMUIOVector qiov;
|
|
size_t in_len;
|
|
struct VirtIOBlockReq *next;
|
|
struct VirtIOBlockReq *mr_next;
|
|
BlockAcctCookie acct;
|
|
} VirtIOBlockReq;
|
|
|
|
#define VIRTIO_BLK_MAX_MERGE_REQS 32
|
|
|
|
typedef struct MultiReqBuffer {
|
|
VirtIOBlockReq *reqs[VIRTIO_BLK_MAX_MERGE_REQS];
|
|
unsigned int num_reqs;
|
|
bool is_write;
|
|
} MultiReqBuffer;
|
|
|
|
void virtio_blk_init_request(VirtIOBlock *s, VirtIOBlockReq *req);
|
|
void virtio_blk_free_request(VirtIOBlockReq *req);
|
|
|
|
void virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb);
|
|
|
|
void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb);
|
|
|
|
#endif
|