conf: node_device: fix up SCSI target

When reading in an XML definition for a SCSI target device, the name
property of struct scsi_target refers to the @target element.

Let's fix this obvious typo and also extend the XML schema to provide
validation.

Signed-off-by: Bjoern Walk <bwalk@linux.vnet.ibm.com>

diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng
index 949811cacb012b4ed2eadead6d1c412a78144fdb..d9375130487c54bb4a896cfc70b9930b85228f66 100644 (file)
--- a/docs/schemas/nodedev.rng
+++ b/docs/schemas/nodedev.rng
@@ -40,6 +40,7 @@
         <ref name="capusbinterface"/>
         <ref name="capnet"/>
         <ref name="capscsihost"/>
+        <ref name="capscsitarget"/>
         <ref name="capscsi"/>
         <ref name="capstorage"/>
       </choice>
@@ -382,6 +383,16 @@
     </optional>
   </define>
 
+  <define name='capscsitarget'>
+    <attribute name='type'>
+      <value>scsi_target</value>
+    </attribute>
+
+    <element name='target'>
+      <text/>
+    </element>
+  </define>
+
   <define name='capscsi'>
     <attribute name='type'>
       <value>scsi</value>

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 611045c679abaa6d2f04bbfbcd48af053431aaec..f74b34de5cd2a8410f3fae1b3bfdd5c1c9d89aab 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -822,7 +822,7 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt,
     orignode = ctxt->node;
     ctxt->node = node;
 
-    data->scsi_target.name = virXPathString("string(./name[1])", ctxt);
+    data->scsi_target.name = virXPathString("string(./target[1])", ctxt);
     if (!data->scsi_target.name) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("no target name supplied for '%s'"),