From patchwork Tue Apr 26 14:11:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 66701 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1638138qge; Tue, 26 Apr 2016 07:14:25 -0700 (PDT) X-Received: by 10.55.24.89 with SMTP id j86mr2604574qkh.154.1461680065518; Tue, 26 Apr 2016 07:14:25 -0700 (PDT) Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com. [209.132.183.25]) by mx.google.com with ESMTPS id n125si13633922qkf.225.2016.04.26.07.14.24 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Apr 2016 07:14:25 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u3QEBkRA013623; Tue, 26 Apr 2016 10:11:46 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u3QEBiNL027024 for ; Tue, 26 Apr 2016 10:11:44 -0400 Received: from colepc.redhat.com (ovpn-113-44.phx2.redhat.com [10.3.113.44]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3QEBib0011095; Tue, 26 Apr 2016 10:11:44 -0400 From: Cole Robinson To: libvirt-list@redhat.com Date: Tue, 26 Apr 2016 10:11:41 -0400 Message-Id: <2a52ab809c47861366eddda7c85976dc37a425db.1461679878.git.crobinso@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2] schema: Allow space character in disk vendor/product 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: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com The hex range already tried to allow for it, but it doesn't work for reasons I can't figure out. Use a plain character range instead, and test it --- v2: send the fully squashed patch docs/schemas/domaincommon.rng | 6 ++++-- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml | 4 ++-- tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) -- 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 3605afe..6c80b66 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1165,14 +1165,16 @@ - [x20-x7E]{0,8} + + [ -~]{0,8} - [x20-x7E]{0,16} + + [ -~]{0,16} diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args index df118e3..1831ebd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -24,6 +24,6 @@ QEMU_AUDIO_DRV=none \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi1-0-0 \ --device scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0,\ -vendor=SEAGATE,product=ST3567807GD \ +-device 'scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0,\ +vendor=SEA GATE,product=ST67 807GD' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml index 13004c1..b32b746 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml @@ -26,8 +26,8 @@ - SEAGATE - ST3567807GD + SEA GATE + ST67 807GD
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml index 42c7bcd..9e1e7af 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml @@ -26,8 +26,8 @@ - SEAGATE - ST3567807GD + SEA GATE + ST67 807GD