This patch modify test case related to vgamem attribute.
Signed-off-by: Zeng Junliang <zengjunliang(a)huawei.com>
Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com>
---
tests/domainschemadata/domain-parallels-ct-simple.xml | 2 +-
tests/domainschemadata/domain-parallels-vm-simple.xml | 2 +-
.../qemuhotplug-console-compat-2+console-virtio.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +-
.../qemuxml2argv-graphics-spice-agent-file-xfer.args | 5 +++--
.../qemuxml2argv-graphics-spice-agent-file-xfer.xml | 4 ++--
.../qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml | 2 +-
.../qemuxml2argv-graphics-spice-compression.args | 4 +++-
.../qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml | 4 ++--
.../qemuxml2argv-graphics-spice-listen-network.xml | 4 ++--
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args | 3 ++-
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml | 4 ++--
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args | 3 ++-
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args | 5 +++--
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml | 4 ++--
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args | 3 ++-
tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-q35.args | 3 ++-
tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args | 3 ++-
tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml | 2 +-
.../qemuxml2argv-video-device-pciaddr-default.args | 9 ++++++---
.../qemuxml2argv-video-device-pciaddr-default.xml | 6 +++---
.../qemuxml2xmlout-graphics-listen-network2.xml | 2 +-
.../qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml | 2 +-
tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml | 2 +-
tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml | 2 +-
tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 +-
tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml | 2 +-
tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 2 +-
tests/xml2vmxdata/xml2vmx-svga.xml | 2 +-
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml | 2 +-
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml | 2 +-
51 files changed, 74 insertions(+), 62 deletions(-)
diff --git a/tests/domainschemadata/domain-parallels-ct-simple.xml
b/tests/domainschemadata/domain-parallels-ct-simple.xml
index a2b87ce..2a5daf6 100644
--- a/tests/domainschemadata/domain-parallels-ct-simple.xml
+++ b/tests/domainschemadata/domain-parallels-ct-simple.xml
@@ -19,7 +19,7 @@
<target dir='/'/>
</filesystem>
<video>
- <model type='vga' vram='16777216' heads='1'>
+ <model type='vga' vram='16777216' vgamem='16384'
heads='1'>
<acceleration accel3d='no' accel2d='no'/>
</model>
</video>
diff --git a/tests/domainschemadata/domain-parallels-vm-simple.xml
b/tests/domainschemadata/domain-parallels-vm-simple.xml
index 4e21583..ca93373 100644
--- a/tests/domainschemadata/domain-parallels-vm-simple.xml
+++ b/tests/domainschemadata/domain-parallels-vm-simple.xml
@@ -18,7 +18,7 @@
<target dev='hda'/>
</disk>
<video>
- <model type='vga' vram='33554432' heads='1'>
+ <model type='vga' vram='33554432' vgamem='16384'
heads='1'>
<acceleration accel3d='no' accel2d='no'/>
</model>
</video>
diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml
b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml
index ec1c6e8..714b466 100644
--- a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml
+++ b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml
@@ -91,7 +91,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</sound>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
index 4d4ac47..112d2f1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
@@ -88,7 +88,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</sound>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml
b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml
index 6a98eaa..594d1da 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml
@@ -73,7 +73,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</sound>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<hostdev mode='subsystem' type='usb' managed='yes'>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml
index 98b7d6a..3ae1db8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml
@@ -28,7 +28,7 @@
<listen type='network' network='Bobsnetwork'/>
</graphics>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml
index aa458d7..2a57363 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml
@@ -28,7 +28,7 @@
<listen type='network' network='Bobsnetwork'/>
</graphics>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
index 4aa385c..2ffe22d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<graphics type='sdl' display=':0.1'
xauth='/root/.Xauthority' fullscreen='yes'/>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
index 66ea35d..0512aa4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<graphics type='sdl' display=':0.1'
xauth='/root/.Xauthority'/>
<video>
- <model type='vga' vram='9216' heads='1'/>
+ <model type='vga' vram='9216' vgamem='16384'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
index 66f22bc..041d3af 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
@@ -4,6 +4,7 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
/dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\
x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,\
disable-agent-file-xfer -vga qxl -global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
--device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
+-global qxl-vga.vram_size=33554432 -global qxl-vga.vgamem_mb=16 \
+-device qxl,id=video1,ram_size=67108864,vram_size=67108864,\
+vgamem_mb=16,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml
index 3a3e366..2574feb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml
@@ -30,10 +30,10 @@
<filetransfer enable='no'/>
</graphics>
<video>
- <model type='qxl' ram='65536' vram='32768'
heads='1'/>
+ <model type='qxl' ram='65536' vram='32768'
vgamem='16384' heads='1'/>
</video>
<video>
- <model type='qxl' ram='65536' vram='65536'
heads='1'/>
+ <model type='qxl' ram='65536' vram='65536'
vgamem='16384' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml
index 113a236..5d7758c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml
@@ -32,7 +32,7 @@
<address type='virtio-serial' controller='1' bus='0'
port='3'/>
</channel>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
index 59f064b..9ebd697 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
@@ -7,5 +7,7 @@ image-compression=auto_glz,jpeg-wan-compression=auto,\
zlib-glz-wan-compression=auto,\
playback-compression=on,streaming-video=filter -vga \
qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \
--device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
+-global qxl.vgamem_mb=16 \
+-device qxl,id=video1,ram_size=67108864,vram_size=33554432,\
+vgamem_mb=16,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
index 6c913b4..8163020 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
@@ -33,10 +33,10 @@
<streaming mode='filter'/>
</graphics>
<video>
- <model type='qxl' ram='65536' vram='18432'
heads='1'/>
+ <model type='qxl' ram='65536' vram='18432'
vgamem='16384' heads='1'/>
</video>
<video>
- <model type='qxl' ram='65536' vram='32768'
heads='1'/>
+ <model type='qxl' ram='65536' vram='32768'
vgamem='16384' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml
index 34971fe..c0ad87c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml
@@ -35,10 +35,10 @@
<channel mode='secure' name='usbredir'/>
</graphics>
<video>
- <model type='qxl' ram='65536' vram='18432'
heads='1'/>
+ <model type='qxl' ram='65536' vram='18432'
vgamem='16384' heads='1'/>
</video>
<video>
- <model type='qxl' ram='65536' vram='32768'
heads='1'/>
+ <model type='qxl' ram='65536' vram='32768'
vgamem='16384' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
index ef499e6..1d88655 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
@@ -4,5 +4,6 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
/dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\
x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \
qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 \
--device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
+-global qxl-vga.vgamem_mb=16 -device qxl,id=video1,ram_size=67108864,\
+vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml
index acf3019..a12206b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml
@@ -30,10 +30,10 @@
<channel name='inputs' mode='insecure'/>
</graphics>
<video>
- <model type='qxl' ram='65536' vram='32768'
heads='1'/>
+ <model type='qxl' ram='65536' vram='32768'
vgamem='16384' heads='1'/>
</video>
<video>
- <model type='qxl' ram='65536' vram='65536'
heads='1'/>
+ <model type='qxl' ram='65536' vram='65536'
vgamem='16384' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
index 8847bce..614fada 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
@@ -6,4 +6,5 @@ SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=spice \
-spice port=5903,tls-port=5904,sasl,addr=127.0.0.1,\
x509-dir=/etc/pki/libvirt-spice,tls-channel=default \
-vga qxl -global qxl.ram_size=67108864 -global \
-qxl.vram_size=18874368 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+qxl.vram_size=18874368 -global qxl.vgamem_mb=16 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml
index eb630fa..2181f8e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml
@@ -28,7 +28,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='qxl' ram='65536' vram='18432'
heads='1'/>
+ <model type='qxl' ram='65536' vram='18432'
vgamem='16384' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
index e6ecbed..c228f61 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
@@ -77,7 +77,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</sound>
<video>
- <model type='vga' vram='9216' heads='1'/>
+ <model type='vga' vram='9216' vgamem='16384'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
index 8430d9c..7c843ce 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
@@ -8,6 +8,7 @@ image-compression=auto_glz,jpeg-wan-compression=auto,\
zlib-glz-wan-compression=auto,\
playback-compression=on,streaming-video=filter,disable-copy-paste,\
disable-agent-file-xfer -vga qxl -global qxl.ram_size=67108864 \
--global qxl.vram_size=18874368 \
--device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
+-global qxl.vram_size=18874368 -global qxl.vgamem_mb=16 \
+-device qxl,id=video1,ram_size=67108864,vram_size=33554432,\
+vgamem_mb=16,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
index 8f58149..9396056 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
@@ -37,10 +37,10 @@
<filetransfer enable='no'/>
</graphics>
<video>
- <model type='qxl' ram='65536' vram='18432'
heads='1'/>
+ <model type='qxl' ram='65536' vram='18432'
vgamem='16384' heads='1'/>
</video>
<video>
- <model type='qxl' ram='65536' vram='32768'
heads='1'/>
+ <model type='qxl' ram='65536' vram='32768'
vgamem='16384' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
index 0198930..68d2311 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
@@ -29,7 +29,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
index eda2e87..7718070 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
@@ -29,7 +29,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
index 2b13865..213360c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' socket='/tmp/foo.socket'/>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
index eda2e87..7718070 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
@@ -29,7 +29,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
index 11e5a7a..2b1a5f0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
@@ -22,7 +22,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
index 267876f..0308703 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
@@ -29,7 +29,7 @@
<listen type='address' address='2001:1:2:3:4:5:1234:1234'/>
</graphics>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml
b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml
index f70e20a..7a4d8b4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml
@@ -66,7 +66,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</sound>
<video>
- <model type='vga' vram='9216' heads='1'/>
+ <model type='vga' vram='9216' vgamem='16384'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml
b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml
index 92db5e6..5c7e0a6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml
@@ -34,7 +34,7 @@
</controller>
<input type='mouse' bus='ps2'/>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml
b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml
index f6a3ddf..dfe2a95 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml
@@ -35,7 +35,7 @@
<controller type='pci' index='8' model='pci-bridge'/>
<input type='mouse' bus='ps2'/>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml
b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml
index a1cb38c..d09afed 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml
@@ -201,7 +201,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
index 6855cd2..8c5f01a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
@@ -6,4 +6,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test
QEMU_AUDIO_DRV=none \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \
-device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \
--vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368
+-vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \
+-global qxl.vgamem_mb=16
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml
b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml
index ee151be..68f78a4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml
@@ -26,7 +26,7 @@
<controller type='pci' index='2' model='pci-bridge'/>
<controller type='sata' index='0'/>
<video>
- <model type='qxl' ram='65536' vram='18432'
heads='1'/>
+ <model type='qxl' ram='65536' vram='18432'
vgamem='16384' heads='1'/>
</video>
<memballoon model='none'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
index 64b70f3..7e37de4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
@@ -34,7 +34,7 @@
<input type='mouse' bus='usb'/>
<graphics type='sdl'/>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args
b/tests/qemuxml2argvdata/qemuxml2argv-q35.args
index 8cc5874..f74bc01 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args
@@ -5,4 +5,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test
QEMU_AUDIO_DRV=none \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \
-device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \
--vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368
+-vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \
+-global qxl.vgamem_mb=16
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.xml
b/tests/qemuxml2argvdata/qemuxml2argv-q35.xml
index edaf6cb..478d23f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-q35.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.xml
@@ -23,7 +23,7 @@
<controller type='pci' index='1'
model='dmi-to-pci-bridge'/>
<controller type='pci' index='2' model='pci-bridge'/>
<video>
- <model type='qxl' ram='65536' vram='18432'
heads='1'/>
+ <model type='qxl' ram='65536' vram='18432'
vgamem='16384' heads='1'/>
</video>
<memballoon model='none'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
index 8c631b1..476f883 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
@@ -9,5 +9,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test
QEMU_AUDIO_DRV=spice \
-device usb-tablet,id=input0 \
-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice \
-device \
-qxl-vga,id=video0,ram_size=67107840,vram_size=67107840,bus=pci.0,addr=0x2 \
+qxl-vga,id=video0,ram_size=67107840,vram_size=67107840,\
+vgamem_mb=16,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml
b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml
index 36af468..47fabe9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml
@@ -37,7 +37,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='qxl' ram='65535' vram='65535'
heads='1'/>
+ <model type='qxl' ram='65535' vram='65535'
vgamem='16384' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
index 4abd7c2..801aa7a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
@@ -3,7 +3,10 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test
QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
-usb \
-hda /var/lib/libvirt/images/QEMUGuest1 -vnc 127.0.0.1:-5900 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \
--device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
--device qxl,id=video2,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,\
+vgamem_mb=16,bus=pci.0,addr=0x3 \
+-device qxl,id=video1,ram_size=67108864,vram_size=67108864,\
+vgamem_mb=16,bus=pci.0,addr=0x4 \
+-device qxl,id=video2,ram_size=67108864,vram_size=67108864,\
+vgamem_mb=16,bus=pci.0,addr=0x5 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml
b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml
index 120e7f4..c3f5bcc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml
@@ -29,13 +29,13 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='qxl' vram='65536' heads='1'/>
+ <model type='qxl' vram='65536' vgamem='16384'
heads='1'/>
</video>
<video>
- <model type='qxl' vram='65536' heads='1'
primary='yes'/>
+ <model type='qxl' vram='65536' vgamem='16384'
heads='1' primary='yes'/>
</video>
<video>
- <model type='qxl' vram='65536' heads='1'/>
+ <model type='qxl' vram='65536' vgamem='16384'
heads='1'/>
</video>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
index ae40805..27bfbc5 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
@@ -29,7 +29,7 @@
<listen type='network' network='Bobsnetwork'/>
</graphics>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
index 44c4cf7..aca4942 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
@@ -80,7 +80,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</sound>
<video>
- <model type='vga' vram='9216' heads='1'/>
+ <model type='vga' vram='9216' vgamem='16384'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml
index 13f0f5d..53c34cd 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml
@@ -34,7 +34,7 @@
</controller>
<controller type='pci' index='0' model='pci-root'/>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml
index 8748437..92faa84 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml
@@ -35,7 +35,7 @@
<controller type='pci' index='8' model='pci-bridge'/>
<controller type='pci' index='0' model='pci-root'/>
<video>
- <model type='cirrus' vram='9216' heads='1'/>
+ <model type='cirrus' vram='9216' vgamem='8192'
heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml
index 96f8eaf..aa24cc8 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml
@@ -24,7 +24,7 @@
<controller type='pci' index='2' model='pci-bridge'/>
<controller type='sata' index='0'/>
<video>
- <model type='qxl' ram='65536' vram='18432'
heads='1'/>
+ <model type='qxl' ram='65536' vram='18432'
vgamem='16384' heads='1'/>
</video>
<memballoon model='none'/>
</devices>
diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml
b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml
index fa416a9..9444193 100644
--- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml
+++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml
@@ -30,7 +30,7 @@
<model type='vmxnet3'/>
</interface>
<video>
- <model type='vmvga' vram='8192'/>
+ <model type='vmvga' vram='8192' vgamem='16384'/>
</video>
</devices>
</domain>
diff --git a/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml
b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml
index 0bfc7e8..530da8d 100644
--- a/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml
+++ b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml
@@ -34,7 +34,7 @@
<source bridge=''/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' vgamem='16384'/>
</video>
<memballoon model='none'/>
</devices>
diff --git a/tests/xml2vmxdata/xml2vmx-svga.xml b/tests/xml2vmxdata/xml2vmx-svga.xml
index 1148848..44e9546 100644
--- a/tests/xml2vmxdata/xml2vmx-svga.xml
+++ b/tests/xml2vmxdata/xml2vmx-svga.xml
@@ -7,7 +7,7 @@
</os>
<devices>
<video>
- <model type='vmvga' vram='8192'/>
+ <model type='vmvga' vram='8192' vgamem='16384'/>
</video>
</devices>
</domain>
diff --git a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml
b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml
index eab25d8..bf8df38 100644
--- a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml
+++ b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml
@@ -23,7 +23,7 @@
<model type='e1000'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' vgamem='16384'/>
</video>
</devices>
</domain>
diff --git a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml
b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml
index 30fb76c..5701c2c 100644
--- a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml
+++ b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml
@@ -24,7 +24,7 @@
<model type='e1000'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' vgamem='16384'/>
</video>
</devices>
</domain>
--
1.7.12.4