[libvirt] [PATCH v2] schema: Allow space character in disk vendor/product

[Cole Robinson]

On 04/26/2016 10:23 AM, Daniel P. Berrange wrote:
> On Tue, Apr 26, 2016 at 10:11:41AM -0400, Cole Robinson wrote:
>> 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(-)
>>
>> 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 @@
>>        <optional>
>>          <element name="vendor">
>>            <data type="string">
>> -            <param name="pattern">[x20-x7E]{0,8}</param>
>> +            <!-- All printable characters -->
>> +            <param name="pattern">[ -~]{0,8}</param>
> 
> The reason the original pattern doesn't work is because that isn't
> the way you input hex characters in XML documents!  You need to
> use te &#xNNN; syntax eg I think this should work
> 
> <param name="pattern">[&#x20;-&#x7E;]{0,8}</param>
> 
> and would be equivalent to what you have done because the parser
> will then expand that to be [ -~] anyway.
> 

Thanks! I googled hard for a while to try and figure that out, but I thought
it was rng specific so that was probably why my searches didn't hit anything.
v3 sent

- Cole