[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.1 04/24] virtio-blk: move x-data-plane qdev pro
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.1 04/24] virtio-blk: move x-data-plane qdev property to virtio-blk.h |
Date: |
Tue, 1 Jul 2014 10:48:37 +0200 |
Move the x-data-plane property. Originally it was outside since not
every transport may wish to support dataplane. But that makes little
sense when we have a dedicated CONFIG_VIRTIO_BLK_DATA_PLANE ifdef
already.
This move makes it easier to switch to property aliases in the next
patch.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
---
hw/s390x/virtio-ccw.c | 3 ---
hw/virtio/virtio-pci.c | 3 ---
include/hw/virtio/virtio-blk.h | 8 ++++++++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 05656a2..d7ff0a0 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -1403,9 +1403,6 @@ static Property virtio_ccw_blk_properties[] = {
DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkCcw, blk),
DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,
VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),
-#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
- DEFINE_PROP_BIT("x-data-plane", VirtIOBlkCcw, blk.data_plane, 0, false),
-#endif
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 317324f..653d74e 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1066,9 +1066,6 @@ static Property virtio_blk_pci_properties[] = {
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
-#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
- DEFINE_PROP_BIT("x-data-plane", VirtIOBlkPCI, blk.data_plane, 0, false),
-#endif
DEFINE_VIRTIO_BLK_FEATURES(VirtIOPCIProxy, host_features),
DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkPCI, blk),
DEFINE_PROP_END_OF_LIST(),
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
index ee43f7a..1d80bcc 100644
--- a/include/hw/virtio/virtio-blk.h
+++ b/include/hw/virtio/virtio-blk.h
@@ -162,8 +162,16 @@ typedef struct VirtIOBlockReq {
#define DEFINE_VIRTIO_BLK_PROPERTIES_LINUX(_state, _field)
#endif
+#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
+#define DEFINE_VIRTIO_BLK_PROPERTIES_DATA_PLANE(_state, _field) \
+ DEFINE_PROP_BIT("x-data-plane", _state, _field.data_plane, 0, false),
+#else
+#define DEFINE_VIRTIO_BLK_PROPERTIES_DATA_PLANE(_state, _field)
+#endif
+
#define DEFINE_VIRTIO_BLK_PROPERTIES(_state, _field) \
DEFINE_VIRTIO_BLK_PROPERTIES_LINUX(_state, _field) \
+ DEFINE_VIRTIO_BLK_PROPERTIES_DATA_PLANE(_state, _field) \
DEFINE_BLOCK_PROPERTIES(_state, _field.conf), \
DEFINE_BLOCK_CHS_PROPERTIES(_state, _field.conf), \
DEFINE_PROP_STRING("serial", _state, _field.serial), \
--
1.9.3
- [Qemu-devel] [PULL for-2.1 00/24] Block patches, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 01/24] qom: add object_property_add_alias(), Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 02/24] virtio-blk: avoid qdev property definition duplication, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 04/24] virtio-blk: move x-data-plane qdev property to virtio-blk.h,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.1 05/24] qdev: add qdev_alias_all_properties(), Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 03/24] dataplane: bail out on unsupported transport, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 06/24] virtio-blk: use aliases instead of duplicate qdev properties, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 07/24] virtio-blk: drop virtio_blk_set_conf(), Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 08/24] virtio: fix virtio-blk child refcount in transports, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 09/24] virtio-blk: move qdev properties into virtio-blk.c, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 10/24] virtio-blk: replace x-iothread with iothread link property, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 11/24] qdev: drop iothread property type, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 12/24] virtio-blk: remove need for explicit x-data-plane=on option, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 13/24] qemu-img create: add 'nocow' option, Stefan Hajnoczi, 2014/07/01