From patchwork Wed Oct 24 12:58:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 193783 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5EF4C2C008B for ; Thu, 25 Oct 2012 00:46:04 +1100 (EST) Received: from localhost ([::1]:43478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR1HW-0003Gi-DF for incoming@patchwork.ozlabs.org; Wed, 24 Oct 2012 09:46:02 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=GczICsbQRsXGpp7/UgQIkNmIAIIjAZP3HfJ4ZQPqhhs=; b=uV/c2TlEa3yDZFUaNUPUTJ4NKz1Af878FFPiyrf1MTs4J8M2rPm0Iw9/NHPMGDnkrG wglXdbfbELJar2RLJFqzmUe+eWBMS3cwsbsoOQknymgm+IBwtCXiWWWka8jzs3ttXgxU UFz0OC4CdGABK/hOXBhEECn7yv2BYHFba/sOEPE+eY+oOZgxkt//a2FTgJlqWzzNMANX bLHNxsjeWlW1Ogw6ZABCH2EWJolid9Tk89hyRPxj3iI1C/YccD5sM0PCIYDJD29YL+tU rAMGM9lwWgi3scpClk3QmABwK7Nx+BfCkbpwpjWuO2WY0qdgbQ7IpqrYBTZtgd86/EFR CKxA== Received: by 10.68.192.97 with SMTP id hf1mr49381841pbc.106.1351083625523; Wed, 24 Oct 2012 06:00:25 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id n7sm9466138pav.26.2012.10.24.06.00.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 06:00:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 24 Oct 2012 14:58:44 +0200 Message-Id: <1351083542-15272-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> References: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 14/32] net: move net.c to net/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 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"