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

Re: [libvirt] [PATCH] Fix tests to include video ram size



Ján Tomko wrote:
> My commit 3e42867 started filling out the video size in post-parse,
> but did not adjust the tests.
> ---
> Pushed under the build breaker rule.
> 
>  tests/sexpr2xmldata/sexpr2xml-curmem.xml                            | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml                       | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml                   | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml                     | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml                   | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml                      | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml                   | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml                   | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml             | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml            | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml                    | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml                    | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml                    | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml                     | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml                   | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml              | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml                     | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml                     | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml                    | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml                      | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-sound.xml                          | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml                       | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml                      | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-utc.xml                            | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv-v2.xml                             | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-fv.xml                                | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml                   | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml             | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml                        | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml                 | 2 +-
>  tests/sexpr2xmldata/sexpr2xml-vif-rate.xml                          | 2 +-
>  tests/xlconfigdata/test-disk-positional-parms-full.xml              | 2 +-
>  tests/xlconfigdata/test-disk-positional-parms-partial.xml           | 2 +-
>  tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml | 2 +-
>  tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml       | 2 +-
>  tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml             | 2 +-
>  tests/xlconfigdata/test-fullvirt-multiusb.xml                       | 2 +-
>  tests/xlconfigdata/test-fullvirt-nohap.xml                          | 2 +-
>  tests/xlconfigdata/test-new-disk.xml                                | 2 +-
>  tests/xlconfigdata/test-rbd-multihost-noauth.xml                    | 2 +-
>  tests/xlconfigdata/test-spice-features.xml                          | 2 +-
>  tests/xlconfigdata/test-spice.xml                                   | 2 +-
>  tests/xlconfigdata/test-vif-rate.xml                                | 2 +-
>  tests/xmconfigdata/test-escape-paths.xml                            | 2 +-
>  tests/xmconfigdata/test-fullvirt-default-feature.xml                | 2 +-
>  tests/xmconfigdata/test-fullvirt-force-hpet.xml                     | 2 +-
>  tests/xmconfigdata/test-fullvirt-force-nohpet.xml                   | 2 +-
>  tests/xmconfigdata/test-fullvirt-localtime.xml                      | 2 +-
>  tests/xmconfigdata/test-fullvirt-net-netfront.xml                   | 2 +-
>  tests/xmconfigdata/test-fullvirt-new-cdrom.xml                      | 2 +-
>  tests/xmconfigdata/test-fullvirt-nohap.xml                          | 2 +-
>  tests/xmconfigdata/test-fullvirt-parallel-tcp.xml                   | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml             | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml            | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-file.xml                    | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-null.xml                    | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-pipe.xml                    | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-pty.xml                     | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-stdio.xml                   | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml              | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-tcp.xml                     | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-udp.xml                     | 2 +-
>  tests/xmconfigdata/test-fullvirt-serial-unix.xml                    | 2 +-
>  tests/xmconfigdata/test-fullvirt-sound.xml                          | 2 +-
>  tests/xmconfigdata/test-fullvirt-usbmouse.xml                       | 2 +-
>  tests/xmconfigdata/test-fullvirt-usbtablet.xml                      | 2 +-
>  tests/xmconfigdata/test-fullvirt-utc.xml                            | 2 +-
>  tests/xmconfigdata/test-no-source-cdrom.xml                         | 2 +-
>  tests/xmconfigdata/test-paravirt-net-e1000.xml                      | 2 +-
>  tests/xmconfigdata/test-paravirt-net-vifname.xml                    | 2 +-
>  tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml            | 2 +-
>  tests/xmconfigdata/test-paravirt-new-pvfb.xml                       | 2 +-
>  tests/xmconfigdata/test-pci-devs.xml                                | 2 +-
>  73 files changed, 73 insertions(+), 73 deletions(-)
> 
> diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
> index a2668d1..6932e33 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
> @@ -35,7 +35,7 @@
>      <input type='keyboard' bus='xen'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='xen' heads='1' primary='yes'/>
> +      <model type='xen' vram='4096' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
> index c4b22f6..fdd7c7d 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
> @@ -51,7 +51,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='5925' autoport='yes' keymap='en-us'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
> index 17d4016..42d529c 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
> @@ -44,7 +44,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
> index 20a0d76..5e26804 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
> @@ -47,7 +47,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
> index 13fb299..f6af578 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
> @@ -47,7 +47,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
> index 1380426..aba6045 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
> @@ -44,7 +44,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
> index 64111fe..22e2035 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
> @@ -45,7 +45,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
> index f362aee..aa5122b 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
> @@ -49,7 +49,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
> index 4d3bdde..bcccb94 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
> @@ -56,7 +56,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
> index d3eaf82..82c41a6 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
> @@ -52,7 +52,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
> index 0f209d6..062f349 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
> @@ -52,7 +52,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
> index b157f63..38a2fb3 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
> @@ -50,7 +50,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
> index d9cd840..4d76e34 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
> @@ -52,7 +52,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
> index 2cffa65..e0f90ef 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
> @@ -50,7 +50,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
> index 6e473d4..7de5731 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
> @@ -50,7 +50,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
> index f03bd29..c22e2a5 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
> @@ -54,7 +54,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
> index 2e9c629..439a66e 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
> @@ -54,7 +54,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
> index 3f3f676..b4bdc8a 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
> @@ -54,7 +54,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
> index 4f28511..af9f928 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
> @@ -52,7 +52,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
> index f934a85..d0240c4 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
> @@ -46,7 +46,7 @@
>      <sound model='sb16'/>
>      <sound model='es1370'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
> index f934a85..d0240c4 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
> @@ -46,7 +46,7 @@
>      <sound model='sb16'/>
>      <sound model='es1370'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
> index 8b5887e..e84e172 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
> @@ -45,7 +45,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
> index 3e4b366..187d867 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
> @@ -45,7 +45,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
> index 9c2b9e3..2816f4a 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
> @@ -44,7 +44,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
> index 9c2b9e3..2816f4a 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
> @@ -44,7 +44,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
> index 9c2b9e3..2816f4a 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml
> @@ -44,7 +44,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
> index 97d9482..41fb3b7 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
> @@ -49,7 +49,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
> index dbdacf9..72fec25 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
> @@ -30,7 +30,7 @@
>        <listen type='address' address='0.0.0.0'/>
>      </graphics>
>      <video>
> -      <model type='xen' heads='1' primary='yes'/>
> +      <model type='xen' vram='4096' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
> index c415aab..0fd7a88 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
> @@ -30,7 +30,7 @@
>        <listen type='address' address='0.0.0.0'/>
>      </graphics>
>      <video>
> -      <model type='xen' heads='1' primary='yes'/>
> +      <model type='xen' vram='4096' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
> index c1acba1..ee24536 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
> @@ -33,7 +33,7 @@
>      <input type='keyboard' bus='xen'/>
>      <graphics type='vnc' port='-1' autoport='yes'/>
>      <video>
> -      <model type='xen' heads='1' primary='yes'/>
> +      <model type='xen' vram='4096' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
> index 45887e5..1ebd5f0 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
> @@ -48,7 +48,7 @@
>      <input type='keyboard' bus='ps2'/>
>      <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
>      </video>
>      <memballoon model='xen'/>
>    </devices>
> diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml
> index 3d4868c..41e8804 100644
> --- a/tests/xlconfigdata/test-disk-positional-parms-full.xml
> +++ b/tests/xlconfigdata/test-disk-positional-parms-full.xml
> @@ -52,7 +52,7 @@
>        <listen type='address' address='127.0.0.1'/>
>      </graphics>
>      <video>
> -      <model type='cirrus' heads='1' primary='yes'/>
> +      <model type='cirrus' vram='8192' heads='1' primary='yes'/>

This test file, and several others in tests/xlconfigdata/, have
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>. On a system with Xen installed,
that file exists and is probed in the libxl device post parse function. The
probe reveals it is an old qemu and changes the default accordingly, causing the
test to fail. I sent a small series to fix the problem

https://www.redhat.com/archives/libvir-list/2016-May/msg00929.html

Regards,
Jim


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