From nobody Mon Feb 9 03:00:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1609952318; cv=none; d=zohomail.com; s=zohoarc; b=FGdOkYwZqtZrcmjU/8tf01S9qHGx+LKr1cXByo1/K42qbhSDSvbA4XS1nYElKxNWjyyGFvhbv8KMTQO6rZh8m2fFuo7/ukUT40ycy9c/hrB2HtyxWU4p8sPNkM6ps4sLqKzaVeWv6QAa78gL8LVlhCtdIP/Kc9heL6EPeRGV6No= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609952318; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YOquAO85ARkWbIVgNRnCEhnhccQOegrv7fh69dv3vuM=; b=Cd+eTXk2sRnRSKo/LcJVp5VubjnDxNsfiwjRnTt3j0oYXatsR5HkuNqmvMEf4mSVe1wqqUVg32Uiso8i9NLRakBlWw6htEv1fJWhINkSm/oZVhTc1/4jZ3wQF0eRlmcRLEY6k75RuBi9uhJoMCUymxbkkDxmnYQyW8qx7nMOJSs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1609952318830708.2373705819651; Wed, 6 Jan 2021 08:58:38 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-434-o09Py4mzOXy_CpFAMQoMdg-1; Wed, 06 Jan 2021 11:58:35 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DF040190A7A2; Wed, 6 Jan 2021 16:58:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD2E01802E; Wed, 6 Jan 2021 16:58:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 85E5D1809CA2; Wed, 6 Jan 2021 16:58:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 106GwHqt022441 for ; Wed, 6 Jan 2021 11:58:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6CD905C72F; Wed, 6 Jan 2021 16:58:17 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99DFC5C1C4 for ; Wed, 6 Jan 2021 16:58:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609952317; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=YOquAO85ARkWbIVgNRnCEhnhccQOegrv7fh69dv3vuM=; b=Mv5xeOCSms1demWj6/u7O5Q9ND3wTIVKAkQdzJrKM+VI0SWqpnBSeJQlKra2wQw59Y+cpP IEdtfGm5HOt6Z0OLOpB+J/dABvz7Cts5KMHc9/2KFOJgsjAw9p6JE72omJZzDct0sl1m+2 JyWwYSKyWJfStOoTudbqAU/aP+Q+LbA= X-MC-Unique: o09Py4mzOXy_CpFAMQoMdg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 6/7] schema: Add define for object names Date: Wed, 6 Jan 2021 17:58:00 +0100 Message-Id: <5e2d01f0b39d1477b21f383428f0788dd2448862.1609952208.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 --- 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/basictypes.rng b/docs/schemas/basictypes.rng index fc52799466..a221ff6295 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -261,6 +261,19 @@ + + + + [^\n]+ + + + + + + [^/\n]+ + + + [a-zA-Z0-9_\+\-]+ 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 @@ -18,9 +18,7 @@ - - [^\n]+ - + @@ -559,7 +557,7 @@ - + @@ -1391,7 +1389,7 @@ - + @@ -2056,7 +2054,7 @@ - + @@ -3269,7 +3267,7 @@ - + @@ -6944,11 +6942,6 @@ 1000 - - - [^\n]+ - - [A-Za-z0-9_\.\+\- ]+ diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng index 54619d4cb0..e3d08a8410 100644 --- a/docs/schemas/storagecommon.rng +++ b/docs/schemas/storagecommon.rng @@ -6,12 +6,6 @@ - - - [^/\n]+ - - - diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index a87d22f6fc..bd24b8b8d0 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -247,7 +247,7 @@ - + @@ -261,7 +261,7 @@ - + --=20 2.29.2