diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-22 13:01:05 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-22 13:01:05 -0500 |
| commit | 7b2f89c435f895431d55b675dc412275c2069314 (patch) | |
| tree | 5be26fa2548653d69d30733bf8d9e7eddf902af8 /hw | |
| parent | b6825cd79cdf3e2006c22bb8cfe47a0d7c5209fa (diff) | |
| parent | eec7f96c2cac88f59fd8c79b78a6e027df4abfb2 (diff) | |
| download | hqemu-7b2f89c435f895431d55b675dc412275c2069314.zip hqemu-7b2f89c435f895431d55b675dc412275c2069314.tar.gz | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony:
virtio-blk: hide VIRTIO_BLK_F_CONFIG_WCE from old machine types
Documentation: Warn against qemu-img on active image
vmdk: Read footer for streamOptimized images
vmdk: Fix header structure
Conflicts:
hw/virtio-blk.c
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/virtio-blk.h | 1 | ||||
| -rw-r--r-- | hw/virtio-pci.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h index 651a000..f0740d0 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -104,6 +104,7 @@ 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 5e6e09e..2a3d86f 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -886,6 +886,7 @@ 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), |
