From nobody Fri Apr 26 13:30:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1609934444; cv=none; d=zohomail.com; s=zohoarc; b=ZyVW7MLOxd1tFiG2moNZUfHsSMHWuEbH1BDdfWWTXpMg+RjYh05/GfIi6VUC27ZlKqOAMWM4elrvplMfxonnY0j0zdQA712dvuyaKAkoQ8aySWsUCK/L33l+FqUGsbnyau21Mh44QkrvPvL/ZHmv2tbtx+4xw+46m0DHpYlDyus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609934444; 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=DJ0YA758Mg+o8Xkzn8Xto9iVAZW9ms8FfBmDTMKK5wM=; b=OyZLcjhYsMahQcEH+X1DNE0NR+ydb2qDqxhG8mVvwPLKfDU9qI4xq8zyMDRSa203cad+tkU3xraThhIzSh5y0Eq6arlMhIa5jbN0FZUwwRSD+436arG/tmG5JVmIkN66GXp7oF87t0mKsuRuqbXbQjy6FecoaLzwIwinsJJ/6rQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1609934444747595.5091946153052; Wed, 6 Jan 2021 04:00:44 -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-423-FYglSh7TPIm2IkerUiD4Qw-1; Wed, 06 Jan 2021 07:00:41 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E8DBD10054FF; Wed, 6 Jan 2021 12:00:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A2C462464; Wed, 6 Jan 2021 12:00:34 +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 B03B34BB7B; Wed, 6 Jan 2021 12:00:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 106C0U5A012317 for ; Wed, 6 Jan 2021 07:00:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8929C37A0; Wed, 6 Jan 2021 12:00:30 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09FC35B699 for ; Wed, 6 Jan 2021 12:00:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609934443; 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=DJ0YA758Mg+o8Xkzn8Xto9iVAZW9ms8FfBmDTMKK5wM=; b=fLsxUbp2PZswPbgIRd7cbw5B8tH8gzbVUxgMwTzjPFxRxh5svmC8cGm9Kdg8Bl7dI6WDl3 2+gW3DtyTF63pywkIIwrOS/YDCsR6F3f2LN4r1Sz278zH3RWBwNH3J5D0DXQgr5x/M6wKu Aeiwdpf5wINVpG9tRoPDfUnRPumZOz0= X-MC-Unique: FYglSh7TPIm2IkerUiD4Qw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/3] schemas: Allow fsDriver to be interleaved Date: Wed, 6 Jan 2021 13:00:22 +0100 Message-Id: <733917ecd1b3b111690701764762483f46fee86a.1609934351.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.15 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" Our element can have child element. But with the way our schema is written it can't be interleaved and has to go first. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- docs/schemas/domaincommon.rng | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 86816e9b1d..49654624a9 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2628,10 +2628,10 @@ file - - - + + + @@ -2644,10 +2644,10 @@ block - - - + + + @@ -2663,13 +2663,13 @@ mount - - - - - - + + + + + + @@ -2684,10 +2684,10 @@ bind - - - + + + @@ -2700,10 +2700,10 @@ template - - - + + + @@ -2716,10 +2716,10 @@ ram - - - + + + --=20 2.26.2 From nobody Fri Apr 26 13:30:04 2024 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=1609934460; cv=none; d=zohomail.com; s=zohoarc; b=DNqUiLHPp01oVSkGd2/AettB4Zuy0tarZOcP3Uu6SJSWi5OwnFa2aAB3pF2oRD6YA1wl744ujhgT1EPvBIEdxIAQOU4BuzE0gG7EJaHFAc8DiIeiE4FvQpFi3EKcDOsJaCrx9HSIYKhIXe1dJ/HD+DS/ARA3/yqg8hpTzQKU5tE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609934460; 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=Y5MgWjAzfqRObyNVsoKf4kc74LmpDyJ4IBAQqgfrhPc=; b=V9uUZMyYjnS8AAHHMV7B/RDHvDUW8nk3uUxtO3a4gyHyPbk7w2MtXlXTLJmHn7DMTRQ0j/P8CFvzS61+8ZqWItskk381RIc/vR9IE0fsbn5ygV6QmLdZ9707R5NADTatUHxoO29cILvQHwnfQJX9xSu6HOEiRRV8kxttWh4h+/Y= 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 1609934460565708.2287498645633; Wed, 6 Jan 2021 04:01:00 -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-530-N6WrKc1sNNCCcAmHKLQeDA-1; Wed, 06 Jan 2021 07:00:57 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5EF68049C3; Wed, 6 Jan 2021 12:00:51 +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 A02C260C04; Wed, 6 Jan 2021 12:00:51 +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 6C71D1809CA3; Wed, 6 Jan 2021 12:00:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 106C0Vx6012325 for ; Wed, 6 Jan 2021 07:00:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id 657A85B699; Wed, 6 Jan 2021 12:00:31 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id DAB9B62464 for ; Wed, 6 Jan 2021 12:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609934459; 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=Y5MgWjAzfqRObyNVsoKf4kc74LmpDyJ4IBAQqgfrhPc=; b=PmRoIVirAUmvi7ACwKGFcyZCTgrheLhVqEPrTOfac5KUQKfZYv4p3gVqxtNHFS7rAxu2wI r0VHzODOGghrME49boVnuX9gRShI8pq7bxq0HlqM40bUkH2F9M3PK0dhcyhoIsBTWdKovl FY3Al5ixD7U5ziBcjCmBjDSY1hW9ZGU= X-MC-Unique: N6WrKc1sNNCCcAmHKLQeDA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/3] schemas: Allow interleaving of fsBinary children Date: Wed, 6 Jan 2021 13:00:23 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.12 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" The element of can have children elements ( and ). Allow them to be interleaved. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- docs/schemas/domaincommon.rng | 54 ++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 49654624a9..9f3b65b546 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2861,32 +2861,34 @@ - - - - - - none - always - - - - - - - - - - - - - - - - - - - + + + + + + + none + always + + + + + + + + + + + + + + + + + + + + =20 --=20 2.26.2 From nobody Fri Apr 26 13:30:04 2024 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=1609934460; cv=none; d=zohomail.com; s=zohoarc; b=Kew+5oIWOHr8opA/VUCXucAXU+Aiqm/MY8njLqkvV84442Gsvw4aMMhHzXlYwDj/kQIwuRyKERRodu9a9Z447tSuZYziMheJJ5kdVSGPw7kaIIfHMTLs05WYFwt/TA+OAFIZ/dWfwIe28+HlPzFsTM6puxgvGkLAmx0HEE4As3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609934460; 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=dNvwEgFEtjpeBY4lFMnQwdmChkkee9YION0iduvhWSE=; b=DXs2lBz6qpJt1i0JRvkjD4qVhZmcdoiBI6h2r9PN/FdvI3sMVD1KwfH9hrhdzxoSGkyGyFUVVBoRHybo7fRJJFyEkyggajRFKzRlmpeJat8lC9CU7cyM7qGgfSktKKJnqLvSksQg1qsh1ffLaeJQV13owVbX2aoXtv1K0ZSkyOk= 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 1609934460604982.8727902215638; Wed, 6 Jan 2021 04:01:00 -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-350-l_1bySFYPRmr7aZHeiBT8A-1; Wed, 06 Jan 2021 07:00:56 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1E6058049C0; Wed, 6 Jan 2021 12:00:51 +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 F209219C66; Wed, 6 Jan 2021 12:00:49 +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 B98451809CA1; Wed, 6 Jan 2021 12:00:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 106C0Wt8012339 for ; Wed, 6 Jan 2021 07:00:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 42A1C5B699; Wed, 6 Jan 2021 12:00:32 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id B71FB62464 for ; Wed, 6 Jan 2021 12:00:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609934458; 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=dNvwEgFEtjpeBY4lFMnQwdmChkkee9YION0iduvhWSE=; b=ZTYoH4XLRJVsqcEyjC7R51RVATha2TCevBSgR8q6YOTQhV2uS14AEY6c3TVwNXaSNXqxbA gnJtYaWFwi3c15gUpakeD+xTUaUXbpXFO9TwtWYtyiEXS9AxT9L/O7QtHCsgBX/NUWiRe/ PzbeFJYrGCEtXbKad6UNMZnkQrAfHeE= X-MC-Unique: l_1bySFYPRmr7aZHeiBT8A-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/3] schemas: Allow direct children of to be interleaved Date: Wed, 6 Jan 2021 13:00:24 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.23 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" Now that individual child elements allow their children to be interleaved, let's allow direct children of to be interleaved too. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- docs/schemas/domaincommon.rng | 346 +++++++++++++++++----------------- 1 file changed, 174 insertions(+), 172 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9f3b65b546..24b4994670 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2623,184 +2623,186 @@ - - - - file - - - - - - - - - - - - - - - - block - - - - - - - - - - - - - - - - - - mount - - - - - - - - - - - - - - - - - - - - - bind - - - - - - - - - - - - - - - - - template - - - - - - - - - - - - - - - - ram - - - - - - - - - - - - - - - - - - - - - - - - - - - passthrough - mapped - squash - - - - - - - default - remap - forbid - warn - - - - - - - - - - - - - - - + + + + file + + + + + + + + + + + + + + + + block + + + + + + + + + + + + + + + + + + mount + + + + + + + + + + + + + + + + + + + + + bind + + + + + + + + + + + + + + + + + template + + + + + + + + + + + + + + + + ram + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + passthrough + mapped + squash + + + + + + + default + remap + forbid + warn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + virtio + virtio-transitional + virtio-non-transitional + + - - - - virtio - virtio-transitional - virtio-non-transitional - - - --=20 2.26.2