conf: Parse and format disk <wwn>

Validates the wwn while parsing, error out if it's malformed.

* src/util/util.h: Declare virValidateWWN
* src/util/util.c: Implement virValidateWWN
* src/libvirt_private.syms: Export virValidateWWN.
* src/conf/domain_conf.h: New member 'wwn' for disk def.
* src/conf/domain_conf.c: Parse and format disk <wwn>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 98c0cada65438bcb4f59d7f54fcb1854bc898d09..b8ba0e2d0cbf91feb0deebe9430cd70f694c04ba 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -960,6 +960,7 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def)
     VIR_FREE(def->mirror);
     VIR_FREE(def->mirrorFormat);
     VIR_FREE(def->auth.username);
+    VIR_FREE(def->wwn);
     if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_USAGE)
         VIR_FREE(def->auth.secret.usage);
     virStorageEncryptionFree(def->encryption);
@@ -3463,6 +3464,7 @@ virDomainDiskDefParseXML(virCapsPtr caps,
     char *tray = NULL;
     char *logical_block_size = NULL;
     char *physical_block_size = NULL;
+    char *wwn = NULL;
 
     if (VIR_ALLOC(def) < 0) {
         virReportOOMError();
@@ -3789,6 +3791,12 @@ virDomainDiskDefParseXML(virCapsPtr caps,
             } else if (!serial &&
                        xmlStrEqual(cur->name, BAD_CAST "serial")) {
                 serial = (char *)xmlNodeGetContent(cur);
+            } else if (!wwn &&
+                       xmlStrEqual(cur->name, BAD_CAST "wwn")) {
+                wwn = (char *)xmlNodeGetContent(cur);
+
+                if (!virValidateWWN(wwn))
+                    goto error;
             } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) {
                 /* boot is parsed as part of virDomainDeviceInfoParseXML */
             }
@@ -4085,6 +4093,8 @@ virDomainDiskDefParseXML(virCapsPtr caps,
     encryption = NULL;
     def->serial = serial;
     serial = NULL;
+    def->wwn = wwn;
+    wwn = NULL;
 
     if (!def->driverType &&
         caps->defaultDiskDriverType &&
@@ -4143,6 +4153,7 @@ cleanup:
     VIR_FREE(startupPolicy);
     VIR_FREE(logical_block_size);
     VIR_FREE(physical_block_size);
+    VIR_FREE(wwn);
 
     ctxt->node = save_ctxt;
     return def;
@@ -11742,6 +11753,7 @@ virDomainDiskDefFormat(virBufferPtr buf,
     if (def->transient)
         virBufferAddLit(buf, "      <transient/>\n");
     virBufferEscapeString(buf, "      <serial>%s</serial>\n", def->serial);
+    virBufferEscapeString(buf, "      <wwn>%s</wwn>\n", def->wwn);
     if (def->encryption) {
         virBufferAdjustIndent(buf, 6);
         if (virStorageEncryptionFormat(buf, def->encryption) < 0)

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 52c9937cb66fd9324a683bb0608619c7c045a07a..f0dea48bf3e23ca527044cdfbb3e5bb29b45652b 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -584,6 +584,7 @@ struct _virDomainDiskDef {
     virDomainBlockIoTuneInfo blkdeviotune;
 
     char *serial;
+    char *wwn;
     int cachemode;
     int error_policy;  /* enum virDomainDiskErrorPolicy */
     int rerror_policy; /* enum virDomainDiskErrorPolicy */

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index ad2534b7fa45cf4c75d06fe4546ce3614889445b..e8f3fa5b49c5ae346a07b7ee58856bf4c53e6f46 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1259,6 +1259,7 @@ virStrToLong_ull;
 virStrcpy;
 virStrncpy;
 virTrimSpaces;
+virValidateWWN;
 virVasprintf;
 
 

diff --git a/src/util/util.c b/src/util/util.c
index 91eab7210ea0c5c59e6fbebbd2eb16142274fdd7..8b1f0dc5b8a7ad998c83186c03abc81685fe8355 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -3052,3 +3052,20 @@ bool virIsDevMapperDevice(const char *dev_name ATTRIBUTE_UNUSED)
     return false;
 }
 #endif
+
+bool
+virValidateWWN(const char *wwn) {
+    int i;
+
+    for (i = 0; wwn[i]; i++)
+        if (!c_isxdigit(wwn[i]))
+            break;
+
+    if (i != 16 || wwn[i]) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("Malformed wwn: %s"));
+        return false;
+    }
+
+    return true;
+}

diff --git a/src/util/util.h b/src/util/util.h
index a5d892dd4c81cc26800553b642a2ccb765fab942..0c0efad150fb69fe07d1c473657893370bcd21a1 100644 (file)
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -277,4 +277,6 @@ int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL;
 
 bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1);
 
+bool virValidateWWN(const char *wwn);
+
 #endif /* __VIR_UTIL_H__ */