On Mon, Feb 20, 2017 at 03:28:23PM +0100, Erik Skultety wrote: > So far, the official support is for x86_64 arch guests so unless a > different device API than vfio-pci is available let's only turn on > support for PCI address assignment. Once a different device API is > introduced, we can enable another address type easily. > > Signed-off-by: Erik Skultety <[email protected]> > --- > src/qemu/qemu_domain.h | 1 + > src/qemu/qemu_domain_address.c | 16 ++++++++++++---- > 2 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h > index 8ba807c..8d51bb8 100644 > --- a/src/qemu/qemu_domain.h > +++ b/src/qemu/qemu_domain.h > @@ -34,6 +34,7 @@ > # include "qemu_agent.h" > # include "qemu_conf.h" > # include "qemu_capabilities.h" > +# include "virmdev.h" > # include "virchrdev.h" > # include "virobject.h" > # include "logging/log_manager.h" > diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c > index 5b75044..cacd131 100644 > --- a/src/qemu/qemu_domain_address.c > +++ b/src/qemu/qemu_domain_address.c > @@ -618,9 +618,11 @@ > qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, > virPCIDeviceAddressPtr hostAddr = &hostdev->source.subsys.u.pci.addr; > > if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || > - hostdev->source.subsys.type != > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { > + (hostdev->source.subsys.type != > + VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && > + hostdev->source.subsys.type != > + VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV))
We don't have to strictly follow the 80 columns rule, in this case it's
better to not indent.
> return 0;
> - }
I wouldn't remove the curly bracers, in case that the if condition is on more
lines it is recommended to use the curly braces to make it clear. However
we don't have a syntax check for this case and we don't follow this rule
everywhere.
> if (pciFlags == pcieFlags) {
> /* This arch/qemu only supports legacy PCI, so there
> @@ -642,6 +644,9 @@
> qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
> return pcieFlags;
> }
>
> + if (hostdev->source.subsys.type ==
> VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV)
> + return pcieFlags;
> +
> if (!(pciDev = virPCIDeviceNew(hostAddr->domain,
> hostAddr->bus,
> hostAddr->slot,
> @@ -1725,12 +1730,15 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
>
> /* Host PCI devices */
> for (i = 0; i < def->nhostdevs; i++) {
> + virDomainHostdevSubsysPtr subsys = &def->hostdevs[i]->source.subsys;
> if (!virDeviceInfoPCIAddressWanted(def->hostdevs[i]->info))
> continue;
> if (def->hostdevs[i]->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
> continue;
> - if (def->hostdevs[i]->source.subsys.type !=
> VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
> - def->hostdevs[i]->source.subsys.type !=
> VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST)
> + if (subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
> + subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST &&
> + !(subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV &&
> + subsys->u.mdev.model == VIR_MDEV_MODEL_TYPE_VFIO_PCI))
> continue;
It would be nice to have curly braces here.
Pavel
signature.asc
Description: Digital signature
-- libvir-list mailing list [email protected] https://www.redhat.com/mailman/listinfo/libvir-list
