[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 03/10] virtio-scsi: moving host_features from pro
From: |
fred . konrad |
Subject: |
[Qemu-devel] [PATCH v5 03/10] virtio-scsi: moving host_features from properties to transport properties. |
Date: |
Thu, 21 Mar 2013 15:15:13 +0100 |
From: KONRAD Frederic <address@hidden>
host_features field is part of the transport device. So move all the
host_features related properties into transport device.
Signed-off-by: KONRAD Frederic <address@hidden>
---
hw/s390x/s390-virtio-bus.c | 3 ++-
hw/s390x/virtio-ccw.c | 3 ++-
hw/virtio-pci.c | 3 ++-
hw/virtio-scsi.h | 18 +++++++++++-------
4 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 76bc99a..68db7b9 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -543,7 +543,8 @@ static const TypeInfo virtio_s390_device_info = {
};
static Property s390_virtio_scsi_properties[] = {
- DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOS390Device, host_features, scsi),
+ DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOS390Device, scsi),
+ DEFINE_VIRTIO_SCSI_FEATURES(VirtIOS390Device, host_features),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 9688835..f852721 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -836,7 +836,8 @@ static const TypeInfo virtio_ccw_balloon = {
static Property virtio_ccw_scsi_properties[] = {
DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
- DEFINE_VIRTIO_SCSI_PROPERTIES(VirtioCcwDevice, host_features[0], scsi),
+ DEFINE_VIRTIO_SCSI_PROPERTIES(VirtioCcwDevice, scsi),
+ DEFINE_VIRTIO_SCSI_FEATURES(VirtioCcwDevice, host_features[0]),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index f3ece78..0cf8b2e 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -1221,7 +1221,8 @@ static void virtio_scsi_exit_pci(PCIDevice *pci_dev)
static Property virtio_scsi_properties[] = {
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
DEV_NVECTORS_UNSPECIFIED),
- DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOPCIProxy, host_features, scsi),
+ DEFINE_VIRTIO_SCSI_FEATURES(VirtIOPCIProxy, host_features),
+ DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOPCIProxy, scsi),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h
index fb83b67..da02f08 100644
--- a/hw/virtio-scsi.h
+++ b/hw/virtio-scsi.h
@@ -47,12 +47,16 @@ typedef struct VirtIOSCSI {
VirtQueue **cmd_vqs;
} VirtIOSCSI;
-#define DEFINE_VIRTIO_SCSI_PROPERTIES(_state, _features_field, _conf_field) \
- DEFINE_VIRTIO_COMMON_FEATURES(_state, _features_field), \
- DEFINE_PROP_UINT32("num_queues", _state, _conf_field.num_queues, 1), \
- DEFINE_PROP_UINT32("max_sectors", _state, _conf_field.max_sectors,
0xFFFF), \
- DEFINE_PROP_UINT32("cmd_per_lun", _state, _conf_field.cmd_per_lun, 128), \
- DEFINE_PROP_BIT("hotplug", _state, _features_field, VIRTIO_SCSI_F_HOTPLUG,
true), \
- DEFINE_PROP_BIT("param_change", _state, _features_field,
VIRTIO_SCSI_F_CHANGE, true)
+#define DEFINE_VIRTIO_SCSI_PROPERTIES(_state, _conf_field)
\
+ DEFINE_PROP_UINT32("num_queues", _state, _conf_field.num_queues, 1),
\
+ DEFINE_PROP_UINT32("max_sectors", _state, _conf_field.max_sectors,
0xFFFF),\
+ DEFINE_PROP_UINT32("cmd_per_lun", _state, _conf_field.cmd_per_lun, 128)
+
+#define DEFINE_VIRTIO_SCSI_FEATURES(_state, _feature_field)
\
+ DEFINE_VIRTIO_COMMON_FEATURES(_state, _feature_field),
\
+ DEFINE_PROP_BIT("hotplug", _state, _feature_field, VIRTIO_SCSI_F_HOTPLUG,
\
+ true),
\
+ DEFINE_PROP_BIT("param_change", _state, _feature_field,
\
+ VIRTIO_SCSI_F_CHANGE, true)
#endif /* _QEMU_VIRTIO_SCSI_H */
--
1.7.11.7
- [Qemu-devel] [PATCH v5 00/10] virtio-scsi refactoring., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 02/10] virtio-scsi: allocate cmd_vqs array separately., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 04/10] virtio-scsi: add the virtio-scsi device., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 06/10] virtio-scsi-s390: switch to the new API., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 03/10] virtio-scsi: moving host_features from properties to transport properties.,
fred . konrad <=
- [Qemu-devel] [PATCH v5 09/10] virtio-scsi: cleanup: init and exit functions., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 05/10] virtio-scsi-pci: switch to new API., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 10/10] virtio-scsi: cleanup: remove qdev field., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 01/10] virtio-scsi: don't use pointer for configuration., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 07/10] virtio-scsi-ccw: switch to new API, fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 08/10] virtio-scsi: cleanup: use QOM casts., fred . konrad, 2013/03/21
- Re: [Qemu-devel] [PATCH v5 00/10] virtio-scsi refactoring., Cornelia Huck, 2013/03/22
- Re: [Qemu-devel] [PATCH v5 00/10] virtio-scsi refactoring., Peter Maydell, 2013/03/26
- Re: [Qemu-devel] [PATCH v5 00/10] virtio-scsi refactoring., Anthony Liguori, 2013/03/26