From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkfGY-0004He-SS for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:18:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkfGX-0004rd-Jb for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:18:14 -0500 Received: from mail-wi0-f169.google.com ([209.85.212.169]:57615) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkfGX-0004rQ-CJ for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:18:13 -0500 Received: by mail-wi0-f169.google.com with SMTP id hq12so2331445wib.4 for ; Mon, 17 Dec 2012 10:18:12 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 17 Dec 2012 19:17:15 +0100 Message-Id: <1355768254-12933-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> References: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 13/32] net: move net.c to net/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- 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