diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2012-11-15 13:12:14 +1100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-12-11 11:04:25 +0100 |
| commit | d567e62f98d5789ff4d273b924a0474931c71e8b (patch) | |
| tree | 26bd5952f6b5b8c59d3679dc3285da8a1201ccae | |
| parent | f500a6d3c2b9ef0bb06d0080d91d8ed3c1d68f58 (diff) | |
| download | qemu-d567e62f98d5789ff4d273b924a0474931c71e8b.tar.gz | |
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>
| -rw-r--r-- | hw/virtio-blk.h | 1 | ||||
| -rw-r--r-- | hw/virtio-pci.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h index f0740d01af..651a000b9f 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -104,7 +104,6 @@ struct VirtIOBlkConf BlockConf conf; char *serial; uint32_t scsi; - uint32_t config_wce; }; #define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \ diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 71f4fb5dc6..7684ac9a70 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -895,7 +895,6 @@ static Property virtio_blk_properties[] = { #ifdef __linux__ DEFINE_PROP_BIT("scsi", VirtIOPCIProxy, blk.scsi, 0, true), #endif - DEFINE_PROP_BIT("config-wce", VirtIOPCIProxy, blk.config_wce, 0, true), DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true), DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), DEFINE_VIRTIO_BLK_FEATURES(VirtIOPCIProxy, host_features), |