On 05/02/2016 06:30 PM, John Ferlan wrote:
An iothread for virtio-scsi is a property of the controller. Add a
lookup
of the 'virtio-scsi-pci' and 'virtio-scsi-ccw' device properties and
parse
the output. For both, support for the iothread was added in qemu 2.4
while support for virtio-scsi in general was added in qemu 1.4.
Modify the various mock capabilities replies (by hand) to reflect the
when virtio-scsi was supported and then specifically when the iothread
property was added. For versions prior to 1.4, use the no device error
return for virtio-scsi. For versions 1.4 to before 2.4, add some data
for virtio-scsi-pci even though it isn't complete we're not looking for
anything specific there anyway. For 2.4 to 2.6, add a more complete reply.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 9 ++
src/qemu/qemu_capabilities.h | 1 +
tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 80 +++++----
tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 80 +++++----
tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 88 ++++++----
tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 88 ++++++----
tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 88 ++++++----
tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 88 ++++++----
tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 88 ++++++----
tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 +
tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 177 ++++++++++++++++----
tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 +
tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 197 +++++++++++++++++++----
tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 +
tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 192 ++++++++++++++++++----
15 files changed, 851 insertions(+), 328 deletions(-)
ACK
Though as someone else once pointed out to me, I don't think the "id"
values
need to be bumped or even added when extending the *.replies caps files. Just
a note for future reference
- Cole