diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2014-06-18 17:58:33 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-07-01 09:15:02 +0200 |
| commit | caffdac363801cd2cf2bf01ad013a8c1e1e43800 (patch) | |
| tree | a3d5038dd85dd265ea553454804b115b176362b2 /hw/s390x/s390-virtio-bus.h | |
| parent | 67cc7e0aaca835ed68cf3bd34f4d51a21232792f (diff) | |
| download | qemu-caffdac363801cd2cf2bf01ad013a8c1e1e43800.zip qemu-caffdac363801cd2cf2bf01ad013a8c1e1e43800.tar.gz qemu-caffdac363801cd2cf2bf01ad013a8c1e1e43800.tar.bz2 | |
virtio-blk: use aliases instead of duplicate qdev properties
virtio-blk-pci, virtio-blk-s390, and virtio-blk-ccw all duplicate the
qdev properties of their VirtIOBlock 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
VirtIOBlock child. This way no duplication is necessary.
Remember to stop calling virtio_blk_set_conf() so that we don't clobber
the values already set on the VirtIOBlock instance.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Diffstat (limited to 'hw/s390x/s390-virtio-bus.h')
| -rw-r--r-- | hw/s390x/s390-virtio-bus.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h index ac81bd8..ffd0df7 100644 --- a/hw/s390x/s390-virtio-bus.h +++ b/hw/s390x/s390-virtio-bus.h @@ -124,7 +124,6 @@ void s390_virtio_reset_idx(VirtIOS390Device *dev); typedef struct VirtIOBlkS390 { VirtIOS390Device parent_obj; VirtIOBlock vdev; - VirtIOBlkConf blk; } VirtIOBlkS390; /* virtio-scsi-s390 */ |