On Mon, Oct 12, 2009 at 11:00:30AM +0100, Mark McLoughlin wrote: > 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 > --- > docs/schemas/domain.rng | 86 ++++++++++++++++++++++++++++------------------- > 1 files changed, 51 insertions(+), 35 deletions(-) > > diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng > index b1987e1..1935f15 100644 > --- a/docs/schemas/domain.rng > +++ b/docs/schemas/domain.rng > @@ -157,53 +157,69 @@ > </define> > <define name="hvmx86"> > <group> > - <attribute name="arch"> > - <choice> > - <value>i686</value> > - <value>x86_64</value> > - </choice> > - </attribute> > - <attribute name="machine"> > - <choice> > - <value>xenfv</value> > - <value>pc</value> > - <value>isapc</value> > - </choice> > - </attribute> > + <optional> > + <attribute name="arch"> > + <choice> > + <value>i686</value> > + <value>x86_64</value> > + </choice> > + </attribute> > + </optional> > + <optional> > + <attribute name="machine"> > + <choice> > + <value>xenfv</value> > + <value>pc</value> > + <value>isapc</value> > + </choice> > + </attribute> > + </optional> > </group> > </define> > <define name="hvmmips"> > <group> > - <attribute name="arch"> > - <value>mips</value> > - </attribute> > - <attribute name="machine"> > - <value>mips</value> > - </attribute> > + <optional> > + <attribute name="arch"> > + <value>mips</value> > + </attribute> > + </optional> > + <optional> > + <attribute name="machine"> > + <value>mips</value> > + </attribute> > + </optional> > </group> > </define> > <define name="hvmsparc"> > <group> > - <attribute name="arch"> > - <value>sparc</value> > - </attribute> > - <attribute name="machine"> > - <value>sun4m</value> > - </attribute> > + <optional> > + <attribute name="arch"> > + <value>sparc</value> > + </attribute> > + </optional> > + <optional> > + <attribute name="machine"> > + <value>sun4m</value> > + </attribute> > + </optional> > </group> > </define> > <define name="hvmppc"> > <group> > - <attribute name="arch"> > - <value>ppc</value> > - </attribute> > - <attribute name="machine"> > - <choice> > - <value>g3beige</value> > - <value>mac99</value> > - <value>prep</value> > - </choice> > - </attribute> > + <optional> > + <attribute name="arch"> > + <value>ppc</value> > + </attribute> > + </optional> > + <optional> > + <attribute name="machine"> > + <choice> > + <value>g3beige</value> > + <value>mac99</value> > + <value>prep</value> > + </choice> > + </attribute> > + </optional> > </group> > </define> > <define name="osexe"> > -- ACK Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :| -- Libvir-list mailing list Libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list