On 20 February 2017 at 09:32, Stefan Hajnoczi <stefa...@redhat.com> wrote:
> The following changes since commit 5dae13cd71f0755a1395b5a4cde635b8a6ee3f58:
>
> Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into
> staging (2017-02-14 09:55:48 +0000)
>
> are available in the git repository at:
>
> git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to decc18f33adecb1316437a47fff0cf0a7665906a:
>
> coroutine-lock: make CoRwlock thread-safe and fair (2017-02-16 17:17:34
> +0000)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
Hi; this has merge conflicts in hw/scsi/virtio-scsi.c and
hw/block/virtio-blk.c which I could maybe resolve by hand
but at least one of them makes me suspicious that perhaps
the automatic merging will have semantically mismerged:
@@@ -758,13 -756,13 +768,18 @@@ out
virtio_scsi_release(s);
}
-void virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq)
+bool virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq)
{
+ virtio_scsi_acquire(s);
if (s->events_dropped) {
virtio_scsi_push_event(s, NULL, VIRTIO_SCSI_T_NO_EVENT, 0);
+ return true;
}
++<<<<<<< HEAD
+ return false;
++=======
+ virtio_scsi_release(s);
++>>>>>>> remotes/stefanha/tags/block-pull-request
}
static void virtio_scsi_handle_event(VirtIODevice *vdev, VirtQueue *vq)
since one half of this merge is adding extra return paths
which won't have release() calls in them in the other half.
Can you rebase and fix, please?
thanks
-- PMM
