aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMatthias Bolte <matthias.bolte@googlemail.com>2010-12-30 18:08:54 +0100
committerMatthias Bolte <matthias.bolte@googlemail.com>2011-01-06 18:18:35 +0100
commitc2a6b26647fd89511e220f050e888ce52b4f74d4 (patch)
treeaaaabe4aa4f5aef125095c585ca7b79051a0533e /tests
parentvbox: Use correct VRAM size unit (diff)
downloadlibvirt-c2a6b26647fd89511e220f050e888ce52b4f74d4.tar.gz
libvirt-c2a6b26647fd89511e220f050e888ce52b4f74d4.tar.bz2
libvirt-c2a6b26647fd89511e220f050e888ce52b4f74d4.zip
vmx: Add support for video device VRAM size
Update test suite accordingly.
Diffstat (limited to 'tests')
-rw-r--r--tests/vmx2xmldata/vmx2xml-annotation.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-ethernet-custom.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-ethernet-generated.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-ethernet-other.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-ethernet-static.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-floppy-device.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-floppy-file.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-graphics-vnc.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-minimal-64bit.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-minimal.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-parallel-device.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-parallel-file.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-scsi-driver.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-serial-device.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-serial-file.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-serial-network-client.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-serial-network-server.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-serial-pipe.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-smbios.xml3
-rw-r--r--tests/vmx2xmldata/vmx2xml-svga.vmx3
-rw-r--r--tests/vmx2xmldata/vmx2xml-svga.xml18
-rw-r--r--tests/vmx2xmltest.c2
-rw-r--r--tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx1
-rw-r--r--tests/xml2vmxdata/xml2vmx-svga.vmx11
-rw-r--r--tests/xml2vmxdata/xml2vmx-svga.xml13
-rw-r--r--tests/xml2vmxtest.c2
48 files changed, 173 insertions, 0 deletions
diff --git a/tests/vmx2xmldata/vmx2xml-annotation.xml b/tests/vmx2xmldata/vmx2xml-annotation.xml
index 1af45aad6..f42f77b5c 100644
--- a/tests/vmx2xmldata/vmx2xml-annotation.xml
+++ b/tests/vmx2xmldata/vmx2xml-annotation.xml
@@ -12,5 +12,8 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
index b47e12860..7a5ff5bc3 100644
--- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
+++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
@@ -22,5 +22,8 @@
<mac address='00:50:56:91:48:c7'/>
<source bridge='VM NETWORK'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml
index 4974f4e75..18d64611f 100644
--- a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml
+++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml
@@ -22,5 +22,8 @@
<mac address='00:50:56:91:48:c7'/>
<source bridge='vm network'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml
index 1905f9be9..e11d2f995 100644
--- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml
+++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml
@@ -17,5 +17,8 @@
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml
index b9cf1f9c4..d1fb6902b 100644
--- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml
+++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml
@@ -17,5 +17,8 @@
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml
index 1bb42be1b..7eb36766f 100644
--- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml
+++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml
@@ -17,5 +17,8 @@
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<controller type='scsi' index='0'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml
index bdcb0b06e..df1e7c461 100644
--- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml
+++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml
@@ -17,5 +17,8 @@
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<controller type='scsi' index='0'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml
index fd50008fc..5e67e746f 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml
@@ -22,5 +22,8 @@
<mac address='00:50:56:91:48:c7'/>
<source bridge='VM Network'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml
index e98b67972..23fc1f62c 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml
@@ -52,5 +52,8 @@
<source bridge='VM Network'/>
<model type='vlance'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml
index 6d1820927..e193fdb2c 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml
@@ -34,5 +34,8 @@
<mac address='00:0c:29:f5:c3:0c'/>
<source bridge='VM Network'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
index 42388825d..419df518d 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
@@ -38,5 +38,8 @@
<source path='[498076b2-02796c1a-ef5b-000ae484a6a3] virtMonServ1/serial1.file'/>
<target type='serial' port='0'/>
</console>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml
index d55bf6be7..004016324 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml
@@ -33,5 +33,8 @@
<source bridge='VM-LAN'/>
<model type='e1000'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml
index 7ef2d3ded..cec329d1f 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml
@@ -15,5 +15,8 @@
<mac address='00:50:56:11:22:33'/>
<source bridge='VM Network'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml
index e08a450c3..8c7b83352 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml
@@ -16,5 +16,8 @@
<source bridge='VM Network'/>
<target dev='vmnet7'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml
index 1e64c52c5..9b356ea79 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml
@@ -16,5 +16,8 @@
<source bridge='VM Network'/>
<model type='e1000'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml
index ffb203b74..aead831af 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml
@@ -15,5 +15,8 @@
<mac address='00:0c:29:11:22:33'/>
<source bridge='VM Network'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml
index 4c44fbc6b..a74611565 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml
@@ -15,5 +15,8 @@
<mac address='00:12:34:56:78:90'/>
<source bridge='VM Network'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml
index 7ef2d3ded..cec329d1f 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml
@@ -15,5 +15,8 @@
<mac address='00:50:56:11:22:33'/>
<source bridge='VM Network'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml
index 090f7ceca..b7773ad2a 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml
@@ -16,5 +16,8 @@
<source bridge='VM Network'/>
<model type='vmxnet2'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml
index 1d90f3182..bdc8d8c12 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml
@@ -15,5 +15,8 @@
<mac address='00:50:56:87:65:43'/>
<source bridge='VM Network'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-floppy-device.xml b/tests/vmx2xmldata/vmx2xml-floppy-device.xml
index 4ae16d562..824849a4c 100644
--- a/tests/vmx2xmldata/vmx2xml-floppy-device.xml
+++ b/tests/vmx2xmldata/vmx2xml-floppy-device.xml
@@ -17,5 +17,8 @@
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<controller type='fdc' index='0'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.xml b/tests/vmx2xmldata/vmx2xml-floppy-file.xml
index 5ab538ed1..75d0d625a 100644
--- a/tests/vmx2xmldata/vmx2xml-floppy-file.xml
+++ b/tests/vmx2xmldata/vmx2xml-floppy-file.xml
@@ -17,5 +17,8 @@
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<controller type='fdc' index='0'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
index 159324d07..047e0349d 100644
--- a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
+++ b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
@@ -13,5 +13,8 @@
<devices>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' keymap='de' passwd='password'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml
index 0c308bc53..b572ad1ff 100644
--- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml
+++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml
@@ -23,5 +23,8 @@
<source bridge='net1'/>
<target dev='/dev/vmnet1'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml
index 7b6158f31..180cf6814 100644
--- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml
+++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml
@@ -23,5 +23,8 @@
<source bridge='net1'/>
<target dev='/dev/vmnet1'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml
index b926db57c..571c83a55 100644
--- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml
+++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml
@@ -28,5 +28,8 @@
<source bridge='net2'/>
<target dev='/dev/vmnet2'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml
index 5803f4bde..fc3b9665a 100644
--- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml
+++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml
@@ -23,5 +23,8 @@
<source bridge='net2'/>
<target dev='/dev/vmnet2'/>
</interface>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml
index 7699fbb83..72a5c1ff7 100644
--- a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml
+++ b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml
@@ -17,5 +17,8 @@
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml
index b04597be3..189e72d91 100644
--- a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml
+++ b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml
@@ -17,5 +17,8 @@
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<controller type='scsi' index='0'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml b/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml
index cec8ba09b..188d31a5b 100644
--- a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml
+++ b/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml
@@ -11,5 +11,8 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-minimal.xml b/tests/vmx2xmldata/vmx2xml-minimal.xml
index acfd9bd7d..ce2cfd658 100644
--- a/tests/vmx2xmldata/vmx2xml-minimal.xml
+++ b/tests/vmx2xmldata/vmx2xml-minimal.xml
@@ -11,5 +11,8 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-parallel-device.xml b/tests/vmx2xmldata/vmx2xml-parallel-device.xml
index 28c23028d..bc288a684 100644
--- a/tests/vmx2xmldata/vmx2xml-parallel-device.xml
+++ b/tests/vmx2xmldata/vmx2xml-parallel-device.xml
@@ -15,5 +15,8 @@
<source path='/dev/parallel0'/>
<target port='0'/>
</parallel>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-parallel-file.xml b/tests/vmx2xmldata/vmx2xml-parallel-file.xml
index 340cf4e30..ad7a65fc2 100644
--- a/tests/vmx2xmldata/vmx2xml-parallel-file.xml
+++ b/tests/vmx2xmldata/vmx2xml-parallel-file.xml
@@ -15,5 +15,8 @@
<source path='[datastore] directory/parallel0.file'/>
<target port='0'/>
</parallel>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml
index 553783b62..8fa907b73 100644
--- a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml
+++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml
@@ -35,5 +35,8 @@
<controller type='scsi' index='1' model='lsilogic'/>
<controller type='scsi' index='2' model='lsisas1068'/>
<controller type='scsi' index='3' model='vmpvscsi'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml
index 66e22ae04..e5b89344e 100644
--- a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml
+++ b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml
@@ -18,5 +18,8 @@
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='buslogic'/>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.xml b/tests/vmx2xmldata/vmx2xml-serial-device.xml
index c9f00ebfd..51fd06f21 100644
--- a/tests/vmx2xmldata/vmx2xml-serial-device.xml
+++ b/tests/vmx2xmldata/vmx2xml-serial-device.xml
@@ -19,5 +19,8 @@
<source path='/dev/ttyS0'/>
<target type='serial' port='0'/>
</console>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-serial-file.xml b/tests/vmx2xmldata/vmx2xml-serial-file.xml
index 21b626398..25ade0726 100644
--- a/tests/vmx2xmldata/vmx2xml-serial-file.xml
+++ b/tests/vmx2xmldata/vmx2xml-serial-file.xml
@@ -19,5 +19,8 @@
<source path='[datastore] directory/serial0.file'/>
<target type='serial' port='0'/>
</console>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml b/tests/vmx2xmldata/vmx2xml-serial-network-client.xml
index b0c071549..7573a11dc 100644
--- a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml
+++ b/tests/vmx2xmldata/vmx2xml-serial-network-client.xml
@@ -21,5 +21,8 @@
<protocol type='raw'/>
<target type='serial' port='0'/>
</console>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml b/tests/vmx2xmldata/vmx2xml-serial-network-server.xml
index e15101714..ed3849598 100644
--- a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml
+++ b/tests/vmx2xmldata/vmx2xml-serial-network-server.xml
@@ -21,5 +21,8 @@
<protocol type='telnets'/>
<target type='serial' port='0'/>
</console>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml
index cf8a797a7..ca5196c9a 100644
--- a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml
+++ b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml
@@ -19,5 +19,8 @@
<source path='serial0.pipe'/>
<target type='serial' port='0'/>
</console>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-smbios.xml b/tests/vmx2xmldata/vmx2xml-smbios.xml
index db130016e..d78ac6cc0 100644
--- a/tests/vmx2xmldata/vmx2xml-smbios.xml
+++ b/tests/vmx2xmldata/vmx2xml-smbios.xml
@@ -12,5 +12,8 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
+ <video>
+ <model type='vmvga' vram='4096'/>
+ </video>
</devices>
</domain>
diff --git a/tests/vmx2xmldata/vmx2xml-svga.vmx b/tests/vmx2xmldata/vmx2xml-svga.vmx
new file mode 100644
index 000000000..081d6cee0
--- /dev/null
+++ b/tests/vmx2xmldata/vmx2xml-svga.vmx
@@ -0,0 +1,3 @@
+config.version = "8"
+virtualHW.version = "4"
+svga.vramSize = "8388608"
diff --git a/tests/vmx2xmldata/vmx2xml-svga.xml b/tests/vmx2xmldata/vmx2xml-svga.xml
new file mode 100644
index 000000000..664eba4fa
--- /dev/null
+++ b/tests/vmx2xmldata/vmx2xml-svga.xml
@@ -0,0 +1,18 @@
+<domain type='vmware'>
+ <uuid>00000000-0000-0000-0000-000000000000</uuid>
+ <memory>32768</memory>
+ <currentMemory>32768</currentMemory>
+ <vcpu>1</vcpu>
+ <os>
+ <type arch='i686'>hvm</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <video>
+ <model type='vmvga' vram='8192'/>
+ </video>
+ </devices>
+</domain>
diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index 9378db300..5fed1c4b5 100644
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -285,6 +285,8 @@ mymain(int argc, char **argv)
DO_TEST("smbios", "smbios");
+ DO_TEST("svga", "svga");
+
virCapabilitiesFree(caps);
return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx b/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx
index caab06a28..493e0cc16 100644
--- a/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx
+++ b/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx
@@ -12,3 +12,4 @@ RemoteDisplay.vnc.keymap = "de"
RemoteDisplay.vnc.password = "password"
floppy0.present = "false"
floppy1.present = "false"
+svga.vramSize = "4194304"
diff --git a/tests/xml2vmxdata/xml2vmx-svga.vmx b/tests/xml2vmxdata/xml2vmx-svga.vmx
new file mode 100644
index 000000000..4bd48706a
--- /dev/null
+++ b/tests/xml2vmxdata/xml2vmx-svga.vmx
@@ -0,0 +1,11 @@
+.encoding = "UTF-8"
+config.version = "8"
+virtualHW.version = "4"
+guestOS = "other"
+uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
+displayName = "minimal"
+memsize = "4"
+numvcpus = "1"
+floppy0.present = "false"
+floppy1.present = "false"
+svga.vramSize = "8388608"
diff --git a/tests/xml2vmxdata/xml2vmx-svga.xml b/tests/xml2vmxdata/xml2vmx-svga.xml
new file mode 100644
index 000000000..b7db4c887
--- /dev/null
+++ b/tests/xml2vmxdata/xml2vmx-svga.xml
@@ -0,0 +1,13 @@
+<domain type='vmware'>
+ <name>minimal</name>
+ <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid>
+ <memory>4096</memory>
+ <os>
+ <type>hvm</type>
+ </os>
+ <devices>
+ <video>
+ <model type='vmvga' vram='8192'/>
+ </video>
+ </devices>
+</domain>
diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index 6a39582d3..a5fb4f7e6 100644
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -296,6 +296,8 @@ mymain(int argc, char **argv)
DO_TEST("smbios", "smbios", 4);
+ DO_TEST("svga", "svga", 4);
+
virCapabilitiesFree(caps);
return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;