Commit eb41cf78 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Michael S. Tsirkin
Browse files

virtio-blk: fix disabled mode 



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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 2b2cbcad

hw/block/dataplane/virtio-blk.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

    }

hw/block/virtio-blk.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/hw/virtio/virtio-blk.h

+1 −0
Original line number Diff line number Diff line
@@ -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;