[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/32] net: move net.c to net/
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 13/32] net: move net.c to net/ |
Date: |
Mon, 17 Dec 2012 19:17:15 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 986f085..83092dc 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 cf04187..a08cd14 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 4f3d642..7b1600f 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"
--
1.8.0.2
- [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build, (continued)
- [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 06/32] build: create ldscripts/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 08/32] build: kill libuser, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 09/32] janitor: do not rely on indirect inclusions of or from qemu-char.h, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 12/32] net: do not include net.h everywhere, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 13/32] net: move net.c to net/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 10/32] janitor: do not include qemu-char everywhere, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 11/32] net: move Bluetooth stuff out of net.h, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 17/32] qapi: move inclusions of qemu-common.h from headers to .c files, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 16/32] ui: move files to ui/ and include/ui/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 18/32] qapi: remove qapi/qapi-types-core.h, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 15/32] qemu-ga: move qemu-ga files to qga/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 14/32] net: reorganize headers, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 20/32] janitor: add guards to headers, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 22/32] block: move include files to include/block/, Paolo Bonzini, 2012/12/17