提交 600a666c 编写于 作者: C Cole Robinson

schema: Allow space character in disk vendor/product

The hex range already tried to allow for it, but it wasn't using
the correct XML hex syntax. Fix it, and test it
上级 10ef8c66
...@@ -1165,14 +1165,16 @@ ...@@ -1165,14 +1165,16 @@
<optional> <optional>
<element name="vendor"> <element name="vendor">
<data type="string"> <data type="string">
<param name="pattern">[x20-x7E]{0,8}</param> <!-- All printable characters -->
<param name="pattern">[&#x20;-&#x7E;]{0,8}</param>
</data> </data>
</element> </element>
</optional> </optional>
<optional> <optional>
<element name="product"> <element name="product">
<data type="string"> <data type="string">
<param name="pattern">[x20-x7E]{0,16}</param> <!-- All printable characters -->
<param name="pattern">[&#x20;-&#x7E;]{0,16}</param>
</data> </data>
</element> </element>
</optional> </optional>
......
...@@ -24,6 +24,6 @@ QEMU_AUDIO_DRV=none \ ...@@ -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,\ -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 \ id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi1-0-0 \ -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,\ -device 'scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0,\
vendor=SEAGATE,product=ST3567807GD \ vendor=SEA GATE,product=ST67 807GD' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<source dev='/dev/HostVG/QEMUGuest2'/> <source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='sdb' bus='scsi'/> <target dev='sdb' bus='scsi'/>
<readonly/> <readonly/>
<vendor>SEAGATE</vendor> <vendor>SEA GATE</vendor>
<product>ST3567807GD</product> <product>ST67 807GD</product>
<address type='drive' controller='1' bus='0' target='0' unit='0'/> <address type='drive' controller='1' bus='0' target='0' unit='0'/>
</disk> </disk>
<controller type='usb' index='0'/> <controller type='usb' index='0'/>
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<source dev='/dev/HostVG/QEMUGuest2'/> <source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='sdb' bus='scsi'/> <target dev='sdb' bus='scsi'/>
<readonly/> <readonly/>
<vendor>SEAGATE</vendor> <vendor>SEA GATE</vendor>
<product>ST3567807GD</product> <product>ST67 807GD</product>
<address type='drive' controller='1' bus='0' target='0' unit='0'/> <address type='drive' controller='1' bus='0' target='0' unit='0'/>
</disk> </disk>
<controller type='usb' index='0'> <controller type='usb' index='0'>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册