From 0c37c60f3d0294daba8d48328cdf75180caf79a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 17 Feb 2020 18:51:55 +0100 Subject: [PATCH] conf: include virnetworkportdef.h in domain_conf.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that this file no longer transitively includes domain_conf.h, it can be included here. Signed-off-by: Ján Tomko Reviewed-by: Michal Privoznik --- src/conf/domain_conf.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c126a90729..4745d7c731 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -44,6 +44,7 @@ #include "virnetdevvportprofile.h" #include "virnetdevbandwidth.h" #include "virnetdevvlan.h" +#include "virnetworkportdef.h" #include "virobject.h" #include "device_conf.h" #include "virbitmap.h" @@ -3643,11 +3644,6 @@ bool virDomainDefLifecycleActionAllowed(virDomainLifecycle type, virDomainLifecycleAction action); -// Forward decl to avoid pulling in virnetworkportdef.h because -// that pulls in virhostdev.h which pulls in domain_conf.h (evil) -typedef struct _virNetworkPortDef virNetworkPortDef; -typedef virNetworkPortDef *virNetworkPortDefPtr; - virNetworkPortDefPtr virDomainNetDefToNetworkPort(virDomainDefPtr dom, virDomainNetDefPtr iface);