From patchwork Wed Oct 24 12:58:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [14/32] net: move net.c to net/ From: Paolo Bonzini X-Patchwork-Id: 193783 Message-Id: <1351083542-15272-15-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com Date: Wed, 24 Oct 2012 14:58:44 +0200 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"