External/libvirt
1
0
Fork 0
Code

qemu_command: remove xenner leftover from video device code

Browse Source 
Qemu supports *xen* video device only with XEN and this code was part
of xenner code.  We dropped support for xenner in commit de9be0a.

Before this patch if you used 'xen' video type you ended up with
domain without any video device at all.  Now we don't allow to start
such domain.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-10-11 17:37:45 +02:00
parent 3632ddc766
commit 971d552e68
1 changed files with 85 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_command.c
View File

@ -96,7 +96,7 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
"std",
"cirrus",
"vmware",
"", /* no arg needed for xen */
"", /* don't support xen */
"", /* don't support vbox */
"qxl",
"", /* don't support parallels */
@ -108,7 +108,7 @@ VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
"VGA",
"cirrus-vga",
"vmware-svga",
"", /* no device for xen */
"", /* don't support xen */
"", /* don't support vbox */
"qxl-vga",
"", /* don't support parallels */
@ -4418,9 +4418,6 @@ qemuBuildVideoCommandLine(virCommandPtr cmd,
virCommandAddArg(cmd, str);
VIR_FREE(str);
}
} else {
if (primaryVideoType == VIR_DOMAIN_VIDEO_TYPE_XEN) {
/* nothing - vga has no effect on Xen pvfb */
} else {
if ((primaryVideoType == VIR_DOMAIN_VIDEO_TYPE_QXL) &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_QXL)) {
@ -4514,7 +4511,6 @@ qemuBuildVideoCommandLine(virCommandPtr cmd,
virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u",
dev, vram / 1024);
}
}
for (i = 1; i < def->nvideos; i++) {
char *str;