ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-scsi-dataplane: Call blk_set_aio_context within BQL 

It's not safe to call blk_set_aio_context from outside BQL because of
the bdrv_drain_all there. Let's put it in the hotplug callback which
will be called by qdev device realization for each scsi device attached
to the bus.

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <1423969591-23646-3-git-send-email-famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Fam Zheng 2015-02-15 11:06:31 +08:00 committed by Paolo Bonzini
parent 2e5b887cfc
commit 0543055967
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/scsi/virtio-scsi.c
View File

@ -254,10 +254,8 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req)
int target; int target;
int ret = 0; int ret = 0;
if (s->dataplane_started && blk_get_aio_context(d->conf.blk) != s->ctx) { if (s->dataplane_started) {
aio_context_acquire(s->ctx); assert(blk_get_aio_context(d->conf.blk) == s->ctx);
blk_set_aio_context(d->conf.blk, s->ctx);
aio_context_release(s->ctx);
} }
/* Here VIRTIO_SCSI_S_OK means "FUNCTION COMPLETE". */ /* Here VIRTIO_SCSI_S_OK means "FUNCTION COMPLETE". */
req->resp.tmf.response = VIRTIO_SCSI_S_OK; req->resp.tmf.response = VIRTIO_SCSI_S_OK;
@ -540,10 +538,8 @@ bool virtio_scsi_handle_cmd_req_prepare(VirtIOSCSI *s, VirtIOSCSIReq *req)
virtio_scsi_complete_cmd_req(req); virtio_scsi_complete_cmd_req(req);
return false; return false;
} }
if (s->dataplane_started && blk_get_aio_context(d->conf.blk) != s->ctx) { if (s->dataplane_started) {
aio_context_acquire(s->ctx); assert(blk_get_aio_context(d->conf.blk) == s->ctx);
blk_set_aio_context(d->conf.blk, s->ctx);
aio_context_release(s->ctx);
} }
req->sreq = scsi_req_new(d, req->req.cmd.tag, req->sreq = scsi_req_new(d, req->req.cmd.tag,
virtio_scsi_get_lun(req->req.cmd.lun), virtio_scsi_get_lun(req->req.cmd.lun),
@ -767,6 +763,9 @@ static void virtio_scsi_hotplug(HotplugHandler *hotplug_dev, DeviceState *dev,
return; return;
} }
blk_op_block_all(sd->conf.blk, s->blocker); blk_op_block_all(sd->conf.blk, s->blocker);
aio_context_acquire(s->ctx);
blk_set_aio_context(sd->conf.blk, s->ctx);
aio_context_release(s->ctx);
} }
if ((vdev->guest_features >> VIRTIO_SCSI_F_HOTPLUG) & 1) { if ((vdev->guest_features >> VIRTIO_SCSI_F_HOTPLUG) & 1) {