virtio-blk: Remove duplicate property definition
authorDavid Gibson <david@gibson.dropbear.id.au>
Thu, 15 Nov 2012 02:12:14 +0000 (13:12 +1100)
committerKevin Wolf <kwolf@redhat.com>
Tue, 11 Dec 2012 10:04:25 +0000 (11:04 +0100)
commitd567e62f98d5789ff4d273b924a0474931c71e8b
tree26bd5952f6b5b8c59d3679dc3285da8a1201ccae
parentf500a6d3c2b9ef0bb06d0080d91d8ed3c1d68f58
virtio-blk: Remove duplicate property definition

For the virtio-blk device (via virtio-pci) the property "config-wce" is
defined in two places.  First, it's defined from the
DEFINE_VIRTIO_BLK_FEATURES macro, second it's defined directly in
virtio-pci, just two lines above the call to that macro.

The direct definition in virtio-pci.c is broken, since it operates on the
'config_wce' field of VirtIOBlkConf, which is never used anywhere else.
Therefore, this patch removes both the extra property definition and the
redundant field it works on.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Cc: Paul 'Rusty' Russell <rusty@rustcorp.com.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
hw/virtio-blk.h
hw/virtio-pci.c