diff options
| author |   Daniel P. Berrange <berrange@redhat.com> | 2009-12-21 22:38:05 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2010-01-18 13:55:57 +0000 |
| commit | febc591683cf51e4551f8bcf3ce279a776056e1c (patch) | |
| tree | f4908e13236d6c9c6c3dab7b90715d052b0ec199 /tests | |
| parent | Add support for explicit -sdl flag to QEMU (diff) | |
| download | libvirt-febc591683cf51e4551f8bcf3ce279a776056e1c.tar.gz libvirt-febc591683cf51e4551f8bcf3ce279a776056e1c.tar.bz2 libvirt-febc591683cf51e4551f8bcf3ce279a776056e1c.zip | |
Pass -vga none if no video card specified
QEMU always configures a VGA card. If no video card is included in
the libvirt XML, it is neccessary to explicitly turn off the default
using -vga none
* src/qemu/qemu_conf.c: Pass -vga none if no video card is configured
* tests/qemuargv2xmltest.c, tests/qemuxml2argvtest.c: Test for
handling -vga none.
* tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args,
tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml: Test
data files
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemuargv2xmltest.c | 1 | ||||
| -rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args | 1 | ||||
| -rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml | 24 | ||||
| -rw-r--r-- | tests/qemuxml2argvtest.c | 1 |
4 files changed, 27 insertions, 0 deletions
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 7f62baccc..8326c5756 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -185,6 +185,7 @@ mymain(int argc, char **argv) DO_TEST("graphics-sdl", 0); DO_TEST("graphics-sdl-fullscreen", 0); + DO_TEST("nographics-vga", QEMUD_CMD_FLAG_VGA); DO_TEST("input-usbmouse", 0); DO_TEST("input-usbtablet", 0); /* Can't rountrip xenner arch */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args new file mode 100644 index 000000000..b8f10bb47 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vga none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml new file mode 100644 index 000000000..533ea59b3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml @@ -0,0 +1,24 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2a2387ed2..41e5749fb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -252,6 +252,7 @@ mymain(int argc, char **argv) DO_TEST("graphics-sdl", 0); DO_TEST("graphics-sdl-fullscreen", 0); + DO_TEST("nographics-vga", QEMUD_CMD_FLAG_VGA); DO_TEST("input-usbmouse", 0); DO_TEST("input-usbtablet", 0); DO_TEST("input-xen", QEMUD_CMD_FLAG_DOMID); |