External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 19:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: domain: add VIDEO_TYPE_DEFAULT

Browse Source 
Will be needed for future patches to pull the default video type
setting out of XML parsing routines.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2017-08-27 11:04:39 -04:00
parent 4c248e938a
commit a2ca7ca52e
6 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/conf/domain_conf.c
View File

@ -551,6 +551,7 @@ VIR_ENUM_IMPL(virDomainPanicModel, VIR_DOMAIN_PANIC_MODEL_LAST,
"s390") "s390")
VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
"default",
"vga", "vga",
"cirrus", "cirrus",
"vmvga", "vmvga",

1
src/conf/domain_conf.h
View File

@ -1359,6 +1359,7 @@ struct _virDomainWatchdogDef {
typedef enum { typedef enum {
VIR_DOMAIN_VIDEO_TYPE_DEFAULT,
VIR_DOMAIN_VIDEO_TYPE_VGA, VIR_DOMAIN_VIDEO_TYPE_VGA,
VIR_DOMAIN_VIDEO_TYPE_CIRRUS, VIR_DOMAIN_VIDEO_TYPE_CIRRUS,
VIR_DOMAIN_VIDEO_TYPE_VMVGA, VIR_DOMAIN_VIDEO_TYPE_VMVGA,

3
src/qemu/qemu_command.c
View File

@ -97,6 +97,7 @@ VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST,
"unsafe"); "unsafe");
VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
"", /* default value, we shouldn't see this */
"std", "std",
"cirrus", "cirrus",
"vmware", "vmware",
@ -110,6 +111,7 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
VIR_ENUM_DECL(qemuDeviceVideo) VIR_ENUM_DECL(qemuDeviceVideo)
VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
"", /* default value, we shouldn't see this */
"VGA", "VGA",
"cirrus-vga", "cirrus-vga",
"vmware-svga", "vmware-svga",
@ -123,6 +125,7 @@ VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
VIR_ENUM_DECL(qemuDeviceVideoSecondary) VIR_ENUM_DECL(qemuDeviceVideoSecondary)
VIR_ENUM_IMPL(qemuDeviceVideoSecondary, VIR_DOMAIN_VIDEO_TYPE_LAST, VIR_ENUM_IMPL(qemuDeviceVideoSecondary, VIR_DOMAIN_VIDEO_TYPE_LAST,
"", /* default value, we shouldn't see this */
"", /* no secondary device for VGA */ "", /* no secondary device for VGA */
"", /* no secondary device for cirrus-vga */ "", /* no secondary device for cirrus-vga */
"", /* no secondary device for vmware-svga */ "", /* no secondary device for vmware-svga */

1
src/qemu/qemu_domain.c
View File

@ -3017,6 +3017,7 @@ qemuDomainDefValidateVideo(const virDomainDef *def)
case VIR_DOMAIN_VIDEO_TYPE_XEN: case VIR_DOMAIN_VIDEO_TYPE_XEN:
case VIR_DOMAIN_VIDEO_TYPE_VBOX: case VIR_DOMAIN_VIDEO_TYPE_VBOX:
case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("video type '%s' is not supported with QEMU"), _("video type '%s' is not supported with QEMU"),
virDomainVideoTypeToString(video->type)); virDomainVideoTypeToString(video->type));

1
src/qemu/qemu_domain_address.c
View File

@ -753,6 +753,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
return pciFlags; return pciFlags;
case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
case VIR_DOMAIN_VIDEO_TYPE_GOP: case VIR_DOMAIN_VIDEO_TYPE_GOP:
case VIR_DOMAIN_VIDEO_TYPE_LAST: case VIR_DOMAIN_VIDEO_TYPE_LAST:
return 0; return 0;

1
tests/domaincapsschemadata/full.xml
View File

@ -62,6 +62,7 @@
</graphics> </graphics>
<video supported='yes'> <video supported='yes'>
<enum name='modelType'> <enum name='modelType'>
<value>default</value>
<value>vga</value> <value>vga</value>
<value>cirrus</value> <value>cirrus</value>
<value>vmvga</value> <value>vmvga</value>