aboutsummaryrefslogtreecommitdiff
path: root/net.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-09-17 18:43:51 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2012-10-08 13:59:40 +0200
commita245fc18352fe286ba45ae0661a73b3841514889 (patch)
tree0689faf6acf243cc360eb2ca1b31c89ce79cbcd0 /net.c
parent9899148110627da388f82c02997bca6d678d1aa1 (diff)
downloadqemu-a245fc18352fe286ba45ae0661a73b3841514889.zip
qemu-a245fc18352fe286ba45ae0661a73b3841514889.tar.gz
qemu-a245fc18352fe286ba45ae0661a73b3841514889.tar.bz2
net: consolidate NetClientState header files into one
This patch doesn't seem much useful alone, I must admit. However, it makes sense as part of the upcoming directory reorganization, where I want to have include/net/tap.h as the net<->hw interface for tap. Then having both net/tap.h and include/net/tap.h does not work. "Fixed" by moving all the init functions to a single header file net/clients.h. The patch also adopts a uniform style for including net/*.h files from net/*.c, without the net/ path. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Diffstat (limited to 'net.c')
-rw-r--r--net.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/net.c b/net.c
index a187a7b..ae4bc0d 100644
--- a/net.c
+++ b/net.c
@@ -21,17 +21,14 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "net.h"
-
#include "config-host.h"
-#include "net/tap.h"
-#include "net/socket.h"
-#include "net/dump.h"
-#include "net/slirp.h"
-#include "net/vde.h"
+#include "net.h"
+#include "net/clients.h"
#include "net/hub.h"
+#include "net/slirp.h"
#include "net/util.h"
+
#include "monitor.h"
#include "qemu-common.h"
#include "qemu_socket.h"