util: clean up #includes of virnetdevopenvswitch.h

virnetdevopenvswitch.h declares a few functions that can be called to
add ports to and remove them from OVS bridges, and retrieve the
migration data for a port. It does not contain any data definitions
that are used by domain_conf.h. But for some reason, domain_conf.h
virnetdevopenvswitch.h should be directly #including it. This adds a
few lines to the project, but saves all the files that don't need it
from the extra computing, and makes the dependencies more clear cut.

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 4eb7742887e7a25cc1ca5ebbc637f29e555bd6bf..9d314fa0c0b4598282a48c39d849eb0f73dbe867 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -42,7 +42,6 @@
 # include "virnetdevmacvlan.h"
 # include "virsysinfo.h"
 # include "virnetdevvportprofile.h"
-# include "virnetdevopenvswitch.h"
 # include "virnetdevbandwidth.h"
 # include "virnetdevvlan.h"
 # include "virobject.h"

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 98fbea848bf9ace83eb2e38476f854510e2370b2..245000d963076a0649b65dca165ec5a752625adc 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -49,6 +49,7 @@
 #include "viralloc.h"
 #include "virnetdevbridge.h"
 #include "virnetdevveth.h"
+#include "virnetdevopenvswitch.h"
 #include "nodeinfo.h"
 #include "viruuid.h"
 #include "virstats.h"

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 1e90c16975120647af83e282b4b28ef52ce7bba1..6c23a0bab27dfe5fd8ec69e067b01b19dd351819 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -37,6 +37,7 @@
 #include "virnetdev.h"
 #include "virnetdevveth.h"
 #include "virnetdevbridge.h"
+#include "virnetdevopenvswitch.h"
 #include "virtime.h"
 #include "domain_nwfilter.h"
 #include "network/bridge_driver.h"

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 32596a787577cd0811e74442c7a735dc207d5e24..9e51f31870f8bc75d569b7e15072c4104bb72846 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -47,6 +47,7 @@
 #include "virnetdev.h"
 #include "virnetdevbridge.h"
 #include "virnetdevtap.h"
+#include "virnetdevopenvswitch.h"
 #include "virnetdevmidonet.h"
 #include "device_conf.h"
 #include "virstoragefile.h"

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 83be435a638802d0d2e878c43ca6fad6d1631e68..992e19218ac651ced09c618ed8c436f7289aa46c 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1,7 +1,7 @@
 /*
  * qemu_migration.c: QEMU migration handling
  *
- * Copyright (C) 2006-2014 Red Hat, Inc.
+ * Copyright (C) 2006-2015 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -45,6 +45,7 @@
 #include "virerror.h"
 #include "viralloc.h"
 #include "virfile.h"
+#include "virnetdevopenvswitch.h"
 #include "datatypes.h"
 #include "fdstream.h"
 #include "viruuid.h"

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 37cdb8fba6428150bc88c31ef0685aee8925955b..8c4c0e913d699f012336a6147f8967c352c7b946 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -62,6 +62,7 @@
 #include "virprocess.h"
 #include "virtime.h"
 #include "virnetdevtap.h"
+#include "virnetdevopenvswitch.h"
 #include "virnetdevmidonet.h"
 #include "virbitmap.h"
 #include "viratomic.h"