qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PULL 00/24] Block patches


From: Paolo Bonzini
Subject: Re: [Qemu-devel] [PULL 00/24] Block patches
Date: Mon, 20 Feb 2017 14:53:44 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0


On 20/02/2017 14:37, Peter Maydell wrote:
> 
>  -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.

Indeed, it needs to add the release call on both paths.

Paolo

> Can you rebase and fix, please?




reply via email to

[Prev in Thread] Current Thread [Next in Thread]