shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-08-24 09:49:59 +03:00
Code Releases Activity

qemu: domain: Don't return default NIC model if @qemuCaps are missing

Browse Source 
Return NULL in qemuDomainDefaultNetModel if qemuCaps is missing and the
network card model would be determined by the capabilities.
This commit is contained in:
Peter Krempa
2017-08-16 15:49:15 +02:00
parent 6df29d0816
commit fde772cf82
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_domain.c
View File

@ -3263,6 +3263,15 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
} }
/**
* qemuDomainDefaultNetModel:
* @def: domain definition
* @qemuCaps: qemu capabilities
*
* Returns the default network model for a given domain. Note that if @qemuCaps
* is NULL this function may return NULL if the default model depends on the
* capabilities.
*/
static const char * static const char *
qemuDomainDefaultNetModel(const virDomainDef *def, qemuDomainDefaultNetModel(const virDomainDef *def,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
@ -3283,6 +3292,11 @@ qemuDomainDefaultNetModel(const virDomainDef *def,
return "lan9118"; return "lan9118";
} }
/* In all other cases the model depends on the capabilities. If they were
* not provided don't report any default. */
if (!qemuCaps)
return NULL;
/* Try several network devices in turn; each of these devices is /* Try several network devices in turn; each of these devices is
* less likely be supported out-of-the-box by the guest operating * less likely be supported out-of-the-box by the guest operating
* system than the previous one */ * system than the previous one */