[PATCH 7/7] conf: domain_conf: remove virDomainVideoDefaultType
The logic has been moved to the individual drivers.
Signed-off-by: Rafael Fonseca <r4f4rfs(a)gmail.com>
---
src/conf/domain_conf.c | 35 ++++-------------------------------
src/conf/domain_conf.h | 1 -
src/libvirt_private.syms | 1 -
3 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 665bb10b27..27bc5a797b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -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
virDomainVideoAccelDefParseXML(xmlNodePtr node)
{
@@ -15854,7 +15828,6 @@ static virDomainVideoDefPtr
virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr node,
xmlXPathContextPtr ctxt,
- const virDomainDef *dom,
unsigned int flags)
{
virDomainVideoDefPtr def;
@@ -15925,7 +15898,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
}
} else {
- def->type = virDomainVideoDefaultType(dom);
+ def->type = VIR_DOMAIN_VIDEO_TYPE_DEFAULT;
}
if (driver_name) {
@@ -16871,7 +16844,7 @@ virDomainDeviceDefParse(const char *xmlStr,
break;
case VIR_DOMAIN_DEVICE_VIDEO:
if (!(dev->data.video = virDomainVideoDefParseXML(xmlopt, node,
- ctxt, def, flags)))
+ ctxt, flags)))
return NULL;
break;
case VIR_DOMAIN_DEVICE_HOSTDEV:
@@ -21633,7 +21606,7 @@ virDomainDefParseXML(xmlDocPtr xml,
ssize_t insertAt = -1;
if (!(video = virDomainVideoDefParseXML(xmlopt, nodes[i],
- ctxt, def, flags)))
+ ctxt, flags)))
goto error;
if (video->primary) {
@@ -24314,7 +24287,7 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt)
if (!(video = virDomainVideoDefNew(xmlopt)))
goto cleanup;
- video->type = virDomainVideoDefaultType(def);
+ video->type = VIR_DOMAIN_VIDEO_TYPE_DEFAULT;
if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0)
goto cleanup;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index b7c31eb62f..33875d942f 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3364,7 +3364,6 @@ int virDomainFSInsert(virDomainDefPtr def, virDomainFSDefPtr fs);
int virDomainFSIndexByName(virDomainDefPtr def, const char *name);
virDomainFSDefPtr virDomainFSRemove(virDomainDefPtr def, size_t i);
-int virDomainVideoDefaultType(const virDomainDef *def);
unsigned int virDomainVideoDefaultRAM(const virDomainDef *def,
const virDomainVideoType type);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index c9f0da2bf9..3f032c7963 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -633,7 +633,6 @@ virDomainTPMModelTypeFromString;
virDomainTPMModelTypeToString;
virDomainUSBDeviceDefForeach;
virDomainVideoDefaultRAM;
-virDomainVideoDefaultType;
virDomainVideoDefClear;
virDomainVideoDefFree;
virDomainVideoDefNew;
--
2.25.1