38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From 6620c7cc62f11f1eda32c4b1c8006c0fdafb1c59 Mon Sep 17 00:00:00 2001
|
||
|
|
From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 24 Nov 2022 17:19:05 +0800
|
||
|
|
Subject: [PATCH 18/23] vmx: Require networkName for bridged and custom NICs
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cherry-pick from db0564b4d34fb94fe59f04a4e411374ec1b6fc19
|
||
|
|
|
||
|
|
Commit 70768cda9740 marked this particular config string optional, but
|
||
|
|
forgot that two of the interface types still require this name to
|
||
|
|
exist. Mark it as optional only if there is no connectionType.
|
||
|
|
|
||
|
|
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
||
|
|
Signed-off-by: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
|
||
|
|
Reviewed-by: Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/vmx/vmx.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
|
||
|
|
index fbc8366f2b..5f2ada6630 100644
|
||
|
|
--- a/src/vmx/vmx.c
|
||
|
|
+++ b/src/vmx/vmx.c
|
||
|
|
@@ -2667,7 +2667,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
|
||
|
|
STRCASEEQ(connectionType, "bridged") ||
|
||
|
|
STRCASEEQ(connectionType, "custom")) {
|
||
|
|
if (virVMXGetConfigString(conf, networkName_name, &networkName,
|
||
|
|
- true) < 0)
|
||
|
|
+ connectionType == NULL) < 0)
|
||
|
|
goto cleanup;
|
||
|
|
|
||
|
|
if (!networkName)
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|