mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
Fix schema to allow missing machine type
The domain/os/type element may have an arch specified without having a machine variant specified. In fact, this is what python-virtinst does when defining a guest. * docs/schemas/domain.rng: allow missing machine type
This commit is contained in:
+51
-35
@@ -157,53 +157,69 @@
|
|||||||
</define>
|
</define>
|
||||||
<define name="hvmx86">
|
<define name="hvmx86">
|
||||||
<group>
|
<group>
|
||||||
<attribute name="arch">
|
<optional>
|
||||||
<choice>
|
<attribute name="arch">
|
||||||
<value>i686</value>
|
<choice>
|
||||||
<value>x86_64</value>
|
<value>i686</value>
|
||||||
</choice>
|
<value>x86_64</value>
|
||||||
</attribute>
|
</choice>
|
||||||
<attribute name="machine">
|
</attribute>
|
||||||
<choice>
|
</optional>
|
||||||
<value>xenfv</value>
|
<optional>
|
||||||
<value>pc</value>
|
<attribute name="machine">
|
||||||
<value>isapc</value>
|
<choice>
|
||||||
</choice>
|
<value>xenfv</value>
|
||||||
</attribute>
|
<value>pc</value>
|
||||||
|
<value>isapc</value>
|
||||||
|
</choice>
|
||||||
|
</attribute>
|
||||||
|
</optional>
|
||||||
</group>
|
</group>
|
||||||
</define>
|
</define>
|
||||||
<define name="hvmmips">
|
<define name="hvmmips">
|
||||||
<group>
|
<group>
|
||||||
<attribute name="arch">
|
<optional>
|
||||||
<value>mips</value>
|
<attribute name="arch">
|
||||||
</attribute>
|
<value>mips</value>
|
||||||
<attribute name="machine">
|
</attribute>
|
||||||
<value>mips</value>
|
</optional>
|
||||||
</attribute>
|
<optional>
|
||||||
|
<attribute name="machine">
|
||||||
|
<value>mips</value>
|
||||||
|
</attribute>
|
||||||
|
</optional>
|
||||||
</group>
|
</group>
|
||||||
</define>
|
</define>
|
||||||
<define name="hvmsparc">
|
<define name="hvmsparc">
|
||||||
<group>
|
<group>
|
||||||
<attribute name="arch">
|
<optional>
|
||||||
<value>sparc</value>
|
<attribute name="arch">
|
||||||
</attribute>
|
<value>sparc</value>
|
||||||
<attribute name="machine">
|
</attribute>
|
||||||
<value>sun4m</value>
|
</optional>
|
||||||
</attribute>
|
<optional>
|
||||||
|
<attribute name="machine">
|
||||||
|
<value>sun4m</value>
|
||||||
|
</attribute>
|
||||||
|
</optional>
|
||||||
</group>
|
</group>
|
||||||
</define>
|
</define>
|
||||||
<define name="hvmppc">
|
<define name="hvmppc">
|
||||||
<group>
|
<group>
|
||||||
<attribute name="arch">
|
<optional>
|
||||||
<value>ppc</value>
|
<attribute name="arch">
|
||||||
</attribute>
|
<value>ppc</value>
|
||||||
<attribute name="machine">
|
</attribute>
|
||||||
<choice>
|
</optional>
|
||||||
<value>g3beige</value>
|
<optional>
|
||||||
<value>mac99</value>
|
<attribute name="machine">
|
||||||
<value>prep</value>
|
<choice>
|
||||||
</choice>
|
<value>g3beige</value>
|
||||||
</attribute>
|
<value>mac99</value>
|
||||||
|
<value>prep</value>
|
||||||
|
</choice>
|
||||||
|
</attribute>
|
||||||
|
</optional>
|
||||||
</group>
|
</group>
|
||||||
</define>
|
</define>
|
||||||
<define name="osexe">
|
<define name="osexe">
|
||||||
|
|||||||
Reference in New Issue
Block a user