[Qemu-devel] [PATCH] Fix include statements for qemu-common.h

[Qemu-devel] [PATCH] Fix include statements for qemu-common.h

[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: Kevin Wolf <kwolf@redhat.com>
Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 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 <qemu-common.h>
+#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 <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <linux/wireless.h>
-#include <qemu-common.h>
+#include "qemu-common.h"
 #ifdef TARGET_GPROF
 #include <sys/gmon.h>
 #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 <sys/types.h>
 
-#include <qemu-common.h>
+#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 <http://www.gnu.org/licenses/>.
  */
 
-#include <qemu-common.h>
+#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 <qemu-common.h>
+#include "qemu-common.h"
 
 #ifdef CONFIG_SLIRP
 
-- 
1.7.2.5

Re: [Qemu-devel] [PATCH] Fix include statements for qemu-common.h

[Kevin Wolf]

Am 08.09.2011 17:55, schrieb 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: Kevin Wolf <kwolf@redhat.com>
> Cc: Riku Voipio <riku.voipio@iki.fi>
> Cc: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Acked-by: Kevin Wolf <kwolf@redhat.com>

Re: [Qemu-devel] [Qemu-trivial] [PATCH] Fix include statements for qemu-common.h

[Stefan Hajnoczi]

On Thu, Sep 08, 2011 at 05:55:32PM +0200, Stefan Weil wrote:
> * 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: Kevin Wolf <kwolf@redhat.com>
> Cc: Riku Voipio <riku.voipio@iki.fi>
> Cc: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  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(-)

Thanks, applied to the trivial patches -next tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches-next

Perhaps I'm being too quick but seems like an obvious fix.

Stefan