On 05/14/2018 03:43 AM, Boris Fiuczynski wrote:
On 05/10/2018 10:52 PM, John Ferlan wrote:
>
>
> On 05/07/2018 10:41 AM, Boris Fiuczynski wrote:
>> From: Shalini Chellathurai Saroja <shalini(a)linux.vnet.ibm.com>
>>
>> Introduces the vfio-ccw model for mediated devices and prime vfio-ccw
>> devices such that CCW address will be generated.
>>
>> Signed-off-by: Shalini Chellathurai Saroja <shalini(a)linux.vnet.ibm.com>
>> Reviewed-by: Bjoern Walk <bwalk(a)linux.ibm.com>
>> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
>> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com>
>> Reviewed-by: Stefan Zimmermann <stzi(a)linux.ibm.com>
>> ---
>> docs/schemas/domaincommon.rng | 5 ++++-
>> src/qemu/qemu_domain_address.c | 20 ++++++++++++++++++++
>> src/util/virmdev.c | 3 ++-
>> src/util/virmdev.h | 1 +
>> 4 files changed, 27 insertions(+), 2 deletions(-)
>>
>
> Looking at all places using VIR_MDEV_MODEL_TYPE_VFIO_PCI - should this
> patch make a change to virDomainHostdevDefPostParse to do something
> similar - that is:
>
> if (model == VIR_MDEV_MODEL_TYPE_VFIO_CCW &&
> dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
> ... error message
> }
>
> ?
>
> Let me know... I think it should and can add it before pushing...
You are correct. Good catch!
How about fixing it like this?
if ((model == VIR_MDEV_MODEL_TYPE_VFIO_PCI &&
dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) ||
(model == VIR_MDEV_MODEL_TYPE_VFIO_CCW &&
dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) {
virReportError(VIR_ERR_XML_ERROR,
_("Unsupported address type '%s' with mediated
"
"device model '%s'"),
virDomainDeviceAddressTypeToString(dev->info->type),
virMediatedDeviceModelTypeToString(model));
return -1;
}
OK - added that...
Besides that I just saw that the indention of the second parameter of
method qemuDomainPrimeVfioDeviceAddresses is off by three blanks.
ah true - adjusted that.
I've merged with the latest top of tree and have pushed... So much flux
in the capabilities lately...
John