Re: [PATCH 6/7] schema: Add define for object names

On Wed, Jan 06, 2021 at 21:59:21 +0100, Ján Tomko wrote: > On a Wednesday in 2021, Peter Krempa wrote: > > Objects such as domain, pool, etc re-define the regex for the format. > > Add more generic types for objects with/without a slash which we'll be > > able to reuse also for other objects. > > > > Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; > > --- > > docs/schemas/basictypes.rng | 13 +++++++++++++ > > docs/schemas/domaincommon.rng | 17 +++++------------ > > docs/schemas/storagecommon.rng | 6 ------ > > docs/schemas/storagepool.rng | 4 ++-- > > 4 files changed, 20 insertions(+), 20 deletions(-) [...] > > diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng > > index 39bed92115..4fc6a7ee7a 100644 > > --- a/docs/schemas/domaincommon.rng > > +++ b/docs/schemas/domaincommon.rng [...] > > @@ -559,7 +557,7 @@ > > </optional> > > <interleave> > > <element name="name"> > > - <ref name="domainName"/> > > + <ref name="objectNameWithSlash"/> > > This is the domain name and cannot contain a slash. This is not true entirely. The check in the code that enforces that '/' is not in the domain name is conditional.

It's based on the VIR_DOMAIN_DEF_FEATURE_NAME_SLASH flag being asserted by the hypervisors which don't refuse slash in domain name. The following drivers use it: src/openvz/openvz_conf.c: .features = VIR_DOMAIN_DEF_FEATURE_NAME_SLASH, src/vbox/vbox_common.c: .features = VIR_DOMAIN_DEF_FEATURE_NAME_SLASH, src/vmx/vmx.c: VIR_DOMAIN_DEF_FEATURE_NAME_SLASH | > > </element> > > <optional> > > <element name="uuid"> > > @@ -1391,7 +1389,7 @@ > > <optional> > > <element name="backenddomain"> > > <attribute name="name"> > > - <ref name="domainName"/> > > + <ref name="objectNameWithSlash"/> > > Added by: > > conf: support backend domain name in disk and network devices > > At least Xen supports backend drivers in another domain (aka "driver > domain"). This patch introduces an XML config option for specifying the > backend domain name for <disk> and <interface> devices. E.g. > > <disk> > <backenddomain name='diskvm'/> > ... > </disk> > <interface type='bridge'> > <backenddomain name='netvm'/> > ... > </interface> > > I see no need to relax this to allow a slash. This isn't relaxing it, but merely keeping it as it was, since 'domainName' rng type allows slash. On the other hand, nothing actually uses 'backenddomain', so we can use the stricter version without any problem.

> > > </attribute> > > <empty/> > > </element>