From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 17 Feb 2020 17:51:55 +0000 (+0100)
Subject: conf: include virnetworkportdef.h in domain_conf.h
X-Git-Tag: v6.1.0-rc1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c37c60f3d0294daba8d48328cdf75180caf79a0;p=thirdparty%2Flibvirt.git

conf: include virnetworkportdef.h in domain_conf.h

Now that this file no longer transitively includes
domain_conf.h, it can be included here.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

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);