[libvirt] [PATCH] Allow versioned pc machines for QEmu
* docs/schemas/domain.rng: add pattern for pc-0.10, pc-0.11 and similar machine types --- docs/schemas/domain.rng | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index d1d3efb..dd3f732 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -171,6 +171,9 @@ <value>xenfv</value> <value>pc</value> <value>isapc</value> + <data type="string"> + <param name="pattern">pc-[0-9\.]+</param> + </data> </choice> </attribute> </optional> -- 1.6.5.6
On Fri, Dec 11, 2009 at 02:12:20PM +0100, Diego Elio Petten? wrote:
* docs/schemas/domain.rng: add pattern for pc-0.10, pc-0.11 and similar machine types --- docs/schemas/domain.rng | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index d1d3efb..dd3f732 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -171,6 +171,9 @@ <value>xenfv</value> <value>pc</value> <value>isapc</value> + <data type="string"> + <param name="pattern">pc-[0-9\.]+</param> + </data> </choice> </attribute> </optional>
My preference is that we delete this <choice> block entirely and just declare it with a regex allowing a-Z, 0-9, _, -, . Even with your addition I know there are places where this will still break. The values for this attribute are dynamically extracted from the QEMU binary, so whatever QEMU reports is the only valid list. The RNG will always be chasing the QEMU changes if we try to duplicate the data. Regards, 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 :|
Il giorno Fri, 11/12/2009 alle 20.02 +0000, Daniel P. Berrange ha scritto:
My preference is that we delete this <choice> block entirely and just declare it with a regex allowing a-Z, 0-9, _, -, .
I guess whatever choice works ;) I'm mostly concerned that right now my configuration files don't validate… -- Diego Elio Pettenò — “Flameeyes” http://blog.flameeyes.eu/ If you found a .asc file in this mail and know not what it is, it's a GnuPG digital signature: http://www.gnupg.org/
On Fri, Dec 11, 2009 at 09:03:56PM +0100, Diego Elio “Flameeyes” Pettenò wrote:
Il giorno Fri, 11/12/2009 alle 20.02 +0000, Daniel P. Berrange ha scritto:
My preference is that we delete this <choice> block entirely and just declare it with a regex allowing a-Z, 0-9, _, -, .
I guess whatever choice works ;) I'm mostly concerned that right now my configuration files don't validate…
Okay, I commited the following patch, that should solve the problem, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
participants (4)
-
Daniel P. Berrange -
Daniel Veillard -
Diego Elio Pettenò -
Diego Elio “Flameeyes” Pettenò