From patchwork Fri Oct 23 16:52:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 36795 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 923E5B7BD0 for ; Sat, 24 Oct 2009 03:55:53 +1100 (EST) Received: from localhost ([127.0.0.1]:52203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N1NQc-0004Ax-SU for incoming@patchwork.ozlabs.org; Fri, 23 Oct 2009 12:55:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N1NP8-0003V8-4s for qemu-devel@nongnu.org; Fri, 23 Oct 2009 12:54:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N1NP2-0003Rr-WD for qemu-devel@nongnu.org; Fri, 23 Oct 2009 12:54:17 -0400 Received: from [199.232.76.173] (port=35421 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N1NP2-0003Rk-Oh for qemu-devel@nongnu.org; Fri, 23 Oct 2009 12:54:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21088) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N1NP2-0006Mv-7t for qemu-devel@nongnu.org; Fri, 23 Oct 2009 12:54:12 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9NGsBeC014020 for ; Fri, 23 Oct 2009 12:54:11 -0400 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9NGsATT027182; Fri, 23 Oct 2009 12:54:10 -0400 Received: by blaa.localdomain (Postfix, from userid 500) id F35C71E9CD; Fri, 23 Oct 2009 17:52:16 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Fri, 23 Oct 2009 17:52:16 +0100 Message-Id: <1256316736-7505-1-git-send-email-markmc@redhat.com> In-Reply-To: <1256230156-29652-2-git-send-email-markmc@redhat.com> References: <1256230156-29652-2-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 01/15 v2] net: move net-queue.[ch] under net/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org [v2: handle building in a separate dir] Signed-off-by: Mark McLoughlin --- Makefile | 10 +++++++--- configure | 2 +- net.h | 2 +- net-queue.c => net/queue.c | 2 +- net-queue.h => net/queue.h | 0 5 files changed, 10 insertions(+), 6 deletions(-) rename net-queue.c => net/queue.c (99%) rename net-queue.h => net/queue.h (100%) diff --git a/net-queue.h b/net/queue.h similarity index 100% rename from net-queue.h rename to net/queue.h diff --git a/Makefile b/Makefile index e78a3d0..aea7756 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 7e6cbf4..9ebb978 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" /* VLANs support */ diff --git a/net-queue.c b/net/queue.c similarity index 99% rename from net-queue.c rename to 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