From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Za-0003Br-JA for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:00:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TR0ZT-0003In-0P for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:00:38 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:46181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0ZR-0002s4-NU for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:00:30 -0400 Received: by mail-da0-f45.google.com with SMTP id n15so234236dad.4 for ; Wed, 24 Oct 2012 06:00:25 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 24 Oct 2012 14:58:44 +0200 Message-Id: <1351083542-15272-15-git-send-email-pbonzini@redhat.com> In-Reply-To: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> References: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 14/32] net: move net.c to net/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com 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 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