On Wed, May 07, 2025 at 14:46:16 +0200, Michal Privoznik via Devel wrote: > From: Michal Privoznik <mpriv...@redhat.com> > > While with upstream QEMU it's impossible to have virtio-mem-ccw and not > have virtio-mem-pci, in RHEL the QEMU's build system is patched to make > that possible. But this breaks our assumption when fetching > capabilities.
Sigh. Normally I'd argue against appeasing downstream only modifications ... > Well, just do what we are already doing in this situation (e.g. > "virtio-blk-pci"/"virtio-blk-ccw" & virQEMUCapsDevicePropsVirtioBlk, or > "virtio-scsi-pci"/"virtio-net-ccw" & virQEMUCapsDevicePropsVirtioSCSI): > fetch the same set of props for both devices. ... but it's trivial and has prior art > > Resolves: https://issues.redhat.com/browse/RHEL-87528 > Resolves: https://issues.redhat.com/browse/RHEL-87532 > > Signed-off-by: Michal Privoznik <mpriv...@redhat.com> > --- > src/qemu/qemu_capabilities.c | 3 + > .../caps_10.0.0_s390x.replies | 206 +++++++++++++++--- > 2 files changed, 183 insertions(+), 26 deletions(-) > > diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c > index a804335c85..1a4f28facf 100644 > --- a/src/qemu/qemu_capabilities.c > +++ b/src/qemu/qemu_capabilities.c > @@ -1716,6 +1716,9 @@ static virQEMUCapsDeviceTypeProps > virQEMUCapsDeviceProps[] = { > { "virtio-mem-pci", virQEMUCapsDevicePropsVirtioMemPCI, > G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioMemPCI), > QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI }, > + { "virtio-mem-ccw", virQEMUCapsDevicePropsVirtioMemPCI, > + G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioMemPCI), > + QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW }, I'd suggest you document it somewhere around virQEMUCapsDevicePropsVirtioMemPCI that this also gets called fro the CCW version > { "virtio-iommu-pci", virQEMUCapsDevicePropsVirtioIOMMU, > G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioIOMMU), > QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI }, Reviewed-by: Peter Krempa <pkre...@redhat.com>
