From patchwork Fri Sep 9 09:24:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 114040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F20D7B6F69 for ; Fri, 9 Sep 2011 19:55:26 +1000 (EST) Received: from localhost ([::1]:46007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1xKj-0003Tp-DI for incoming@patchwork.ozlabs.org; Fri, 09 Sep 2011 05:25:13 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1xJx-0001BO-Go for qemu-devel@nongnu.org; Fri, 09 Sep 2011 05:24:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R1xJv-0005T3-8p for qemu-devel@nongnu.org; Fri, 09 Sep 2011 05:24:25 -0400 Received: from mtagate2.uk.ibm.com ([194.196.100.162]:33459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1xJu-0005Sf-QB for qemu-devel@nongnu.org; Fri, 09 Sep 2011 05:24:23 -0400 Received: from d06nrmr1507.portsmouth.uk.ibm.com (d06nrmr1507.portsmouth.uk.ibm.com [9.149.38.233]) by mtagate2.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p899OL59016255 for ; Fri, 9 Sep 2011 09:24:21 GMT Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p899OLFo2420948 for ; Fri, 9 Sep 2011 10:24:21 +0100 Received: from d06av11.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p899OK38004996 for ; Fri, 9 Sep 2011 03:24:21 -0600 Received: from stefanha-thinkpad.manchester-maybrook.uk.ibm.com (dyn-9-174-219-30.manchester-maybrook.uk.ibm.com [9.174.219.30]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p899OIqX004851; Fri, 9 Sep 2011 03:24:20 -0600 From: Stefan Hajnoczi To: Date: Fri, 9 Sep 2011 10:24:15 +0100 Message-Id: <1315560255-25009-9-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1315560255-25009-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1315560255-25009-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.162 Cc: Anthony Liguori , Riku Voipio , Stefan Hajnoczi , Jan Kiszka Subject: [Qemu-devel] [PATCH 8/8] Fix include statements for qemu-common.h 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 From: Stefan Weil * qemu-common.h is not a system include file, so it should be included with "" instead of <>. Otherwise incremental builds might fail because only local include files are checked for changes. * linux-user/syscall.c included the file twice. Cc: Riku Voipio Cc: Jan Kiszka Acked-by: Kevin Wolf Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- hw/virtio-blk.c | 2 +- linux-user/syscall.c | 3 +-- nbd.h | 2 +- qemu-nbd.c | 2 +- slirp/libslirp.h | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 4df23f4..d5d4757 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -11,7 +11,7 @@ * */ -#include +#include "qemu-common.h" #include "qemu-error.h" #include "trace.h" #include "blockdev.h" diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 6bdf4e6..e87e174 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -60,7 +60,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base, #include #include #include -#include +#include "qemu-common.h" #ifdef TARGET_GPROF #include #endif @@ -96,7 +96,6 @@ int __clone2(int (*fn)(void *), void *child_stack_base, #include "cpu-uname.h" #include "qemu.h" -#include "qemu-common.h" #if defined(CONFIG_USE_NPTL) #define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \ diff --git a/nbd.h b/nbd.h index 96f77fe..273cfa1 100644 --- a/nbd.h +++ b/nbd.h @@ -21,7 +21,7 @@ #include -#include +#include "qemu-common.h" #include "block_int.h" diff --git a/qemu-nbd.c b/qemu-nbd.c index 0b25a4d..3a39145 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -16,7 +16,7 @@ * along with this program; if not, see . */ -#include +#include "qemu-common.h" #include "block_int.h" #include "nbd.h" diff --git a/slirp/libslirp.h b/slirp/libslirp.h index 67c70e3..a755123 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -1,7 +1,7 @@ #ifndef _LIBSLIRP_H #define _LIBSLIRP_H -#include +#include "qemu-common.h" #ifdef CONFIG_SLIRP