[libvirt PATCH v3 3/8] schema: Move guest cpu definition to cputypes.rng

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; Reviewed-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- docs/schemas/cputypes.rng | 39 +++++++++++++++++++++++++++++++ docs/schemas/domaincommon.rng | 43 +---------------------------------- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng index a2d4dbe9d1..88f6904343 100644 --- a/docs/schemas/cputypes.rng +++ b/docs/schemas/cputypes.rng @@ -373,4 +373,43 @@ </element> </define> + <define name="guestcpu"> + <element name="cpu"> + <optional> + <ref name="cpuMode"/> + </optional> + <optional> + <ref name="cpuMatch"/> + </optional> + <optional> + <ref name="cpuCheck"/> + </optional> + <optional> + <attribute name="migratable"> + <ref name="virOnOff"/> + </attribute> + </optional> + <interleave> + <optional> + <ref name="cpuModel"/> + </optional> + <optional> + <ref name="cpuVendor"/> + </optional> + <optional> + <ref name="cpuTopology"/> + </optional> + <zeroOrMore> + <ref name="cpuFeature"/> + </zeroOrMore> + <optional> + <ref name="cpuNuma"/> + </optional> + <optional> + <ref name="cpuCache"/> + </optional> + </interleave> + </element> + </define> + </grammar> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 6155f71109..ebca924801 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -44,7 +44,7 @@ <ref name="metadata"/> </optional> <optional> - <ref name="cpu"/> + <ref name="guestcpu"/> </optional> <zeroOrMore> <ref name="sysinfo"/> @@ -5536,47 +5536,6 @@ </element> </optional> </define> - <!-- - CPU specification - --> - <define name="cpu"> - <element name="cpu"> - <optional> - <ref name="cpuMode"/> - </optional> - <optional> - <ref name="cpuMatch"/> - </optional> - <optional> - <ref name="cpuCheck"/> - </optional> - <optional> - <attribute name="migratable"> - <ref name="virOnOff"/> - </attribute> - </optional> - <interleave> - <optional> - <ref name="cpuModel"/> - </optional> - <optional> - <ref name="cpuVendor"/> - </optional> - <optional> - <ref name="cpuTopology"/> - </optional> - <zeroOrMore> - <ref name="cpuFeature"/> - </zeroOrMore> - <optional> - <ref name="cpuNuma"/> - </optional> - <optional> - <ref name="cpuCache"/> - </optional> - </interleave> - </element> - </define> <!-- System information specification: -- 2.26.2