[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/15] virtio-blk: fix disabled mode
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 09/15] virtio-blk: fix disabled mode |
Date: |
Fri, 8 Apr 2016 11:02:34 +0300 |
From: Paolo Bonzini <address@hidden>
We must not call virtio_blk_data_plane_notify if dataplane is
disabled: we would hit a segmentation fault in notify_guest_bh as
s->guest_notifier has not been setup and is NULL.
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/virtio/virtio-blk.h | 1 +
hw/block/dataplane/virtio-blk.c | 7 +++----
hw/block/virtio-blk.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
index ae84d92..59ae1e4 100644
--- a/include/hw/virtio/virtio-blk.h
+++ b/include/hw/virtio/virtio-blk.h
@@ -53,6 +53,7 @@ typedef struct VirtIOBlock {
unsigned short sector_mask;
bool original_wce;
VMChangeStateEntry *change;
+ bool dataplane_disabled;
bool dataplane_started;
struct VirtIOBlockDataPlane *dataplane;
} VirtIOBlock;
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index e666dd4..2870d21 100644
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -29,7 +29,6 @@
struct VirtIOBlockDataPlane {
bool starting;
bool stopping;
- bool disabled;
VirtIOBlkConf *conf;
@@ -234,7 +233,7 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s)
fail_host_notifier:
k->set_guest_notifiers(qbus->parent, 1, false);
fail_guest_notifiers:
- s->disabled = true;
+ vblk->dataplane_disabled = true;
s->starting = false;
vblk->dataplane_started = true;
}
@@ -251,8 +250,8 @@ void virtio_blk_data_plane_stop(VirtIOBlockDataPlane *s)
}
/* Better luck next time. */
- if (s->disabled) {
- s->disabled = false;
+ if (vblk->dataplane_disabled) {
+ vblk->dataplane_disabled = false;
vblk->dataplane_started = false;
return;
}
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 870d345..151fe78 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -54,7 +54,7 @@ static void virtio_blk_req_complete(VirtIOBlockReq *req,
unsigned char status)
stb_p(&req->in->status, status);
virtqueue_push(s->vq, &req->elem, req->in_len);
- if (s->dataplane) {
+ if (s->dataplane_started && !s->dataplane_disabled) {
virtio_blk_data_plane_notify(s->dataplane);
} else {
virtio_notify(vdev, s->vq);
--
MST
- [Qemu-devel] [PULL 00/15] pci, virtio, acpi: fixes for 2.6, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 01/15] acpi: Add missing GCC_FMT_ATTR, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 02/15] pci-testdev: fast mmio support, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 04/15] Sort the fw_cfg file list, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 03/15] xen: piix reuse pci generic class init function, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 05/15] Migration: Add i82801b11 migration data, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 06/15] virtio-balloon: reset the statistic timer to load device, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 07/15] tests/bios-tables-test: fix assert, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 08/15] virtio: make virtio_queue_notify_vq static, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 09/15] virtio-blk: fix disabled mode,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 10/15] virtio-scsi: fix disabled mode, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 11/15] virtio: add aio handler, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 13/15] virtio-scsi: use aio handler for data plane, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 15/15] hw/pci-bridge: Add missing unref in case register-bus fails, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 12/15] virtio-blk: use aio handler for data plane, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 14/15] virtio: merge virtio_queue_aio_set_host_notifier_handler with virtio_queue_set_aio, Michael S. Tsirkin, 2016/04/08
- Re: [Qemu-devel] [PULL 00/15] pci, virtio, acpi: fixes for 2.6, Peter Maydell, 2016/04/08