From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 24 Oct 2012 09:27:28 +0000 (+0200)
Subject: net: move net.c to net/
X-Git-Tag: v1.4.0-rc0~251^2~5^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd9400b302ef582c3ae8a8d5288338ea5f0f4c9a;p=thirdparty%2Fqemu.git

net: move net.c to net/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/Makefile.objs b/Makefile.objs
index 986f085c851..83092dc74b0 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -66,7 +66,7 @@ endif
 # single QEMU executable should support all CPUs and machines.
 
 common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
-common-obj-y += net.o net/
+common-obj-y += net/
 common-obj-y += qom/
 common-obj-y += readline.o console.o cursor.o
 common-obj-y += qemu-pixman.o
diff --git a/net/Makefile.objs b/net/Makefile.objs
index cf041877179..a08cd14e2e4 100644
--- a/net/Makefile.objs
+++ b/net/Makefile.objs
@@ -1,4 +1,4 @@
-common-obj-y = queue.o checksum.o util.o hub.o
+common-obj-y = net.o queue.o checksum.o util.o hub.o
 common-obj-y += socket.o
 common-obj-y += dump.o
 common-obj-$(CONFIG_POSIX) += tap.o
diff --git a/net.c b/net/net.c
similarity index 99%
rename from net.c
rename to net/net.c
index 4f3d6424687..7b1600f17c8 100644
--- a/net.c
+++ b/net/net.c
@@ -24,10 +24,10 @@
 #include "config-host.h"
 
 #include "net.h"
-#include "net/clients.h"
-#include "net/hub.h"
-#include "net/slirp.h"
-#include "net/util.h"
+#include "clients.h"
+#include "hub.h"
+#include "slirp.h"
+#include "util.h"
 
 #include "monitor.h"
 #include "qemu-common.h"