[libvirt PATCH 8/8] conf: include virnetworkportdef.h in domain_conf.h

Ján Tomko jtomko at redhat.com
Sat Feb 22 16:31:59 UTC 2020


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

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 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 cdc4d25700..d85c2d7706 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);
-- 
2.24.1




More information about the libvir-list mailing list