[Qemu-devel] [PATCH 0/2] scsi: Minor cleanups around scsi-disk

[Qemu-devel] [PATCH 0/2] scsi: Minor cleanups around scsi-disk

[Markus Armbruster]

Markus Armbruster (2):
  block: Clarify documentation of BlockInfo member io-status
  virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk

 qapi/block-core.json     | 3 ++-
 tests/virtio-scsi-test.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
2.7.4

[Qemu-devel] [PATCH 1/2] block: Clarify documentation of BlockInfo member io-status

[Markus Armbruster]

Say "SCSI except scsi-generic" instead of "scsi-disk", because
scsi-disk could mean either scsi-disk.c (which is correct) or device
model scsi-disk (which would be incorrect).

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qapi/block-core.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index 87fb747..b1dc848 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -449,7 +449,8 @@
 #
 # @io-status: @BlockDeviceIoStatus. Only present if the device
 #             supports it and the VM is configured to stop on errors
-#             (supported device models: virtio-blk, ide, scsi-disk)
+#             (supported device models: virtio-blk, IDE, SCSI except
+#             scsi-generic)
 #
 # @inserted: @BlockDeviceInfo describing the device if media is
 #            present
-- 
2.7.4

[Qemu-devel] [PATCH 2/2] virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk

[Markus Armbruster]

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 tests/virtio-scsi-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c
index 0eabd56..27ef7c0 100644
--- a/tests/virtio-scsi-test.c
+++ b/tests/virtio-scsi-test.c
@@ -149,7 +149,7 @@ static QVirtIOSCSI *qvirtio_scsi_pci_init(int slot)
 
     vs->qs = qvirtio_scsi_start("-drive file=blkdebug::null-co://,"
                                 "if=none,id=dr1,format=raw,file.align=4k "
-                                "-device scsi-disk,drive=dr1,lun=0,scsi-id=1");
+                                "-device scsi-hd,drive=dr1,lun=0,scsi-id=1");
     dev = qvirtio_pci_device_find(vs->qs->pcibus, VIRTIO_ID_SCSI);
     vs->dev = (QVirtioDevice *)dev;
     g_assert(dev != NULL);
-- 
2.7.4

Re: [Qemu-devel] [PATCH 0/2] scsi: Minor cleanups around scsi-disk

[Paolo Bonzini]

On 09/05/2017 12:56, Markus Armbruster wrote:
> Markus Armbruster (2):
>   block: Clarify documentation of BlockInfo member io-status
>   virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk
> 
>  qapi/block-core.json     | 3 ++-
>  tests/virtio-scsi-test.c | 2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Re: [Qemu-devel] [PATCH 0/2] scsi: Minor cleanups around scsi-disk

[Markus Armbruster]

Paolo Bonzini <pbonzini@redhat.com> writes:

> On 09/05/2017 12:56, Markus Armbruster wrote:
>> Markus Armbruster (2):
>>   block: Clarify documentation of BlockInfo member io-status
>>   virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk
>> 
>>  qapi/block-core.json     | 3 ++-
>>  tests/virtio-scsi-test.c | 2 +-
>>  2 files changed, 3 insertions(+), 2 deletions(-)
>> 
>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Thanks!

The canonical path is through your tree, but I could stick it into a
miscellaneous pull request if you like.

Re: [Qemu-devel] [PATCH 0/2] scsi: Minor cleanups around scsi-disk

[Paolo Bonzini]

On 23/05/2017 13:30, Markus Armbruster wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:
> 
>> On 09/05/2017 12:56, Markus Armbruster wrote:
>>> Markus Armbruster (2):
>>>   block: Clarify documentation of BlockInfo member io-status
>>>   virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk
>>>
>>>  qapi/block-core.json     | 3 ++-
>>>  tests/virtio-scsi-test.c | 2 +-
>>>  2 files changed, 3 insertions(+), 2 deletions(-)
>>>
>>
>> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> 
> Thanks!
> 
> The canonical path is through your tree, but I could stick it into a
> miscellaneous pull request if you like.

I saw you posted these two together so I wasn't sure who would do that.
:)  These are not files that my pull requests touch a lot.

Paolo

Re: [Qemu-devel] [PATCH 0/2] scsi: Minor cleanups around scsi-disk

[Markus Armbruster]

Paolo Bonzini <pbonzini@redhat.com> writes:

> On 23/05/2017 13:30, Markus Armbruster wrote:
>> Paolo Bonzini <pbonzini@redhat.com> writes:
>> 
>>> On 09/05/2017 12:56, Markus Armbruster wrote:
>>>> Markus Armbruster (2):
>>>>   block: Clarify documentation of BlockInfo member io-status
>>>>   virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk
>>>>
>>>>  qapi/block-core.json     | 3 ++-
>>>>  tests/virtio-scsi-test.c | 2 +-
>>>>  2 files changed, 3 insertions(+), 2 deletions(-)
>>>>
>>>
>>> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>> 
>> Thanks!
>> 
>> The canonical path is through your tree, but I could stick it into a
>> miscellaneous pull request if you like.
>
> I saw you posted these two together so I wasn't sure who would do that.
> :)  These are not files that my pull requests touch a lot.

I assume that means I should post the pull request myself.  Holler if
I'm wrong.