On 8 January 2015 at 17:33, Michael Roth <mdr...@linux.vnet.ibm.com> wrote: > From: Gonglei <arei.gong...@huawei.com> > > virtio-serial-{pci, s390, ccw} all duplicate the > qdev properties of their VirtIOSerial 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 > VirtIOSerial child. This way no duplication is necessary. > > @@ -537,7 +538,6 @@ static const TypeInfo s390_virtio_blk = { > }; > > static Property s390_virtio_serial_properties[] = { > - DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtIOSerialS390, vdev.serial), > DEFINE_PROP_END_OF_LIST(), > };
This hunk leaves us with a Property array which has nothing in it except the list terminator, which is a bit pointless... Since this is now in master perhaps a cleanup patch is in order. (noticed while I was fixing conflicts in a recent pullreq) -- PMM