From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 16 Aug 2017 13:49:15 +0000 (+0200)
Subject: qemu: domain: Don't return default NIC model if @qemuCaps are missing
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fde772cf829b9d5bf8525f3560fbe594ee291062;p=libvirt.git

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

Return NULL in qemuDomainDefaultNetModel if qemuCaps is missing and the
network card model would be determined by the capabilities.
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index dc8041b865..802dd9e39f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -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 *
 qemuDomainDefaultNetModel(const virDomainDef *def,
                           virQEMUCapsPtr qemuCaps)
@@ -3283,6 +3292,11 @@ qemuDomainDefaultNetModel(const virDomainDef *def,
         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
      * less likely be supported out-of-the-box by the guest operating
      * system than the previous one */