schema: Rename definition of disk 'target' element to 'diskTarget'

Rename 'diskTarget' to 'diskTargetDev' and then 'target' to
'diskTarget'.

This will make it less confusing when overriding the definition.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/schemas/domainbackup.rng b/src/conf/schemas/domainbackup.rng
index 1ac9da62c112b3d4f9ad7b852ead76e6041adfd1..bfc29a6c06ea177822042c500d62cc7c24a74104 100644 (file)
--- a/src/conf/schemas/domainbackup.rng
+++ b/src/conf/schemas/domainbackup.rng
@@ -157,7 +157,7 @@
         <oneOrMore>
           <element name="disk">
             <attribute name="name">
-              <ref name="diskTarget"/>
+              <ref name="diskTargetDev"/>
             </attribute>
             <ref name="backupDiskMode"/>
             <choice>
@@ -227,7 +227,7 @@
         <oneOrMore>
           <element name="disk">
             <attribute name="name">
-              <ref name="diskTarget"/>
+              <ref name="diskTargetDev"/>
             </attribute>
             <ref name="backupDiskMode"/>
             <optional>

diff --git a/src/conf/schemas/domaincheckpoint.rng b/src/conf/schemas/domaincheckpoint.rng
index a1c8b0bb9c874ce7158eefa9c1300b882aac3e2e..72c41862355303d9915382a3c63fbb30e6624741 100644 (file)
--- a/src/conf/schemas/domaincheckpoint.rng
+++ b/src/conf/schemas/domaincheckpoint.rng
@@ -55,7 +55,7 @@
     <element name="disk">
       <attribute name="name">
         <choice>
-          <ref name="diskTarget"/>
+          <ref name="diskTargetDev"/>
           <ref name="absFilePath"/>
         </choice>
       </attribute>

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index ebdf21fe99348615ff2ac282fa2a899c7d8fcb24..2acb277b768ec50ec172d6dba661fd363404dbce 100644 (file)
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -1511,7 +1511,7 @@
       <optional>
         <ref name="diskAuth"/>
       </optional>
-      <ref name="target"/>
+      <ref name="diskTarget"/>
       <optional>
         <ref name="deviceBoot"/>
       </optional>
@@ -2348,15 +2348,16 @@
     </element>
   </define>
 
-  <define name="diskTarget">
+  <define name="diskTargetDev">
     <data type="string">
       <param name="pattern">(ioemu:)?(fd|hd|sd|vd|xvd|ubd)[a-zA-Z0-9_]+</param>
     </data>
   </define>
-  <define name="target">
+
+  <define name="diskTarget">
     <element name="target">
       <attribute name="dev">
-        <ref name="diskTarget"/>
+        <ref name="diskTargetDev"/>
       </attribute>
       <optional>
         <attribute name="bus">

diff --git a/src/conf/schemas/domainsnapshot.rng b/src/conf/schemas/domainsnapshot.rng
index 3db9f458ba7279f2b9f0333b933e9506c64c9434..4048266f1d061d580f2e92cb9d53f0f0f8aecb7e 100644 (file)
--- a/src/conf/schemas/domainsnapshot.rng
+++ b/src/conf/schemas/domainsnapshot.rng
@@ -127,7 +127,7 @@
     <element name="disk">
       <attribute name="name">
         <choice>
-          <ref name="diskTarget"/>
+          <ref name="diskTargetDev"/>
           <ref name="absFilePath"/>
         </choice>
       </attribute>