mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
Support <video> element for QEMU guests
* src/qemu_conf.c, src/qemu_conf.h: Use -vga or -std-vga when starting guests if video card is present * tests/qemuhelptest.c: Change to use constants instead of hardcoded hex numbers, and add VGA support * tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml, tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml: Add <video> element for testing graphics adapter * tests/qemuxml2argvtest.c: Add QEMUD_CMD_FLAG_VGA flag * tests/qemuxml2xmltest.c: Add missing graphics-vnc-sasl/tls tests
This commit is contained in:
Daniel P. Berrange
@@ -89,11 +89,67 @@ mymain(int argc, char **argv)
|
||||
ret = -1; \
|
||||
} while (0)
|
||||
|
||||
DO_TEST("qemu-0.9.1", 0x002f, 9001, 0, 0);
|
||||
DO_TEST("kvm-74", 0x633e, 9001, 1, 74);
|
||||
DO_TEST("qemu-0.10.5", 0x5c6f, 10005, 0, 0);
|
||||
DO_TEST("qemu-kvm-0.10.5", 0x7d7e, 10005, 1, 0);
|
||||
DO_TEST("kvm-86", 0x7d7e, 10050, 1, 0);
|
||||
DO_TEST("qemu-0.9.1",
|
||||
QEMUD_CMD_FLAG_KQEMU |
|
||||
QEMUD_CMD_FLAG_VNC_COLON |
|
||||
QEMUD_CMD_FLAG_NO_REBOOT |
|
||||
QEMUD_CMD_FLAG_DRIVE |
|
||||
QEMUD_CMD_FLAG_NAME,
|
||||
9001, 0, 0);
|
||||
DO_TEST("kvm-74",
|
||||
QEMUD_CMD_FLAG_VNC_COLON |
|
||||
QEMUD_CMD_FLAG_NO_REBOOT |
|
||||
QEMUD_CMD_FLAG_DRIVE |
|
||||
QEMUD_CMD_FLAG_DRIVE_BOOT |
|
||||
QEMUD_CMD_FLAG_NAME |
|
||||
QEMUD_CMD_FLAG_VNET_HDR |
|
||||
QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO |
|
||||
QEMUD_CMD_FLAG_KVM |
|
||||
QEMUD_CMD_FLAG_DRIVE_FORMAT,
|
||||
9001, 1, 74);
|
||||
DO_TEST("qemu-0.10.5",
|
||||
QEMUD_CMD_FLAG_KQEMU |
|
||||
QEMUD_CMD_FLAG_VNC_COLON |
|
||||
QEMUD_CMD_FLAG_NO_REBOOT |
|
||||
QEMUD_CMD_FLAG_DRIVE |
|
||||
QEMUD_CMD_FLAG_NAME |
|
||||
QEMUD_CMD_FLAG_UUID |
|
||||
QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP |
|
||||
QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC |
|
||||
QEMUD_CMD_FLAG_DRIVE_CACHE_V2 |
|
||||
QEMUD_CMD_FLAG_DRIVE_FORMAT |
|
||||
QEMUD_CMD_FLAG_VGA,
|
||||
10005, 0, 0);
|
||||
DO_TEST("qemu-kvm-0.10.5",
|
||||
QEMUD_CMD_FLAG_VNC_COLON |
|
||||
QEMUD_CMD_FLAG_NO_REBOOT |
|
||||
QEMUD_CMD_FLAG_DRIVE |
|
||||
QEMUD_CMD_FLAG_DRIVE_BOOT |
|
||||
QEMUD_CMD_FLAG_NAME |
|
||||
QEMUD_CMD_FLAG_UUID |
|
||||
QEMUD_CMD_FLAG_VNET_HDR |
|
||||
QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP |
|
||||
QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC |
|
||||
QEMUD_CMD_FLAG_DRIVE_CACHE_V2 |
|
||||
QEMUD_CMD_FLAG_KVM |
|
||||
QEMUD_CMD_FLAG_DRIVE_FORMAT |
|
||||
QEMUD_CMD_FLAG_VGA,
|
||||
10005, 1, 0);
|
||||
DO_TEST("kvm-86",
|
||||
QEMUD_CMD_FLAG_VNC_COLON |
|
||||
QEMUD_CMD_FLAG_NO_REBOOT |
|
||||
QEMUD_CMD_FLAG_DRIVE |
|
||||
QEMUD_CMD_FLAG_DRIVE_BOOT |
|
||||
QEMUD_CMD_FLAG_NAME |
|
||||
QEMUD_CMD_FLAG_UUID |
|
||||
QEMUD_CMD_FLAG_VNET_HDR |
|
||||
QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP |
|
||||
QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC |
|
||||
QEMUD_CMD_FLAG_DRIVE_CACHE_V2 |
|
||||
QEMUD_CMD_FLAG_KVM |
|
||||
QEMUD_CMD_FLAG_DRIVE_FORMAT |
|
||||
QEMUD_CMD_FLAG_VGA,
|
||||
10050, 1, 0);
|
||||
|
||||
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
||||
}
|
||||
|
||||
@@ -20,5 +20,8 @@
|
||||
</disk>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
<graphics type='sdl' display=':0.1' xauth='/root/.Xauthority' fullscreen='yes'/>
|
||||
<video>
|
||||
<model type='cirrus' vram='9216' heads='1'/>
|
||||
</video>
|
||||
</devices>
|
||||
</domain>
|
||||
|
||||
@@ -1 +1 @@
|
||||
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test XAUTHORITY=/root/.Xauthority DISPLAY=:0.1 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
|
||||
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test XAUTHORITY=/root/.Xauthority DISPLAY=:0.1 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -std-vga
|
||||
|
||||
@@ -20,5 +20,8 @@
|
||||
</disk>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
<graphics type='sdl' display=':0.1' xauth='/root/.Xauthority'/>
|
||||
<video>
|
||||
<model type='vga' vram='9216' heads='1'/>
|
||||
</video>
|
||||
</devices>
|
||||
</domain>
|
||||
|
||||
@@ -1 +1 @@
|
||||
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,sasl
|
||||
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,sasl -vga cirrus
|
||||
|
||||
@@ -20,5 +20,8 @@
|
||||
</disk>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
<graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>
|
||||
<video>
|
||||
<model type='cirrus' vram='9216' heads='1'/>
|
||||
</video>
|
||||
</devices>
|
||||
</domain>
|
||||
|
||||
@@ -20,5 +20,8 @@
|
||||
</disk>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
<graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>
|
||||
<video>
|
||||
<model type='cirrus' vram='9216' heads='1'/>
|
||||
</video>
|
||||
</devices>
|
||||
</domain>
|
||||
|
||||
@@ -20,5 +20,8 @@
|
||||
</disk>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
<graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>
|
||||
<video>
|
||||
<model type='cirrus' vram='9216' heads='1'/>
|
||||
</video>
|
||||
</devices>
|
||||
</domain>
|
||||
|
||||
@@ -20,5 +20,8 @@
|
||||
</disk>
|
||||
<input type='mouse' bus='xen'/>
|
||||
<graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>
|
||||
<video>
|
||||
<model type='xen' vram='4096' heads='1'/>
|
||||
</video>
|
||||
</devices>
|
||||
</domain>
|
||||
|
||||
@@ -216,7 +216,7 @@ mymain(int argc, char **argv)
|
||||
|
||||
driver.vncSASL = 1;
|
||||
driver.vncSASLdir = strdup("/root/.sasl2");
|
||||
DO_TEST("graphics-vnc-sasl", 0);
|
||||
DO_TEST("graphics-vnc-sasl", QEMUD_CMD_FLAG_VGA);
|
||||
driver.vncTLS = 1;
|
||||
driver.vncTLSx509verify = 1;
|
||||
driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu");
|
||||
|
||||
@@ -102,6 +102,8 @@ mymain(int argc, char **argv)
|
||||
DO_TEST("disk-drive-cache-v1-wb");
|
||||
DO_TEST("disk-drive-cache-v1-none");
|
||||
DO_TEST("graphics-vnc");
|
||||
DO_TEST("graphics-vnc-sasl");
|
||||
DO_TEST("graphics-vnc-tls");
|
||||
DO_TEST("graphics-sdl");
|
||||
DO_TEST("graphics-sdl-fullscreen");
|
||||
DO_TEST("input-usbmouse");
|
||||
|
||||
Reference in New Issue
Block a user