From: Daniel P. Berrangé <berrange@redhat.com>
Date: Thu, 12 Sep 2019 15:04:20 +0000 (+0100)
Subject: conf: correctly convert 'managed' attribute from network port
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e0cb57c552b79016535199021dca5296c0ca89a3;p=libvirt.git

conf: correctly convert 'managed' attribute from network port

The virNetworkPortDef config stores the 'managed' attribute
as the virTristateBool type.

The virDomainDef config stores the 'managed' attribute as
the bool type.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b1f8a13319..96e9223e21 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -30688,7 +30688,15 @@ virDomainNetDefActualFromNetworkPort(virDomainNetDefPtr iface,
         actual->data.hostdev.def.parentnet = iface;
         actual->data.hostdev.def.info = &iface->info;
         actual->data.hostdev.def.mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS;
-        actual->data.hostdev.def.managed = port->plug.hostdevpci.managed;
+        switch (port->plug.hostdevpci.managed) {
+        case VIR_TRISTATE_BOOL_YES:
+            actual->data.hostdev.def.managed = true;
+            break;
+        case VIR_TRISTATE_BOOL_ABSENT:
+        case VIR_TRISTATE_BOOL_NO:
+            actual->data.hostdev.def.managed = false;
+            break;
+        }
         actual->data.hostdev.def.source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
         actual->data.hostdev.def.source.subsys.u.pci.addr = port->plug.hostdevpci.addr;
         switch ((virNetworkForwardDriverNameType)port->plug.hostdevpci.driver) {
@@ -30820,7 +30828,7 @@ virDomainNetDefActualToNetworkPort(virDomainDefPtr dom,
                            iface->ifname);
             goto error;
         }
-        port->plug.hostdevpci.managed = actual->data.hostdev.def.managed;
+        port->plug.hostdevpci.managed = virTristateBoolFromBool(actual->data.hostdev.def.managed);
         port->plug.hostdevpci.addr = actual->data.hostdev.def.source.subsys.u.pci.addr;
         switch ((virDomainHostdevSubsysPCIBackendType)actual->data.hostdev.def.source.subsys.u.pci.backend) {
         case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: