35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
From c8a043dcdf4f04288bcfc34c25054dcef571a6a7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
|
||
|
|
Date: Tue, 16 Jun 2020 16:32:10 +0200
|
||
|
|
Subject: [PATCH] qemu: do not add model when actual iface type is hostdev
|
||
|
|
|
||
|
|
No default model should be added to the interface
|
||
|
|
entry at post parse when its actual network type is hostdev
|
||
|
|
as doing so might cause a mismatch between the interface
|
||
|
|
definition and its actual device type.
|
||
|
|
|
||
|
|
cherry-pick from commit: bdb8f2e41867ae5dbcc040909b1b8c20fd864a40
|
||
|
|
|
||
|
|
Signed-off-by: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
|
||
|
|
Reviewed-by: Laine Stump <laine@redhat.com>
|
||
|
|
Signed-off-by: Jin Yan <jinyan12@huawei.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_domain.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
||
|
|
index 91c1a49..cfada81 100644
|
||
|
|
--- a/src/qemu/qemu_domain.c
|
||
|
|
+++ b/src/qemu/qemu_domain.c
|
||
|
|
@@ -9334,6 +9334,7 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net,
|
||
|
|
virQEMUCapsPtr qemuCaps)
|
||
|
|
{
|
||
|
|
if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
|
||
|
|
+ virDomainNetResolveActualType(net) != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
|
||
|
|
!virDomainNetGetModelString(net))
|
||
|
|
net->model = qemuDomainDefaultNetModel(def, qemuCaps);
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|