From: Thomas Huth <thuth@redhat.com>
Date: Wed, 10 May 2023 19:26:13 +0000 (+0200)
Subject: softmmu/vl.c: Disable default NIC if it has not been compiled into the binary
X-Git-Tag: v8.1.0-rc0~107^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26a0802d1ccbf3c3c659f3d2641cf7deef0e70ac;p=thirdparty%2Fqemu.git

softmmu/vl.c: Disable default NIC if it has not been compiled into the binary

Don't try to instantiate a default NIC if it is not available (since
this will cause QEMU to abort). Emit a warning instead.

Message-Id: <20230512124033.502654-5-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 43d3b972da5..b0b96f67fac 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -1294,6 +1294,13 @@ static void qemu_disable_default_devices(void)
         default_monitor = 0;
         default_net = 0;
         default_vga = 0;
+    } else {
+        if (default_net && machine_class->default_nic &&
+            !module_object_class_by_name(machine_class->default_nic)) {
+            warn_report("Default NIC '%s' is not available in this binary",
+                        machine_class->default_nic);
+            default_net = 0;
+        }
     }
 }