From nobody Thu Mar 28 11:22:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1578501109; cv=none; d=zohomail.com; s=zohoarc; b=eBQDFFDxRaFr8Y98ydSZ/ZZuYjqHiv/9hNPMucU66QgywGKeUZQEudpsey0K0zVEHbZNJ8We7NRNxIvvJbBhIEsbQuP/FXh0Lm0pvfqZ3xGrnTqJD30t/3sBG6gvy+lTIBWqQnDZH+NC4f//PkFDy5z8kf/8ajdi87Z4uOuI9MA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578501109; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=cWi4nrY4uKVQ81ZnqKnkTImDWIMSB2i133mwOeqHlW8=; b=gRyTNQnH0xEmMfkeelMgq2yVjULtK+fD2bFxMvzAcz5+BFEzZJ9PObGYrClW+f3c6/lIdam0kjYChSJqryaYPUjB0RTOqm6PHMuzmm3KNO69nSa5RVYjz6+n0lBKwEaeLFO67DqbVhuPbBcsGuIfk1cYbpsBefq+g4rEfU6UFbU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1578501109228189.4959101895612; Wed, 8 Jan 2020 08:31:49 -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-167-3PXUQ7QtNK6_AvHc_qJO-A-1; Wed, 08 Jan 2020 11:31:45 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E67C800D4E; Wed, 8 Jan 2020 16:31:39 +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 774DC100194E; Wed, 8 Jan 2020 16:31:39 +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 2DFA7820F9; Wed, 8 Jan 2020 16:31:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 008GVc0w012457 for ; Wed, 8 Jan 2020 11:31:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id F134B5D9E1; Wed, 8 Jan 2020 16:31:37 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A0925D9E5 for ; Wed, 8 Jan 2020 16:31:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578501108; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=cWi4nrY4uKVQ81ZnqKnkTImDWIMSB2i133mwOeqHlW8=; b=ijq5P1m+jis+xYiwhpruL4JzW87GnO6gkMcJYMkbj+OVessVPZHCIol7A3atgu+JgJnjRN 3fcAyhIEd09VuPl0CdcIK/1VL/VzZm7ob46p7VwAYHR2iHYfkAlmphSZaHKoZtnlbYHPWk rgxFqqMw0ix/qw8FBFckSiVcWiIJ0Uo= From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 8 Jan 2020 17:31:17 +0100 Message-Id: <8ae23e795b4fca1e957d5723877bd4020028ba71.1578501077.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] schema: Allow iSCSI source to have interleaved children 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.22 X-MC-Unique: 3PXUQ7QtNK6_AvHc_qJO-A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There is no need to require users to produce iSCSI disk source following our ordering of children elements. In fact, we don't even accept our own order in the schema :(. Signed-off-by: Michal Privoznik Reviewed-by: Laine Stump --- docs/schemas/domaincommon.rng | 24 ++++++++++--------- .../disk-network-iscsi-modern.args | 9 ++++++- .../disk-network-iscsi-modern.xml | 13 ++++++++++ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9b555d6acb..76d94b156f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1772,17 +1772,19 @@ iscsi - - - - - - - - - - - + + + + + + + + + + + + + =20 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/= qemuxml2argvdata/disk-network-iscsi-modern.args index 762dc0e04a..57eaeb40ee 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args @@ -58,4 +58,11 @@ file.target=3Diqn.1992-01.com.example:server,file.lun=3D= 0,file.transport=3Dtcp,\ file.initiator-name=3Diqn.1992-01.com.example:client,format=3Draw,if=3Dnon= e,\ id=3Ddrive-scsi0-0-0-1 \ -device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,\ -drive=3Ddrive-scsi0-0-0-1,id=3Dscsi0-0-0-1 +drive=3Ddrive-scsi0-0-0-1,id=3Dscsi0-0-0-1 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:server,file.lun=3D0,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3DAQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HO= BlMQ1A,\ +file.initiator-name=3Diqn.1992-01.com.example:client,format=3Draw,if=3Dnon= e,\ +id=3Ddrive-scsi0-0-0-2 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D2,\ +drive=3Ddrive-scsi0-0-0-2,id=3Dscsi0-0-0-2 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml b/tests/q= emuxml2argvdata/disk-network-iscsi-modern.xml index 759d5e217f..07bb457bfa 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml @@ -65,6 +65,19 @@ + + + + + + + + + + + + + --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list