My previous attempts to fix "virsh domfsinfo" on s390x were unfortunately
wrong due to some misunderstandings on my side.

To correctly list the "Target" device in the output of "virsh domfsinfo",
we need to search through the available devices using their CCW address
on s390x.

For this the QEMU guest agent will be enhanced to also send the CCW
address of devices in the guest (see the following URL for details:
https://lore.kernel.org/qemu-devel/20201125105417.380317-1-thuth@redhat.com/
... but it has just been posted and will take some time to get merged,
since QEMU is still in hard freeze, that's why I've labed this libvirt
series here as RFC only). Using this CCW address, we then can look up
the correct target devices on the libvirt side, too.

See also https://bugzilla.redhat.com/show_bug.cgi?id=1858771 for some
more information.

Thomas Huth (3):
  qemu: agent: Store CCW address in qemuAgentDiskInfo if provided by the
    guest
  domain_conf: Allow to look up virtio-block devices by their CCW
    address
  domain_conf: Allow to look up scsi disks when controller uses a CCW
    address

 src/conf/domain_conf.c | 33 ++++++++++++++++++++++++++++++++-
 src/conf/domain_conf.h |  4 ++++
 src/qemu/qemu_agent.c  | 11 +++++++++++
 src/qemu/qemu_agent.h  |  2 ++
 src/qemu/qemu_driver.c |  8 +++++---
 5 files changed, 54 insertions(+), 4 deletions(-)

-- 
2.18.4

On 11/25/20 12:06 PM, Thomas Huth wrote:
> My previous attempts to fix "virsh domfsinfo" on s390x were unfortunately
> wrong due to some misunderstandings on my side.
> 
> To correctly list the "Target" device in the output of "virsh domfsinfo",
> we need to search through the available devices using their CCW address
> on s390x.
> 
> For this the QEMU guest agent will be enhanced to also send the CCW
> address of devices in the guest (see the following URL for details:
> https://lore.kernel.org/qemu-devel/20201125105417.380317-1-thuth@redhat.com/
> ... but it has just been posted and will take some time to get merged,
> since QEMU is still in hard freeze, that's why I've labed this libvirt
> series here as RFC only). Using this CCW address, we then can look up
> the correct target devices on the libvirt side, too.
> 
> See also https://bugzilla.redhat.com/show_bug.cgi?id=1858771 for some
> more information.
> 
> Thomas Huth (3):
>    qemu: agent: Store CCW address in qemuAgentDiskInfo if provided by the
>      guest
>    domain_conf: Allow to look up virtio-block devices by their CCW
>      address
>    domain_conf: Allow to look up scsi disks when controller uses a CCW
>      address
> 
>   src/conf/domain_conf.c | 33 ++++++++++++++++++++++++++++++++-
>   src/conf/domain_conf.h |  4 ++++
>   src/qemu/qemu_agent.c  | 11 +++++++++++
>   src/qemu/qemu_agent.h  |  2 ++
>   src/qemu/qemu_driver.c |  8 +++++---
>   5 files changed, 54 insertions(+), 4 deletions(-)
> 

Patches look good to me. However, I can't push them until QEMU patch is 
pushed. This is sort of unwritten rule that we learned the hard way (we 
pushed libvirt patches that were written on the top of QEMU patches, but 
in the end QEMU patches that were pushed looked different and we had to 
adapt).

I'll keep these in a local branch and push after QEMU patch.

Michal

On 10/12/2020 11.41, Michal Privoznik wrote:
> On 11/25/20 12:06 PM, Thomas Huth wrote:
>> My previous attempts to fix "virsh domfsinfo" on s390x were unfortunately
>> wrong due to some misunderstandings on my side.
>>
>> To correctly list the "Target" device in the output of "virsh domfsinfo",
>> we need to search through the available devices using their CCW address
>> on s390x.
>>
>> For this the QEMU guest agent will be enhanced to also send the CCW
>> address of devices in the guest (see the following URL for details:
>> https://lore.kernel.org/qemu-devel/20201125105417.380317-1-thuth@redhat.com/
>> ... but it has just been posted and will take some time to get merged,
>> since QEMU is still in hard freeze, that's why I've labed this libvirt
>> series here as RFC only). Using this CCW address, we then can look up
>> the correct target devices on the libvirt side, too.
>>
>> See also https://bugzilla.redhat.com/show_bug.cgi?id=1858771 for some
>> more information.
>>
>> Thomas Huth (3):
>>    qemu: agent: Store CCW address in qemuAgentDiskInfo if provided by the
>>      guest
>>    domain_conf: Allow to look up virtio-block devices by their CCW
>>      address
>>    domain_conf: Allow to look up scsi disks when controller uses a CCW
>>      address
>>
>>   src/conf/domain_conf.c | 33 ++++++++++++++++++++++++++++++++-
>>   src/conf/domain_conf.h |  4 ++++
>>   src/qemu/qemu_agent.c  | 11 +++++++++++
>>   src/qemu/qemu_agent.h  |  2 ++
>>   src/qemu/qemu_driver.c |  8 +++++---
>>   5 files changed, 54 insertions(+), 4 deletions(-)
>>
> 
> Patches look good to me. However, I can't push them until QEMU patch is 
> pushed. This is sort of unwritten rule that we learned the hard way (we 
> pushed libvirt patches that were written on the top of QEMU patches, but in 
> the end QEMU patches that were pushed looked different and we had to adapt).
> 
> I'll keep these in a local branch and push after QEMU patch.

The QEMU patch has now been merged:

  https://git.qemu.org/?p=qemu.git;a=commitdiff;h=5b723a5d8df44b69

Could you now push your rebased version, or do you want me to respin a v4?

  Thanks,
   Thomas

On 1/2/21 6:53 AM, Thomas Huth wrote:
> On 10/12/2020 11.41, Michal Privoznik wrote:
>> I'll keep these in a local branch and push after QEMU patch.
> 
> The QEMU patch has now been merged:
> 
>   https://git.qemu.org/?p=qemu.git;a=commitdiff;h=5b723a5d8df44b69
> 
> Could you now push your rebased version, or do you want me to respin a v4?

Pushed upstream as:

bf63f6549a domain_conf: Allow to look up scsi disks when controller uses 
a CCW address
5db43b5a76 domain_conf: Allow to look up virtio-block devices by their 
CCW address
f5c8cf9e0e qemu: agent: Store CCW address in qemuAgentDiskInfo if 
provided by the guest

Michal