diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-18 18:13:01 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-18 18:13:01 +0100 |
| commit | a098fbc025095a0d98156ada7eac59de97c16499 (patch) | |
| tree | 9cebea51d8a9a5b994d4d2294f07695774ac63af /hw | |
| parent | 3913d3707e3debfbf0d2d014a1a793394993b088 (diff) | |
| parent | e1029ae26d96d5de78c2d9af5eddcea92e73a46a (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Mon 18 Jul 2016 17:58:27 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
MAINTAINERS: Add include/block/aio.h to block I/O path section
virtio-blk: dataplane cleanup
checkpatch: consider git extended headers valid patches
aio-posix: remove useless parameter
linux-aio: prevent submitting more than MAX_EVENTS
aio_ctx_check: follow CODING_STYLE
linux-aio: share one LinuxAioState within an AioContext
spec/parallels: fix a mistake
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/dataplane/virtio-blk.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 54b9ac1da6..704a763603 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -112,10 +112,8 @@ void virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *conf, s->vdev = vdev; s->conf = conf; - if (conf->iothread) { - s->iothread = conf->iothread; - object_ref(OBJECT(s->iothread)); - } + s->iothread = conf->iothread; + object_ref(OBJECT(s->iothread)); s->ctx = iothread_get_aio_context(s->iothread); s->bh = aio_bh_new(s->ctx, notify_guest_bh, s); s->batch_notify_vqs = bitmap_new(conf->num_queues); |