[libvirt] [PATCH] conf: Requires either uuid or usage of secret

As the RNG schema for disk auth secret implies, it requires either "uuid" or "secret": <define name='diskAuthSecret'> <element name='secret'> <attribute name='type'> <choice> <value>ceph</value> <value>iscsi</value> </choice> </attribute> <choice> <attribute name='uuid'> <ref name="UUID"/> </attribute> <attribute name='usage'> <ref name='genericName'/> </attribute> </choice> </element> </define> --- src/conf/domain_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2373397..9297937 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4972,6 +4972,14 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, _("only one of uuid and usage can be specified")); goto error; } + + if (!authUUID && !authUsage) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("either uuid or usage should be " + "specified for a secret")); + goto error; + } + if (authUUID != NULL) { def->auth.secretType = VIR_DOMAIN_DISK_SECRET_TYPE_UUID; if (virUUIDParse(authUUID, -- 1.8.1.4

On Fri, Jun 21, 2013 at 09:13:58 +0200, Jiri Denemark wrote:
On Thu, Jun 20, 2013 at 18:27:04 +0800, Osier Yang wrote:
As the RNG schema for disk auth secret implies, it requires either "uuid" or "secret":
s/"secret"/"usage"/
This requirement also matches documentation.
ACK
Fixed and pushed. Jirka
participants (2)
-
Jiri Denemark
-
Osier Yang