From fd9400b302ef582c3ae8a8d5288338ea5f0f4c9a Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 24 Oct 2012 11:27:28 +0200
Subject: [PATCH] net: move net.c to net/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile.objs      | 2 +-
 net/Makefile.objs  | 2 +-
 net.c => net/net.c | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename net.c => net/net.c (99%)

diff --git a/Makefile.objs b/Makefile.objs
index 986f085c85..83092dc74b 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 cf04187717..a08cd14e2e 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 4f3d642468..7b1600f17c 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"