On 2012年04月17日 22:49, Eric Blake wrote:
On 04/16/2012 10:45 PM, Osier Yang wrote:
Two follow up patches, one is to update test read-bufsiz to delete the UUID, as domain UUID for test driver is fixed now. The other is to allow the parsing of "cpuset" if the "placement" is not specified, but "cpuset" is specified, and in this case the "placement" mode will be set as "static".
0001-conf-Do-not-parse-cpuset-only-if-the-placement-is-au.patch
From 270bb38c25e4fbed32193838dc81ec52a46780c3 Mon Sep 17 00:00:00 2001 From: Osier Yang<jyang@redhat.com> Date: Tue, 17 Apr 2012 12:40:03 +0800 Subject: [PATCH] conf: Do not parse cpuset only if the placement is auto
So that a domain xml which doesn't have "placement" specified, but "cpuset" is specified, could be parsed. And in this case, the "placement" mode will be set as "static". --- src/conf/domain_conf.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b28ae5c..65a35c3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7896,11 +7896,10 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } VIR_FREE(tmp); } else { - if (def->cpumasklen) - def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC; + def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_DEFAULT; }
- if (def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC) { + if (def->placement_mode != VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { tmp = virXPathString("string(./vcpu[1]/@cpuset)", ctxt); if (tmp) { char *set = tmp; @@ -7912,6 +7911,8 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def->cpumasklen)< 0) goto error; VIR_FREE(tmp); + if (def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_DEFAULT) + def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC;
ACK, and this fixes the 'make check' failures introduced yesterday.
Subject: [PATCH] tests: Update read-bufsiz to delete the UUID of vm XML
Since now we have fixed domain UUID for test driver, defining a domain with different name but same UUID doesn't work any more. This patch delete the UUID from the dumped XML so that it could be generated. --- tests/read-bufsiz | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/read-bufsiz b/tests/read-bufsiz index 2a91bcf..a4c6007 100755 --- a/tests/read-bufsiz +++ b/tests/read-bufsiz @@ -32,8 +32,10 @@ fail=0 # Output a valid definition, to be used as input. $abs_top_builddir/tools/virsh -c test:///default dumpxml 1> xml.t || fail=1
-# Change the VM name -sed -e "s|<name>test</name>|<name>newtest</name>|g" xml.t> xml +# Change the VM name and UUID +sed -e "s|<name>test</name>|<name>newtest</name>|g" \ + -e "\|<uuid>.*</uuid>|d" \ + xml.t> xml
ACK, and this fixes the problems introduced with the hard-coded UUID.
Please apply.
Thanks, pushed all the 3 patches. Regards, Osier