[libvirt] [PATCH] schemas: Fix cpu element schema

Both vendor and topology elements are optional. --- docs/schemas/domain.rng | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fb44335..08ebefb 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1745,6 +1745,8 @@ <ref name="cpuModel"/> <optional> <ref name="cpuVendor"/> + </optional> + <optional> <ref name="cpuTopology"/> </optional> <zeroOrMore> -- 1.7.3.2

On 12/01/2010 07:50 AM, Jiri Denemark wrote:
Both vendor and topology elements are optional. --- docs/schemas/domain.rng | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fb44335..08ebefb 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1745,6 +1745,8 @@ <ref name="cpuModel"/> <optional> <ref name="cpuVendor"/> + </optional> + <optional> <ref name="cpuTopology"/>
ACK; makes it so that either one can be used in isolation, instead of a both-or-none approach. Do we have a corresponding .xml file somewhere in the tests/ hierarchy that will test this? -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

@@ -1745,6 +1745,8 @@ <ref name="cpuModel"/> <optional> <ref name="cpuVendor"/> + </optional> + <optional> <ref name="cpuTopology"/>
ACK; makes it so that either one can be used in isolation, instead of a both-or-none approach. Do we have a corresponding .xml file somewhere in the tests/ hierarchy that will test this?
Yes, it's included in [PATCH 2/2] tests: Add tests for CPU selection in qemu driver That's how I found this error in the schema. Jirka

On 12/01/2010 01:27 PM, Jiri Denemark wrote:
@@ -1745,6 +1745,8 @@ <ref name="cpuModel"/> <optional> <ref name="cpuVendor"/> + </optional> + <optional> <ref name="cpuTopology"/>
ACK; makes it so that either one can be used in isolation, instead of a both-or-none approach. Do we have a corresponding .xml file somewhere in the tests/ hierarchy that will test this?
Yes, it's included in [PATCH 2/2] tests: Add tests for CPU selection in qemu driver
That's how I found this error in the schema.
Good to know. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fb44335..08ebefb 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1745,6 +1745,8 @@ <ref name="cpuModel"/> <optional> <ref name="cpuVendor"/> + </optional> + <optional> <ref name="cpuTopology"/>
ACK; makes it so that either one can be used in isolation, instead of a both-or-none approach.
Thanks, I pushed the patch. Jirka
participants (2)
-
Eric Blake
-
Jiri Denemark