diff options
author | Ján Tomko <jtomko@redhat.com> | 2016-04-11 14:26:06 +0200 |
---|---|---|
committer | Ján Tomko <jtomko@redhat.com> | 2016-04-12 10:45:35 +0200 |
commit | 6d8b6d2847f31a3d7a234536c12b8feca751a02f (patch) | |
tree | 95cf5f5cc967ed89ebb9bdfa632cba93ba830fa9 /tests | |
parent | 6879be484c9502394e55c799f5bb95c24c510644 (diff) | |
download | libvirt-6d8b6d2847f31a3d7a234536c12b8feca751a02f.tar.gz |
conf: also mark the implicit video as primary
Commit 119cd06 started setting the primary bool for the first
user-specified video even if user omitted the 'primary' attribute.
However this was done before the addition of the implicit device.
This broke startup of transient qemu domains with no <video>:
https://bugzilla.redhat.com/show_bug.cgi?id=1325757
Move this default to virDomainDefPostParseInternal,
after the addition of the implicit video device, to catch the implicit
video as well.
Diffstat (limited to 'tests')
67 files changed, 67 insertions, 67 deletions
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml index 1b3ac30de4..0bc0436fc1 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-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='16384' heads='1'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml index 2c1c781d52..7cd9d6c3f7 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-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='16384' heads='1'/> + <model type='vga' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml index 36b8001dbe..3ebb375e1b 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml @@ -29,7 +29,7 @@ <listen type='address' address='::'/> </graphics> <video> - <model type='cirrus' vram='16384' heads='1'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml index f29bb2241b..5b7d560246 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml @@ -29,7 +29,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' vram='16384' heads='1'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml index 57e808ab34..93daa76419 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-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='16384' heads='1'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml index f29bb2241b..5b7d560246 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml @@ -29,7 +29,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' vram='16384' heads='1'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml index 25e3badfd9..260ad1c18c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml @@ -22,7 +22,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' vram='16384' heads='1'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml index e18790fa11..374345b56f 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-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='16384' heads='1'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml b/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml index 97225f44a1..8cec27c3dc 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml @@ -34,7 +34,7 @@ <input type='mouse' bus='usb'/> <graphics type='sdl'/> <video> - <model type='cirrus' vram='16384' heads='1'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='none'/> <panic model='pseries'/> diff --git a/tests/vmx2xmldata/vmx2xml-annotation.xml b/tests/vmx2xmldata/vmx2xml-annotation.xml index c58af0733e..9d99fd288b 100644 --- a/tests/vmx2xmldata/vmx2xml-annotation.xml +++ b/tests/vmx2xmldata/vmx2xml-annotation.xml @@ -13,7 +13,7 @@ <on_crash>destroy</on_crash> <devices> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml index 4cd760e536..fd38cfd67f 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml @@ -26,7 +26,7 @@ <source bridge='VM NETWORK'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml index fa6602872e..eb81691456 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml @@ -26,7 +26,7 @@ <source bridge='vm network'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml index a4bf33caf3..d8bba13385 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml @@ -18,7 +18,7 @@ </disk> <controller type='ide' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml index e086379947..b11fe272b6 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml @@ -17,7 +17,7 @@ </disk> <controller type='ide' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml index 8acea2d9b8..7ca8ff729a 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml @@ -18,7 +18,7 @@ </disk> <controller type='ide' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml index bce708d1f7..68ad26dc6f 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml @@ -18,7 +18,7 @@ </disk> <controller type='ide' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml index 530a29a7f2..679cdb154b 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml @@ -18,7 +18,7 @@ </disk> <controller type='ide' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml index 0cdfb9191e..cf1275c829 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml @@ -18,7 +18,7 @@ </disk> <controller type='scsi' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml index 56ad6786f2..20452522d8 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml @@ -17,7 +17,7 @@ </disk> <controller type='scsi' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml index f81414309e..5765232bc1 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml @@ -18,7 +18,7 @@ </disk> <controller type='scsi' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml index d3b382a427..46e27bce71 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml @@ -18,7 +18,7 @@ </disk> <controller type='scsi' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml index a81646a28e..9d706b5d04 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml @@ -18,7 +18,7 @@ </disk> <controller type='scsi' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml index bca8510ab4..9052327dcd 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml @@ -18,7 +18,7 @@ </disk> <controller type='scsi' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-datacenterpath.xml b/tests/vmx2xmldata/vmx2xml-datacenterpath.xml index a690c0feb8..7d458c5c8e 100644 --- a/tests/vmx2xmldata/vmx2xml-datacenterpath.xml +++ b/tests/vmx2xmldata/vmx2xml-datacenterpath.xml @@ -12,7 +12,7 @@ <on_crash>destroy</on_crash> <devices> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> <vmware:datacenterpath>folder1/folder2/datacenter1</vmware:datacenterpath> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml index 26f609cd0f..906cfe0648 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml @@ -26,7 +26,7 @@ <source bridge='VM Network'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </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 fd3b92c9cf..2f85f82ad0 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml @@ -53,7 +53,7 @@ <model type='vlance'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </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 dd681c12f1..8f219165f1 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml @@ -35,7 +35,7 @@ <source bridge='VM Network'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </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 a2b457ad98..d5b3e841b7 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml @@ -42,7 +42,7 @@ <target type='serial' port='0'/> </console> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </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 e6b6993854..296d48171c 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml @@ -37,7 +37,7 @@ <model type='e1000'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml index a03dd2a98d..19bace7cfb 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml +++ b/tests/vmx2xmldata/vmx2xml-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' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml index 5180a99f83..832c1ac864 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml @@ -29,7 +29,7 @@ <model type='vmxnet3'/> </interface> <video> - <model type='vmvga' vram='8192'/> + <model type='vmvga' vram='8192' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml index 52d8fabfe5..0fe29ccd97 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml @@ -16,7 +16,7 @@ <source bridge='VM Network'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml index 9f530ce7af..e10ecd7685 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml @@ -17,7 +17,7 @@ <target dev='vmnet7'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml index 4170db53fd..d497a3836f 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml @@ -17,7 +17,7 @@ <model type='e1000'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml index b955c5fe95..23b54c81c9 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml @@ -16,7 +16,7 @@ <source bridge='VM Network'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml b/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml index eb8e85b261..562ddfc0ca 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml @@ -15,7 +15,7 @@ <mac address='00:50:56:11:22:33'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml index 51421e22f4..e7abad0724 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml @@ -16,7 +16,7 @@ <source bridge='VM Network'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml index 52d8fabfe5..0fe29ccd97 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml @@ -16,7 +16,7 @@ <source bridge='VM Network'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml index 19d7096667..bbe7dfd378 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml @@ -17,7 +17,7 @@ <model type='vmxnet2'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml index 88c15d0c15..5dbdb5227e 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml @@ -16,7 +16,7 @@ <source bridge='VM Network'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-floppy-device.xml b/tests/vmx2xmldata/vmx2xml-floppy-device.xml index 5980bad163..3b1317249d 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-device.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-device.xml @@ -18,7 +18,7 @@ </disk> <controller type='fdc' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.xml b/tests/vmx2xmldata/vmx2xml-floppy-file.xml index 40f70d3052..6699f15602 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-file.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.xml @@ -23,7 +23,7 @@ </disk> <controller type='fdc' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml index ef785d7466..cfc0d95960 100644 --- a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml @@ -33,7 +33,7 @@ <source bridge=''/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml index 9fee02655c..8501907748 100644 --- a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml +++ b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml @@ -13,7 +13,7 @@ <devices> <graphics type='vnc' port='5903' autoport='no' keymap='de' passwd='password'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </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 94c0f8716a..e507cfc2f4 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml @@ -24,7 +24,7 @@ <target dev='/dev/vmnet1'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </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 9550c6b70d..39e89bb204 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml @@ -24,7 +24,7 @@ <target dev='/dev/vmnet1'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </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 c2f845f788..51101ded23 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml @@ -29,7 +29,7 @@ <target dev='/dev/vmnet2'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </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 668b9471e8..849367a52d 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml @@ -24,7 +24,7 @@ <target dev='/dev/vmnet2'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml index 80fcef73ed..d452e6ed99 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml @@ -18,7 +18,7 @@ </disk> <controller type='ide' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml index a1d3efdd3a..64b89c6530 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml @@ -18,7 +18,7 @@ </disk> <controller type='scsi' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml index 3786e2fe31..f61fb21773 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml @@ -19,7 +19,7 @@ </disk> <controller type='ide' index='0'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml b/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml index 6c50a1d209..42245d4ba0 100644 --- a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml +++ b/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml @@ -12,7 +12,7 @@ <on_crash>destroy</on_crash> <devices> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-minimal.xml b/tests/vmx2xmldata/vmx2xml-minimal.xml index 38bcf43cfc..122d59cd77 100644 --- a/tests/vmx2xmldata/vmx2xml-minimal.xml +++ b/tests/vmx2xmldata/vmx2xml-minimal.xml @@ -12,7 +12,7 @@ <on_crash>destroy</on_crash> <devices> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-parallel-device.xml b/tests/vmx2xmldata/vmx2xml-parallel-device.xml index 8aa4591e2c..3c69198b93 100644 --- a/tests/vmx2xmldata/vmx2xml-parallel-device.xml +++ b/tests/vmx2xmldata/vmx2xml-parallel-device.xml @@ -16,7 +16,7 @@ <target port='0'/> </parallel> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-parallel-file.xml b/tests/vmx2xmldata/vmx2xml-parallel-file.xml index 6b0a9654b3..d7ec0cf1a2 100644 --- a/tests/vmx2xmldata/vmx2xml-parallel-file.xml +++ b/tests/vmx2xmldata/vmx2xml-parallel-file.xml @@ -16,7 +16,7 @@ <target port='0'/> </parallel> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml index 3ab346f833..1a057df428 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml @@ -36,7 +36,7 @@ <controller type='scsi' index='2' model='lsisas1068'/> <controller type='scsi' index='3' model='vmpvscsi'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml index fdd01ed131..95accb104e 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml @@ -19,7 +19,7 @@ </disk> <controller type='scsi' index='0' model='buslogic'/> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.xml b/tests/vmx2xmldata/vmx2xml-serial-device.xml index cc45c078ea..df25d66b98 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-device.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-device.xml @@ -24,7 +24,7 @@ <target type='serial' port='0'/> </console> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-serial-file.xml b/tests/vmx2xmldata/vmx2xml-serial-file.xml index 810398dc20..84618c321c 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-file.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-file.xml @@ -20,7 +20,7 @@ <target type='serial' port='0'/> </console> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml b/tests/vmx2xmldata/vmx2xml-serial-network-client.xml index b9190807fa..2e096434f5 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-network-client.xml @@ -22,7 +22,7 @@ <target type='serial' port='0'/> </console> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml b/tests/vmx2xmldata/vmx2xml-serial-network-server.xml index 265036bde8..65950e8cea 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-network-server.xml @@ -22,7 +22,7 @@ <target type='serial' port='0'/> </console> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml index 029bc9dc25..bd425e603e 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml @@ -20,7 +20,7 @@ <target type='serial' port='0'/> </console> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-sharedfolder.xml b/tests/vmx2xmldata/vmx2xml-sharedfolder.xml index 52b75de0d8..7fa3203161 100644 --- a/tests/vmx2xmldata/vmx2xml-sharedfolder.xml +++ b/tests/vmx2xmldata/vmx2xml-sharedfolder.xml @@ -16,7 +16,7 @@ <target dir='shared'/> </filesystem> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-smbios.xml b/tests/vmx2xmldata/vmx2xml-smbios.xml index cf43714d56..6773502633 100644 --- a/tests/vmx2xmldata/vmx2xml-smbios.xml +++ b/tests/vmx2xmldata/vmx2xml-smbios.xml @@ -13,7 +13,7 @@ <on_crash>destroy</on_crash> <devices> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-svga.xml b/tests/vmx2xmldata/vmx2xml-svga.xml index 5f6df894e4..da0f1a30e2 100644 --- a/tests/vmx2xmldata/vmx2xml-svga.xml +++ b/tests/vmx2xmldata/vmx2xml-svga.xml @@ -12,7 +12,7 @@ <on_crash>destroy</on_crash> <devices> <video> - <model type='vmvga' vram='8192'/> + <model type='vmvga' vram='8192' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml index 2f7c14efef..9ea6bd754d 100644 --- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml @@ -29,7 +29,7 @@ <model type='e1000'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml index 9865e34176..ce8f802f88 100644 --- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml @@ -30,7 +30,7 @@ <model type='e1000'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' primary='yes'/> </video> </devices> </domain> |