aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-10-23 17:52:16 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-30 08:39:26 -0500
commite1144d006ddd41f4e500b415f4b114af019a716b (patch)
treea7b12846cdbe00495c9c543414764e8861971ac9
parentf7cbc08ff0d712b0febcf84ce8458c3ae30db4fa (diff)
downloadqemu-e1144d006ddd41f4e500b415f4b114af019a716b.zip
qemu-e1144d006ddd41f4e500b415f4b114af019a716b.tar.gz
qemu-e1144d006ddd41f4e500b415f4b114af019a716b.tar.bz2
net: move net-queue.[ch] under net/
[v2: handle building in a separate dir] Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile10
-rwxr-xr-xconfigure2
-rw-r--r--net.h2
-rw-r--r--net/queue.c (renamed from net-queue.c)2
-rw-r--r--net/queue.h (renamed from net-queue.h)0
5 files changed, 10 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 4d9908c..2349620 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,10 @@ block-nested-$(CONFIG_CURL) += curl.o
block-obj-y += $(addprefix block/, $(block-nested-y))
+net-obj-y = net.o
+net-nested-y = queue.o
+net-obj-y += $(addprefix net/, $(net-nested-y))
+
######################################################################
# libqemu_common.a: Target independent part of system emulation. The
# long term path is to suppress *all* target specific code in case of
@@ -93,6 +97,7 @@ block-obj-y += $(addprefix block/, $(block-nested-y))
# CPUs and machines.
obj-y = $(block-obj-y)
+obj-y += $(net-obj-y)
obj-y += readline.o console.o
obj-y += tcg-runtime.o host-utils.o
@@ -121,7 +126,6 @@ obj-$(CONFIG_SD) += sd.o
obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
obj-y += bt-hci-csr.o
obj-y += buffered_file.o migration.o migration-tcp.o qemu-sockets.o
-obj-y += net.o net-queue.o
obj-y += qemu-char.o aio.o net-checksum.o savevm.o
obj-y += msmouse.o ps2.o
obj-y += qdev.o qdev-properties.o
@@ -220,7 +224,7 @@ clean:
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
- rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
+ rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d
rm -f qemu-img-cmds.h
$(MAKE) -C tests clean
for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser; do \
@@ -404,4 +408,4 @@ tarbin:
$(mandir)/man8/qemu-nbd.8
# Include automatically generated dependency files
--include $(wildcard *.d audio/*.d slirp/*.d block/*.d)
+-include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d)
diff --git a/configure b/configure
index 43d87c5..6b4faf6 100755
--- a/configure
+++ b/configure
@@ -2529,7 +2529,7 @@ done # for target in $targets
# build tree in object directory if source path is different from current one
if test "$source_path_used" = "yes" ; then
- DIRS="tests tests/cris slirp audio block pc-bios/optionrom"
+ DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
DIRS="$DIRS roms/pcbios roms/seabios roms/vgabios"
FILES="Makefile tests/Makefile"
FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
diff --git a/net.h b/net.h
index 639be5e..331782d 100644
--- a/net.h
+++ b/net.h
@@ -5,7 +5,7 @@
#include "qemu-common.h"
#include "qdict.h"
#include "qemu-option.h"
-#include "net-queue.h"
+#include "net/queue.h"
struct MACAddr {
uint8_t a[6];
diff --git a/net-queue.c b/net/queue.c
index f6b01e9..e91a9a5 100644
--- a/net-queue.c
+++ b/net/queue.c
@@ -21,7 +21,7 @@
* THE SOFTWARE.
*/
-#include "net-queue.h"
+#include "net/queue.h"
#include "qemu-queue.h"
/* The delivery handler may only return zero if it will call
diff --git a/net-queue.h b/net/queue.h
index a31958e..a31958e 100644
--- a/net-queue.h
+++ b/net/queue.h