On Tue, 30 Sep 2014 10:43:31 +0200 Cornelia Huck <cornelia.h...@de.ibm.com> wrote:
> On Tue, 30 Sep 2014 14:10:29 +0800 > <arei.gong...@huawei.com> wrote: > > > From: Gonglei <arei.gong...@huawei.com> > > > > {virtio, vhost}-scsi-{pci, s390, ccw} all duplicate the > > qdev properties of their VirtIOSCSI/VHostSCSI child. > > This approach does not work well with string or pointer > > properties since we must be careful about leaking or > > double-freeing them. > > > > Use the QOM alias property to forward property accesses to the > > VirtIOSCSI/VHostSCSI child. This way no duplication is necessary. > > > > Signed-off-by: Gonglei <arei.gong...@huawei.com> > > --- > > hw/s390x/s390-virtio-bus.c | 4 ++-- > > hw/s390x/virtio-ccw.c | 4 ++-- > > hw/virtio/virtio-pci.c | 4 ++-- > > 3 files changed, 6 insertions(+), 6 deletions(-) > > I just noticed that qemu-system-s390x -device vhost-scsi-{s390,ccw},? > segfaults on me - but it also does on master, so that is an orthogonal > problem I'll look into later. This patch looks fine to me and actually > also fixes a bug for ccw where vhost-scsi referenced VirtIOSCSICcw > instead of VHostSCSICcw, so: > > Reviewed-by: Cornelia Huck <cornelia.h...@de.ibm.com> ...and it turns out that s390-virtio is actually fine, while the problem in virtio-ccw is trivially fixed by s/VirtIOSCSICcw/VHostSCSICcw/ in the .instance_size initializer. I'll queue that up with the next round of s390 patches.