External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-03 15:43:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

smbios: allow () in smbios strings

Browse Source 
* docs/schemas/domain.rng (sysinf-value): Expand pattern.
* tests/qemuxml2argvdata/qemuxml2argv-smbios.xml: Prefer '' over
"" for attribute values.  Copy real hardware values.
* tests/qemuxml2argvdata/qemuxml2argv-smbios.args: Likewise.
This commit is contained in:
Eric Blake 2010-12-01 17:45:19 -07:00
parent 8cad56037b
commit a7666b9e38
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/schemas/domain.rng
View File

@ -1881,7 +1881,7 @@
<define name="sysinfo-value"> <define name="sysinfo-value">
<data type="string"> <data type="string">
<param name='pattern'>[a-zA-Z0-9/\-_\. ]+</param> <param name='pattern'>[a-zA-Z0-9/\-_\. \(\)]+</param>
</data> </data>
</define> </define>

2
tests/qemuxml2argvdata/qemuxml2argv-smbios.args
View File

@ -1 +1 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -smbios type=0,vendor=QEmu/KVM,version=0.13 -smbios type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,serial=32dfcb37-5af1-552b-357c-be8c3aa38310,uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red Hat -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -smbios type=0,vendor=LENOVO,version=6FET82WW (3.12 ) -smbios type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,serial=32dfcb37-5af1-552b-357c-be8c3aa38310,uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red Hat -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb

22
tests/qemuxml2argvdata/qemuxml2argv-smbios.xml
View File

@ -4,25 +4,25 @@
<memory>219200</memory> <memory>219200</memory>
<currentMemory>219200</currentMemory> <currentMemory>219200</currentMemory>
<vcpu>1</vcpu> <vcpu>1</vcpu>
<sysinfo type="smbios"> <sysinfo type='smbios'>
<bios> <bios>
<entry name="vendor">QEmu/KVM</entry> <entry name='vendor'>LENOVO</entry>
<entry name="version">0.13</entry> <entry name='version'>6FET82WW (3.12 )</entry>
</bios> </bios>
<system> <system>
<entry name="manufacturer">Fedora</entry> <entry name='manufacturer'>Fedora</entry>
<entry name="product">Virt-Manager</entry> <entry name='product'>Virt-Manager</entry>
<entry name="version">0.8.2-3.fc14</entry> <entry name='version'>0.8.2-3.fc14</entry>
<entry name="serial">32dfcb37-5af1-552b-357c-be8c3aa38310</entry> <entry name='serial'>32dfcb37-5af1-552b-357c-be8c3aa38310</entry>
<entry name="uuid">c7a5fdbd-edaf-9455-926a-d65c16db1809</entry> <entry name='uuid'>c7a5fdbd-edaf-9455-926a-d65c16db1809</entry>
<entry name="sku">1234567890</entry> <entry name='sku'>1234567890</entry>
<entry name="family">Red Hat</entry> <entry name='family'>Red Hat</entry>
</system> </system>
</sysinfo> </sysinfo>
<os> <os>
<type arch='i686' machine='pc'>hvm</type> <type arch='i686' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
<smbios mode="sysinfo"/> <smbios mode='sysinfo'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>