From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [RFC-v2 6/6] virtio-scsi: Fix incorrect VirtIOSCSI->cmd_vqs[0] definition Date: Mon, 13 Aug 2012 12:02:59 +0300 Message-ID: <20120813090259.GJ14081@redhat.com> References: <1344846917-7411-1-git-send-email-nab@linux-iscsi.org> <1344846917-7411-7-git-send-email-nab@linux-iscsi.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Stefan Hajnoczi , kvm-devel , Jan Kiszka , qemu-devel , Zhi Yong Wu , Anthony Liguori , target-devel , Paolo Bonzini , lf-virt , Christoph Hellwig To: "Nicholas A. Bellinger" Return-path: Content-Disposition: inline In-Reply-To: <1344846917-7411-7-git-send-email-nab@linux-iscsi.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org List-Id: kvm.vger.kernel.org On Mon, Aug 13, 2012 at 08:35:17AM +0000, Nicholas A. Bellinger wrote: > From: Nicholas Bellinger > > This patch fixes bug in the definition of VirtIOSCSI->cmd_vqs[0], > where the return of virtio_add_queue() in virtio_scsi_init() ends up > overwriting past the end of ->cmd_vqs[0]. > > Since virtio_scsi currently assumes a single vqs for data, this patch > simply changes ->cmd_vqs[1] to handle the single VirtQueue. > > Cc: Paolo Bonzini > Cc: Stefan Hajnoczi > Cc: Michael S. Tsirkin > Signed-off-by: Nicholas Bellinger This is a bugfix we need even without vhost, right? > --- > hw/virtio-scsi.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c > index 5e2ff6b..2c70f89 100644 > --- a/hw/virtio-scsi.c > +++ b/hw/virtio-scsi.c > @@ -150,7 +150,7 @@ typedef struct { > bool events_dropped; > VirtQueue *ctrl_vq; > VirtQueue *event_vq; > - VirtQueue *cmd_vqs[0]; > + VirtQueue *cmd_vqs[1]; > > bool vhost_started; > VHostSCSI *vhost_scsi; > -- > 1.7.2.5