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>
This commit is contained in:
Peter Krempa 2022-10-20 14:18:17 +02:00
parent 640448cc14
commit d4b00a6572
4 changed files with 9 additions and 8 deletions

View File

@ -157,7 +157,7 @@
<oneOrMore> <oneOrMore>
<element name="disk"> <element name="disk">
<attribute name="name"> <attribute name="name">
<ref name="diskTarget"/> <ref name="diskTargetDev"/>
</attribute> </attribute>
<ref name="backupDiskMode"/> <ref name="backupDiskMode"/>
<choice> <choice>
@ -227,7 +227,7 @@
<oneOrMore> <oneOrMore>
<element name="disk"> <element name="disk">
<attribute name="name"> <attribute name="name">
<ref name="diskTarget"/> <ref name="diskTargetDev"/>
</attribute> </attribute>
<ref name="backupDiskMode"/> <ref name="backupDiskMode"/>
<optional> <optional>

View File

@ -55,7 +55,7 @@
<element name="disk"> <element name="disk">
<attribute name="name"> <attribute name="name">
<choice> <choice>
<ref name="diskTarget"/> <ref name="diskTargetDev"/>
<ref name="absFilePath"/> <ref name="absFilePath"/>
</choice> </choice>
</attribute> </attribute>

View File

@ -1511,7 +1511,7 @@
<optional> <optional>
<ref name="diskAuth"/> <ref name="diskAuth"/>
</optional> </optional>
<ref name="target"/> <ref name="diskTarget"/>
<optional> <optional>
<ref name="deviceBoot"/> <ref name="deviceBoot"/>
</optional> </optional>
@ -2348,15 +2348,16 @@
</element> </element>
</define> </define>
<define name="diskTarget"> <define name="diskTargetDev">
<data type="string"> <data type="string">
<param name="pattern">(ioemu:)?(fd|hd|sd|vd|xvd|ubd)[a-zA-Z0-9_]+</param> <param name="pattern">(ioemu:)?(fd|hd|sd|vd|xvd|ubd)[a-zA-Z0-9_]+</param>
</data> </data>
</define> </define>
<define name="target">
<define name="diskTarget">
<element name="target"> <element name="target">
<attribute name="dev"> <attribute name="dev">
<ref name="diskTarget"/> <ref name="diskTargetDev"/>
</attribute> </attribute>
<optional> <optional>
<attribute name="bus"> <attribute name="bus">

View File

@ -127,7 +127,7 @@
<element name="disk"> <element name="disk">
<attribute name="name"> <attribute name="name">
<choice> <choice>
<ref name="diskTarget"/> <ref name="diskTargetDev"/>
<ref name="absFilePath"/> <ref name="absFilePath"/>
</choice> </choice>
</attribute> </attribute>