[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/32] net: move net.c to net/
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 14/32] net: move net.c to net/ |
Date: |
Wed, 24 Oct 2012 14:58:44 +0200 |
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 66a0b3d..7bbe646 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -62,7 +62,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 += $(oslib-obj-y)
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 72d1c33..317e258 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.7.1
- [Qemu-devel] [PATCH 11/32] janitor: do not include qemu-char everywhere, (continued)
- [Qemu-devel] [PATCH 11/32] janitor: do not include qemu-char everywhere, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 20/32] qapi: move include files to include/qapi/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 22/32] block: move include files to include/block/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 21/32] qapi: create qobject/ and include/qobject/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 29/32] softmmu: move remaining include files to include/ subdirectories, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 27/32] misc: move include files to include/qemu/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 10/32] janitor: do not rely on indirect inclusions from qemu-char.h, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 14/32] net: move net.c to net/,
Paolo Bonzini <=
- Message not available
- [Qemu-devel] [PATCH 18/32] audio: move public header file to include/audio/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 09/32] janitor: move iovector functions out of cutils.c, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 19/32] slirp: move public header file to include/slirp/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 08/32] build: kill libuser, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/, Paolo Bonzini, 2012/10/24