[PATCH 11/12] 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(a)redhat.com&gt; --- src/conf/schemas/domainbackup.rng | 4 ++-- src/conf/schemas/domaincheckpoint.rng | 2 +- src/conf/schemas/domaincommon.rng | 9 +++++---- src/conf/schemas/domainsnapshot.rng | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/conf/schemas/domainbackup.rng b/src/conf/schemas/domainbackup.rng index 1ac9da62c1..bfc29a6c06 100644 --- 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 a1c8b0bb9c..72c4186235 100644 --- 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 85e2e0c57b..ebb39de3ef 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -1512,7 +1512,7 @@ <optional> <ref name="diskAuth"/> </optional> - <ref name="target"/> + <ref name="diskTarget"/> <optional> <ref name="deviceBoot"/> </optional> @@ -2351,15 +2351,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 3db9f458ba..4048266f1d 100644 --- 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> -- 2.38.1