[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 3/2] smbios: allow () in smbios strings



* 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 should address some of the issues I raised in
https://www.redhat.com/archives/libvir-list/2010-December/msg00086.html
(still missing is docs/formatdomain.html.in for all of this).

 docs/schemas/domain.rng                         |    2 +-
 tests/qemuxml2argvdata/qemuxml2argv-smbios.args |    2 +-
 tests/qemuxml2argvdata/qemuxml2argv-smbios.xml  |   22 +++++++++++-----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index 6c47ea0..d08d763 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -1879,7 +1879,7 @@

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

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
index b5e4783..12ef04f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
@@ -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
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml b/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml
index 45b6dba..23ec1a7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml
@@ -4,25 +4,25 @@
   <memory>219200</memory>
   <currentMemory>219200</currentMemory>
   <vcpu>1</vcpu>
-  <sysinfo type="smbios">
+  <sysinfo type='smbios'>
     <bios>
-      <entry name="vendor">QEmu/KVM</entry>
-      <entry name="version">0.13</entry>
+      <entry name='vendor'>LENOVO</entry>
+      <entry name='version'>6FET82WW (3.12 )</entry>
     </bios>
     <system>
-      <entry name="manufacturer">Fedora</entry>
-      <entry name="product">Virt-Manager</entry>
-      <entry name="version">0.8.2-3.fc14</entry>
-      <entry name="serial">32dfcb37-5af1-552b-357c-be8c3aa38310</entry>
-      <entry name="uuid">c7a5fdbd-edaf-9455-926a-d65c16db1809</entry>
-      <entry name="sku">1234567890</entry>
-      <entry name="family">Red Hat</entry>
+      <entry name='manufacturer'>Fedora</entry>
+      <entry name='product'>Virt-Manager</entry>
+      <entry name='version'>0.8.2-3.fc14</entry>
+      <entry name='serial'>32dfcb37-5af1-552b-357c-be8c3aa38310</entry>
+      <entry name='uuid'>c7a5fdbd-edaf-9455-926a-d65c16db1809</entry>
+      <entry name='sku'>1234567890</entry>
+      <entry name='family'>Red Hat</entry>
     </system>
   </sysinfo>
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
-    <smbios mode="sysinfo"/>
+    <smbios mode='sysinfo'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
-- 
1.7.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]