External/libvirt
1
0
Fork 0
Code

conf: domain_conf: remove virDomainVideoDefaultType

Browse Source 
The logic has been moved to the individual drivers.

Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Rafael Fonseca 2020-03-24 17:14:36 +01:00 committed by Michal Privoznik
parent 0b9d2287ed
commit d7e6dd0669
3 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/conf/domain_conf.c
View File

@ -15711,32 +15711,6 @@ virDomainVideoDefaultRAM(const virDomainDef *def,
} }
int
virDomainVideoDefaultType(const virDomainDef *def)
{
switch ((virDomainVirtType)def->virtType) {
case VIR_DOMAIN_VIRT_VBOX:
case VIR_DOMAIN_VIRT_TEST:
case VIR_DOMAIN_VIRT_VMWARE:
case VIR_DOMAIN_VIRT_VZ:
case VIR_DOMAIN_VIRT_PARALLELS:
case VIR_DOMAIN_VIRT_XEN:
case VIR_DOMAIN_VIRT_BHYVE:
case VIR_DOMAIN_VIRT_QEMU:
case VIR_DOMAIN_VIRT_KQEMU:
case VIR_DOMAIN_VIRT_KVM:
case VIR_DOMAIN_VIRT_LXC:
case VIR_DOMAIN_VIRT_UML:
case VIR_DOMAIN_VIRT_OPENVZ:
case VIR_DOMAIN_VIRT_HYPERV:
case VIR_DOMAIN_VIRT_PHYP:
case VIR_DOMAIN_VIRT_NONE:
case VIR_DOMAIN_VIRT_LAST:
default:
return VIR_DOMAIN_VIDEO_TYPE_DEFAULT;
}
}
static virDomainVideoAccelDefPtr static virDomainVideoAccelDefPtr
virDomainVideoAccelDefParseXML(xmlNodePtr node) virDomainVideoAccelDefParseXML(xmlNodePtr node)
{ {
@ -15854,7 +15828,6 @@ static virDomainVideoDefPtr
virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt, virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr node, xmlNodePtr node,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
const virDomainDef *dom,
unsigned int flags) unsigned int flags)
{ {
virDomainVideoDefPtr def; virDomainVideoDefPtr def;
@ -15925,7 +15898,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error; goto error;
} }
} else { } else {
def->type = virDomainVideoDefaultType(dom); def->type = VIR_DOMAIN_VIDEO_TYPE_DEFAULT;
} }
if (driver_name) { if (driver_name) {
@ -16871,7 +16844,7 @@ virDomainDeviceDefParse(const char *xmlStr,
break; break;
case VIR_DOMAIN_DEVICE_VIDEO: case VIR_DOMAIN_DEVICE_VIDEO:
if (!(dev->data.video = virDomainVideoDefParseXML(xmlopt, node, if (!(dev->data.video = virDomainVideoDefParseXML(xmlopt, node,
ctxt, def, flags))) ctxt, flags)))
return NULL; return NULL;
break; break;
case VIR_DOMAIN_DEVICE_HOSTDEV: case VIR_DOMAIN_DEVICE_HOSTDEV:
@ -21633,7 +21606,7 @@ virDomainDefParseXML(xmlDocPtr xml,
ssize_t insertAt = -1; ssize_t insertAt = -1;
if (!(video = virDomainVideoDefParseXML(xmlopt, nodes[i], if (!(video = virDomainVideoDefParseXML(xmlopt, nodes[i],
ctxt, def, flags))) ctxt, flags)))
goto error; goto error;
if (video->primary) { if (video->primary) {
@ -24314,7 +24287,7 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def, virDomainXMLOptionPtr xmlopt)
if (!(video = virDomainVideoDefNew(xmlopt))) if (!(video = virDomainVideoDefNew(xmlopt)))
goto cleanup; goto cleanup;
video->type = virDomainVideoDefaultType(def); video->type = VIR_DOMAIN_VIDEO_TYPE_DEFAULT;
if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0) if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0)
goto cleanup; goto cleanup;

1
src/conf/domain_conf.h
View File

@ -3364,7 +3364,6 @@ int virDomainFSInsert(virDomainDefPtr def, virDomainFSDefPtr fs);
int virDomainFSIndexByName(virDomainDefPtr def, const char *name); int virDomainFSIndexByName(virDomainDefPtr def, const char *name);
virDomainFSDefPtr virDomainFSRemove(virDomainDefPtr def, size_t i); virDomainFSDefPtr virDomainFSRemove(virDomainDefPtr def, size_t i);
int virDomainVideoDefaultType(const virDomainDef *def);
unsigned int virDomainVideoDefaultRAM(const virDomainDef *def, unsigned int virDomainVideoDefaultRAM(const virDomainDef *def,
const virDomainVideoType type); const virDomainVideoType type);

1
src/libvirt_private.syms
View File

@ -633,7 +633,6 @@ virDomainTPMModelTypeFromString;
virDomainTPMModelTypeToString; virDomainTPMModelTypeToString;
virDomainUSBDeviceDefForeach; virDomainUSBDeviceDefForeach;
virDomainVideoDefaultRAM; virDomainVideoDefaultRAM;
virDomainVideoDefaultType;
virDomainVideoDefClear; virDomainVideoDefClear;
virDomainVideoDefFree; virDomainVideoDefFree;
virDomainVideoDefNew; virDomainVideoDefNew;