qemu: move ZPCI uid validation into device validation

The ZPCI device validation is specific to qemu. So, let us move the
ZPCI uid validation out of domain xml parsing into qemu domain device
validation.

Signed-off-by: Shalini Chellathurai Saroja <shalini@linux.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index 64a713a5f909f17c624d3d4c8df81cc6e7cc4655..7d48a3fb94c32c3fbcb1e54b940366965cb0e30f 100644 (file)
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -77,9 +77,6 @@ virZPCIDeviceAddressParseXML(xmlNodePtr node,
         def.fid.isSet = true;
     }
 
-    if (!virZPCIDeviceAddressIsValid(&def))
-        return -1;
-
     addr->zpci = def;
 
     return 0;

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 83e38dfc9ad35035cf492e4aed15eb9d89174d34..ae0e253ab9fe0d149035ce8201ffddb19ab2aaf5 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2841,7 +2841,6 @@ virPCIStubDriverTypeFromString;
 virPCIStubDriverTypeToString;
 virZPCIDeviceAddressIsIncomplete;
 virZPCIDeviceAddressIsPresent;
-virZPCIDeviceAddressIsValid;
 
 
 # util/virperf.h

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 07826fb7ab92ad7b7c2f5ef81cc3f3bd0615846a..78efa68584149a96110003fcc4c4aff8365f073d 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1018,7 +1018,9 @@ static int
 qemuValidateDomainDeviceDefZPCIAddress(virDomainDeviceInfoPtr info,
                                        virQEMUCapsPtr qemuCaps)
 {
-    if (virZPCIDeviceAddressIsPresent(&info->addr.pci.zpci) &&
+    virZPCIDeviceAddressPtr zpci = &info->addr.pci.zpci;
+
+    if (virZPCIDeviceAddressIsPresent(zpci) &&
         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ZPCI)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        "%s",
@@ -1026,6 +1028,20 @@ qemuValidateDomainDeviceDefZPCIAddress(virDomainDeviceInfoPtr info,
         return -1;
     }
 
+    /* We don't need to check fid because fid covers
+     * all range of uint32 type.
+     */
+    if (zpci->uid.isSet &&
+        (zpci->uid.value > VIR_DOMAIN_DEVICE_ZPCI_MAX_UID ||
+         zpci->uid.value == 0)) {
+        virReportError(VIR_ERR_XML_ERROR,
+                       _("Invalid PCI address uid='0x%.4x', "
+                         "must be > 0x0000 and <= 0x%.4x"),
+                       zpci->uid.value,
+                       VIR_DOMAIN_DEVICE_ZPCI_MAX_UID);
+        return -1;
+    }
+
     return 0;
 }
 

diff --git a/src/util/virpci.c b/src/util/virpci.c
index 4843195a6701adfcf75934c00c411eec0b633e2a..47c671daa07952b9a9d7d1a8c849bf3fa2bcd818 100644 (file)
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -2167,26 +2167,6 @@ virPCIDeviceAddressParse(char *address,
 }
 
 
-bool
-virZPCIDeviceAddressIsValid(virZPCIDeviceAddressPtr zpci)
-{
-    /* We don't need to check fid because fid covers
-     * all range of uint32 type.
-     */
-    if (zpci->uid.isSet &&
-        (zpci->uid.value > VIR_DOMAIN_DEVICE_ZPCI_MAX_UID ||
-         zpci->uid.value == 0)) {
-        virReportError(VIR_ERR_XML_ERROR,
-                       _("Invalid PCI address uid='0x%.4x', "
-                         "must be > 0x0000 and <= 0x%.4x"),
-                       zpci->uid.value,
-                       VIR_DOMAIN_DEVICE_ZPCI_MAX_UID);
-        return false;
-    }
-
-    return true;
-}
-
 bool
 virZPCIDeviceAddressIsIncomplete(const virZPCIDeviceAddress *addr)
 {

diff --git a/src/util/virpci.h b/src/util/virpci.h
index f198df5d7ce4de64bd70beaba83fd45744bbefd0..b3322ba61bc01bc1fee1becb1d886d2fc12ba5f7 100644 (file)
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -254,7 +254,6 @@ int virPCIDeviceAddressParse(char *address, virPCIDeviceAddressPtr bdf);
 
 bool virZPCIDeviceAddressIsIncomplete(const virZPCIDeviceAddress *addr);
 bool virZPCIDeviceAddressIsPresent(const virZPCIDeviceAddress *addr);
-bool virZPCIDeviceAddressIsValid(virZPCIDeviceAddressPtr zpci);
 
 int virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path,
                                  int pfNetDevIdx,