It's pointless to check the same thing multiple times.
Fix the indentation along the way too.
Signed-off-by: Erik Skultety <eskul...@redhat.com>
---
src/conf/domain_conf.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 544f63a2a9..62bd17739c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4513,20 +4513,10 @@ virDomainHostdevDefPostParse(virDomainHostdevDefPtr dev,
if (dev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
return 0;
- if (model == VIR_MDEV_MODEL_TYPE_VFIO_PCI &&
- dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
- virReportError(VIR_ERR_XML_ERROR,
- _("Unsupported address type '%s' with mediated "
- "device model '%s'"),
- virDomainDeviceAddressTypeToString(dev->info->type),
- virMediatedDeviceModelTypeToString(model));
- return -1;
- }
-
if ((model == VIR_MDEV_MODEL_TYPE_VFIO_PCI &&
- dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_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)) {
+ dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) {
virReportError(VIR_ERR_XML_ERROR,
_("Unsupported address type '%s' with mediated "
"device model '%s'"),
--
2.14.3
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
