[libvirt] [PATCH] 4/4 Add SMBIOS test data
Add an entry in the test suite and add the new flag detection
Note that the UUID will have to be fixed as QEmu check the UUID format
and requires the standard formation with dashes
Daniel
libvirt/tests/qemuxml2argvdata/qemuxml2argv-smbios.args:
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="32dfcb375af1552b357cbe8c3aa38310",uuid="c7a5fdbdedaf9455926ad65c16db1809"
-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda
/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
libvirt/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory>219200</memory>
<currentMemory>219200</currentMemory>
<vcpu>1</vcpu>
<smbios>
<table type="0">
<entry name="Vendor">QEmu/KVM</entry>
<entry name="Version">0.13</entry>
</table>
<table type="1">
<entry name="Manufacturer">Fedora</entry>
<entry name="Product">Virt-Manager</entry>
<entry name="Version">0.8.2-3.fc14</entry>
<entry name="Serial">32dfcb375af1552b357cbe8c3aa38310</entry>
<entry name="UUID">c7a5fdbdedaf9455926ad65c16db1809</entry>
</table>
</smbios>
<os>
<type arch='i686' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
unit='0'/>
</disk>
<controller type='ide' index='0'/>
<memballoon model='virtio'/>
</devices>
</domain>
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index d4453db..afd1e4a 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -196,7 +196,8 @@ mymain(int argc, char **argv)
QEMUD_CMD_FLAG_NO_HPET |
QEMUD_CMD_FLAG_NO_KVM_PIT |
QEMUD_CMD_FLAG_TDF |
- QEMUD_CMD_FLAG_NESTING,
+ QEMUD_CMD_FLAG_NESTING |
+ QEMUD_CMD_FLAG_SMBIOS_TYPE,
10050, 1, 0);
DO_TEST("qemu-kvm-0.11.0-rc2",
QEMUD_CMD_FLAG_VNC_COLON |
@@ -225,7 +226,8 @@ mymain(int argc, char **argv)
QEMUD_CMD_FLAG_TDF |
QEMUD_CMD_FLAG_BOOT_MENU |
QEMUD_CMD_FLAG_NESTING |
- QEMUD_CMD_FLAG_NAME_PROCESS,
+ QEMUD_CMD_FLAG_NAME_PROCESS |
+ QEMUD_CMD_FLAG_SMBIOS_TYPE,
10092, 1, 0);
DO_TEST("qemu-0.12.1",
QEMUD_CMD_FLAG_VNC_COLON |
@@ -251,7 +253,8 @@ mymain(int argc, char **argv)
QEMUD_CMD_FLAG_RTC |
QEMUD_CMD_FLAG_NO_HPET |
QEMUD_CMD_FLAG_BOOT_MENU |
- QEMUD_CMD_FLAG_NAME_PROCESS,
+ QEMUD_CMD_FLAG_NAME_PROCESS |
+ QEMUD_CMD_FLAG_SMBIOS_TYPE,
12001, 0, 0);
DO_TEST("qemu-kvm-0.12.3",
QEMUD_CMD_FLAG_VNC_COLON |
@@ -284,7 +287,8 @@ mymain(int argc, char **argv)
QEMUD_CMD_FLAG_TDF |
QEMUD_CMD_FLAG_BOOT_MENU |
QEMUD_CMD_FLAG_NESTING |
- QEMUD_CMD_FLAG_NAME_PROCESS,
+ QEMUD_CMD_FLAG_NAME_PROCESS |
+ QEMUD_CMD_FLAG_SMBIOS_TYPE,
12003, 1, 0);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 551d6c4..eb66620 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -358,6 +358,8 @@ mymain(int argc, char **argv)
DO_TEST("console-virtio", QEMUD_CMD_FLAG_DEVICE |
QEMUD_CMD_FLAG_NODEFCONFIG);
+ DO_TEST("smbios", QEMUD_CMD_FLAG_SMBIOS_TYPE);
+
DO_TEST("watchdog", 0);
DO_TEST("watchdog-device", QEMUD_CMD_FLAG_DEVICE |
QEMUD_CMD_FLAG_NODEFCONFIG);
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/