]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: include virnetworkportdef.h in domain_conf.h
authorJán Tomko <jtomko@redhat.com>
Mon, 17 Feb 2020 17:51:55 +0000 (18:51 +0100)
committerJán Tomko <jtomko@redhat.com>
Tue, 25 Feb 2020 16:50:47 +0000 (17:50 +0100)
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>
src/conf/domain_conf.h

index c126a907292e05c6f979ada3eb6501a139192da8..4745d7c731f40ddd45431d2441dd3a38ad09f0f4 100644 (file)
@@ -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);